1.修改bug2.新增工序检验记录

loulijun2021

2022-08-26 d9493eb7905545e5509689eae73a450c576418e0

 src/views/zzmx/chda.vue

@@ -1,7 +1,32 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div style="padding: 10px 5px 0 0">

      <div class="bodyTopButtonGroup" style="justify-content: space-between;">

        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <!--        <el-button type="primary" icon="el-icon-office-building" @click="office">单位</el-button>-->
        <div style="display: flex">
          <el-button
            icon="el-icon-refresh-right"
            @click="syncSeaveSearchUnit"
          >同步计量单位
          </el-button>
          <el-button
            icon="el-icon-refresh-right"
            @click="syncInventoryFileSelect"
          >同步存货档案
          </el-button>
          <el-button
            icon="el-icon-refresh-right"
            @click="syncStockTypeSelect"
          >同步存货类型
          </el-button>
        </div>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>

      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
@@ -77,20 +102,14 @@
          </div>
        </el-form>
      </div>
      <el-divider />
      <div style="margin-left: 10px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-office-building" @click="office">单位</el-button>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>
      <el-divider />

      <div class="elTableDiv">
        <el-table
          :data="tableData"
          border
          stripe
          :height="tableHeight"
          width="100%"
          :row-class-name="tableRowClassName"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -104,14 +123,17 @@
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="partcode"
            label="物料编码"
            min-width="160"
            sortable="custom"
          />
          <el-table-column
            prop="partname"
            min-width="160"
            label="物料名称"
            sortable="custom"
          />
@@ -120,7 +142,12 @@
            label="物料规格"
            width="110"
            sortable="custom"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.partspec">{{ row.partspec }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="uom_name"
            label="单位"
@@ -131,6 +158,7 @@
            prop="stocktypename"
            label="存货类型"
            sortable="custom"
            min-width="110"
          />
          <!--          <el-table-column-->
          <!--            prop="materialtypename"-->
@@ -141,19 +169,35 @@
            prop="stck_name"
            label="仓库名称"
            sortable="custom"
          />
            min-width="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.stck_name">{{ row.stck_name }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="maxqty"
            label="库存上限"
            width="110"
            sortable="custom"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.maxqty">{{ row.maxqty }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="minqty"
            label="库存下限"
            width="110"
            sortable="custom"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.minqty">{{ row.minqty }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_user"
            label="创建人员"
@@ -174,17 +218,23 @@
            <template slot-scope="{row}">
              <div class="operationClass">
                <i v-if="row.proute_id==='Y'" class="el-icon-share" @click="routeClick(row)" />
                <i v-if="row.proute_id==='N'" style="color: #E4E7ED" class="el-icon-share" @click="routeClick(row)" />
                <i v-if="row.proute_id==='N'" style="color:rgb(180 ,181, 185)" class="el-icon-share" @click="routeClick(row)" />
              </div>
            </template>
          </el-table-column>
          <el-table-column
            label="操作"
            fixed="right"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />
                </el-tooltip>
                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">
                  <i class="el-icon-delete" @click="del(row)" />
                </el-tooltip>
              </div>
            </template>
          </el-table-column>
@@ -192,12 +242,12 @@
      </div>
      <!--分页-->
      <pagination
        v-show="total>0"

        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getInventoryFileSelect"
      />
@@ -415,12 +465,11 @@
      </el-table>
      <!--分页-->
      <pagination
        v-show="officeTableDataLength>0"
        :total="officeTableDataLength"
        :page.sync="officeForm.page"
        :limit.sync="officeForm.rows"
        align="right"
        layout="prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getUomSearch"
      />
@@ -438,8 +487,8 @@
      title="关联工艺路线"
      :visible.sync="dialogVisibleRoute"
      width="800px"
      top="15vh"
      :fullscreen="isFullscreen"
      top="10vh"
      :fullscreen="isIpad"
      class="dialogVisibleRoute"
      @closed="handleCloseRoute"
      @close="handleCloseRoute"
@@ -472,15 +521,38 @@
          <!--            onClick="event.cancelBubble = true"-->
        </div>
      </div>

      <el-divider />
      <div>
        <i class="el-icon-s-operation" style="color:#42b983;" /> 默认工艺路线
      </div>
      <div style="margin-top: 20px">
        <el-select
          v-model="defaultroute_code"
          filterable
          style="width: 200px;"
          placeholder="请选择"
          class="defaultroute_code"
        >
          <el-option
            v-for="item in defaultroute_codeArr"
            :key="item.code"
            :label="item.name"
            :value="item.code"
          />
        </el-select>
      </div>
      <el-divider />
      <div style="margin-bottom: 10px">
        <i class="el-icon-s-operation" style="color:#42b983;" /> 工序列表
      </div>
      <div style="height: 400px;overflow-y: scroll">
      <div style="overflow-y: scroll">
        <el-table
          ref="projectTableData"
          :data="projectTableData"
          border
          height="400"
          height="280"
          :row-class-name="tableRowClassName"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -489,6 +561,7 @@
            prop="seq"
            width="100"
            label="工序序号"
            fixed
          />
          <el-table-column
            prop="stepcode"
@@ -501,10 +574,11 @@
          <el-table-column
            prop="enable"
            label="启用状态"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div v-if="row.enable==='Y'">是</div>
              <div v-if="row.enable==='N'">否</div>
              <div v-if="row.enable==='Y'"><svg-icon icon-class="circleYes" style="margin-right: 2px" />是</div>
              <div v-if="row.enable==='N'"><svg-icon icon-class="circleNo" style="margin-right: 2px" />否</div>
            </template>
          </el-table-column>
        </el-table>
@@ -516,16 +590,12 @@
        </div>
      </span>
    </el-dialog>

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import {
  AddUpdateOrganization,
  DeleteOrganization
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import { WareHouseSelect } from '@/api/wlgl'
import {
  AddUpdateInventoryFile, DeleteInventoryFile, InventoryFileAssociationRoute,
@@ -537,6 +607,7 @@
  UomSearch, UomSelect
} from '@/api/zzmx'
import $ from 'jquery'
import { SeaveSearchInventory, SeaveSearchInventoryClass, SeaveSearchUnit } from '@/api/ErpSyncMes'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -557,7 +628,7 @@
      }
    }
    return {
      isFullscreen: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -602,9 +673,9 @@
        materialname: [
          { required: true, message: '请输入物料名称', trigger: ['blur', 'change'] }
        ],
        materialspec: [
          { required: true, message: '请输入物料规格', trigger: ['blur', 'change'] }
        ],
        // materialspec: [//物料规格暂时改为非必填
        //   { required: true, message: '请输入物料规格', trigger: ['blur', 'change'] }
        // ],
        uomcode: [
          { required: true, message: '请选择使用单位', trigger: ['blur', 'change'] }
        ],
@@ -646,23 +717,104 @@
        routeOperationArr: [] // 工艺路线集合
        // routeOperationSelectedArr: [] // 工艺路线选中集合数组
      },
      defaultroute_code: '', // 默认工艺路线选中值
      defaultroute_codeArr: '', // 默认工艺路线数组
      projectTableData: []// 设备列表
    }
  },
  created() {
    this.getInventoryFileSelect()
    this.getStockTypeSelect()
    this.getWareHouseSelect()
    this.handleRequest()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    handleRequest() {
      this.getInventoryFileSelect().then(res => {
        if (res.code === '200') {
          this.getStockTypeSelect()
          this.getWareHouseSelect()
        }
      })
    },

    // 同步计量单位
    async syncSeaveSearchUnit() {
      const loading = this.$loading({
        lock: true,
        text: '正在同步计量单位，请稍等...',
        spinner: 'el-icon-loading',
        customClass: 'osloading',
        background: 'rgba(0, 0, 0, 0.7)'
      })
      const res = await SeaveSearchUnit()
      if (res.code === '200') {
        setTimeout(() => {
          // this.getInventoryFileSelect()
          this.officeTableData = res.data
          console.log(this.officeTableData, 9)
          loading.close()
          this.$message.success('同步成功！')
        }, 2000)
      } else {
        setTimeout(() => {
          loading.close()
          this.$message.error('同步失败！')
        }, 10000)
      }
    },
    // 同步存货档案
    async  syncInventoryFileSelect() {
      const loading = this.$loading({
        lock: true,
        text: '正在同步存货档案，请稍等...',
        spinner: 'el-icon-loading',
        customClass: 'osloading',
        background: 'rgba(0, 0, 0, 0.7)'
      })
      const res = await SeaveSearchInventory()
      if (res.code === '200') {
        setTimeout(() => {
          this.getInventoryFileSelect()
          loading.close()
          this.$message.success('同步成功！')
        }, 2000)
      } else {
        setTimeout(() => {
          loading.close()
          this.$message.error('同步失败！')
        }, 10000)
      }
    },
    // 同步存货类型
    async syncStockTypeSelect() {
      const loading = this.$loading({
        lock: true,
        text: '正在同步存货类型，请稍等...',
        spinner: 'el-icon-loading',
        customClass: 'osloading',
        background: 'rgba(0, 0, 0, 0.7)'
      })
      const res = await SeaveSearchInventoryClass()
      if (res.code === '200') {
        setTimeout(() => {
          this.getStockTypeSelect()
          loading.close()
          this.$message.success('同步成功！')
        }, 2000)
      } else {
        setTimeout(() => {
          loading.close()
          this.$message.error('同步失败！')
        }, 10000)
      }
    },
    async getInventoryFileSelect() {
      const res = await InventoryFileSelect(this.form)
      this.tableData = res.data
      this.total = res.count
      return { code: res.code }
    },
    async getStockTypeSelect() {
      const { data: res } = await StockTypeSelect()
@@ -743,6 +895,7 @@
        this.dialogForm.minstockqty = row.maxqty
        this.dialogForm.maxstockqty = row.minqty
      })
      await this.getuomSelect()
    },
    // 删除按钮
    async del(row) {
@@ -780,6 +933,10 @@
    },
    // 对话框确认
    dialogVisibleConfirm() {
      if (this.defaultroute_codeArr.length > 0 && this.defaultroute_code === '') {
        return this.$message.info('默认工艺路线不能为空！')
      }

      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          const data = {
@@ -810,106 +967,25 @@
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        if (window.innerHeight < 800) {
          this.tableHeight = this.tableHeight - 50
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 200
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 40
        }
        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
      })
    },
    /* 点击关联工艺路线模块*/
    // 工艺路线点击
    async routeClick(row) {
      console.log(row)
      this.defaultroute_code = row.default_route
      this.dialogFormRoute.projectCode = row.partcode
      this.dialogFormRoute.projectName = row.partname
      this.dialogVisibleRoute = true
      const { data: res } = await InventoryFileAssociationRoute({ partcode: this.dialogFormRoute.projectCode })
      this.dialogFormRoute.routeOperationArr = res
      // let waitFlag = false// 回显等待是否放行
      this.dialogFormRoute.routeOperationArrTest = [
        {
          'flag': 'Y', code: '001', name: '测试1 ',
          'Data': [
            {
              'seq': 1,
              'stepcode': 'Step01',
              'stepname': '测试工序一',
              'enable': 'Y'
            }, {
              'seq': 2,
              'stepcode': 'Step02',
              'stepname': '测试工序二',
              'enable': 'Y'
            }, {
              'seq': 3,
              'stepcode': 'Step03',
              'stepname': '测试工序三',
              'enable': 'N'
            }
          ]
        },
        {
          'flag': 'Y', code: '002', name: '测试2 ',
          'Data': [
            {
              'seq': 1,
              'stepcode': 'Step01',
              'stepname': '测试工序一',
              'enable': 'Y'
            }, {
              'seq': 2,
              'stepcode': 'Step02',
              'stepname': '测试工序二',
              'enable': 'Y'
            }, {
              'seq': 3,
              'stepcode': 'Step03',
              'stepname': '测试工序三',
              'enable': 'N'
            }, {
              'seq': 4,
              'stepcode': 'Step02',
              'stepname': '测试工序二',
              'enable': 'Y'
            }, {
              'seq': 5,
              'stepcode': 'Step03',
              'stepname': '测试工序三',
              'enable': 'N'
            }
          ]
        },
        {
          'flag': 'N', code: '003', name: '测试3 ',
          'Data': [
            {
              'seq': 1,
              'stepcode': 'Step01',
              'stepname': '测试工序一',
              'enable': 'Y'
            }
          ]

        },
        {
          'flag': 'Y', code: '004', name: '测试4 ',
          'Data': [
            {
              'seq': 1,
              'stepcode': 'Step01',
              'stepname': '测试工序一',
              'enable': 'Y'
            }, {
              'seq': 2,
              'stepcode': 'Step02',
              'stepname': '测试工序二',
              'enable': 'Y'
            }
          ]
        }
      ]

      this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
        item.isSelected1 = false
@@ -937,10 +1013,15 @@
          // }, 100)
        }
      })

      this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')

      console.log(this.defaultroute_codeArr, 123)
    },
    // 对话框关闭
    handleCloseRoute() {
      this.dialogFormRoute.routeOperationArr = []
      this.defaultroute_codeArr = []
    },
    // 取消
    routeDialogVisibleCancel() {
@@ -948,13 +1029,20 @@
    },
    // 确定
    async routeDialogVisibleConfirm() {
      const temp = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
      if (this.defaultroute_code === '' && temp.length > 0) {
        return this.$message.info('默认工艺路线不能为空！')
      }

      // 提交格式
      const data = []
      this.dialogFormRoute.routeOperationArr.forEach(item => {
        if (item.isSelected2) {
          data.push({ code: item.code, name: item.name })
        }
      })
      const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, data)

      const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, this.defaultroute_code, data)
      if (res.code === '200') {
        this.$message.success('保存成功！')
        await this.getInventoryFileSelect()
@@ -974,6 +1062,16 @@
    myCheckboxInputClick(val) {
      console.log(val, 2)
      val.isSelected2 = !val.isSelected2

      this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
        if (val.code === item.code) {
          item.flag = !item.flag
        }
      })
      if (val.code === this.defaultroute_code) {
        this.defaultroute_code = ''
      }
      this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
    },
    /* 单位模块*/
    // 单位按钮点击事件
@@ -1072,6 +1170,10 @@
    // 返回
    officeDialogVisibleCancel() {
      this.officeDialogVisible = false
    },

    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    }
  }
}
@@ -1079,57 +1181,6 @@

<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-button--primary {
  background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
  //border: 1px solid $main_color;
  border: none;
  padding: 0 20px;
}

::v-deep .el-button--primary:hover {
  border: none;
}

::v-deep .el-button--info {
  height: 30px;
  display: flex;
  align-items: center;
  padding: 0 20px;
}

::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
  background-color: $main_color !important;
}

::v-deep .el-dialog__footer {
  display: flex;
  justify-content: flex-end;
}

.footerButton {
  display: flex;
  justify-content: end;
}

::v-deep .el-button--default {
  background-color: #ffffff !important;
  height: 30px;
  display: flex;
  align-items: center;
  padding: 0 20px;
}

::v-deep .el-button--default:hover {
  color: #606266;
}

::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}

.dialogVisibleRoute {
  ::v-deep .el-dialog__body {
    padding: 20px 20px !important;
@@ -1140,115 +1191,6 @@
  ::v-deep .el-dialog__body {
    padding: 20px 20px !important;
  }
}

::v-deep .el-radio__input.is-checked .el-radio__inner {
  background-color: $main_color;
  border-color: $main_color;
}

::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color !important;
}

::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
  border-color: $main_color;
  background-color: $main_color;
}

::v-deep .el-input__inner {
  height: 30px;
  line-height: 30px;
}

::v-deep .el-table .caret-wrapper {
  transform: scale(0.8);
}

::v-deep .cell {
  display: flex !important;
  align-items: center !important;
  justify-content: space-between !important;
}

::v-deep .el-button--text {
  color: $main_color;
  font-size: 14px;
  cursor: pointer;
}

.operationClass {
  height: 23px;
  display: flex;
  justify-content: space-between;
  align-items: center;
}

.el-icon-share {
  color: $main_color;
  cursor: pointer;
}

.el-checkbox.is-bordered.is-checked {
  border-color: $main_color;
}

::v-deep .el-radio__input.is-checked .el-radio__inner {
  border-color: $main_color;
  background: $main_color;
}

::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
  border-color: $main_color;
  background: $main_color;
}

::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
  color: $main_color !important;
}

::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
  margin: 10px 30px 0px 0;
}

::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color;
}

::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
  margin: 10px 30px 0px 0;
}

.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}

.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

::v-deep .el-input__inner:focus {
  border-color: $main_color;
}

::v-deep .el-textarea__inner:focus {
  border-color: $main_color;
}

::v-deep .el-select .el-input__inner:focus {
  border-color: $main_color;
}

::v-deep .el-select-dropdown__item.selected {
  color: $main_color;
}

::v-deep .el-select .el-input .el-select__caret {
  display: flex;
  align-items: center;
  justify-content: center;
}

.dialogVisibleRoute {
@@ -1310,4 +1252,108 @@
    }
  }
}

.defaultroute_code ::v-deep .el-input__suffix-inner{
  display: flex;
  align-items: center;
  justify-content: center;
  margin-top: -3px;
}
</style>

<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline{
  margin-right: 15px;
}

::v-deep .el-button--primary, .el-button--default, .el-button--info {
  height: 34px;
  display: flex;
  align-items: center;
  padding: 0 15px;
}

::v-deep .el-button--primary {
  //background-color: $main_color !important;
}

::v-deep .el-button--default {
  background-color: #f8f8fa;
  border: none;
}

::v-deep .el-input__inner {
  height: 34px;
  line-height: 34px;
  //color: #a7a7a7;
}

::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}

::v-deep .dialogVisibleRoles .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .importPickerClass .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .el-dialog__footer {
  display: flex;
  justify-content: flex-end;
}

::v-deep .el-table .caret-wrapper {
  transform: scale(0.8);
}

::v-deep .cell {
  display: flex;
  align-items: center;
  justify-content: space-between;
}

::v-deep .el-table::before {
  height: 0;
}

::v-deep .el-table__body-wrapper {
  background-color: #f8f8fa;
}

::v-deep .el-table__body .el-table__row.hover-row td{
  background-color: #eaecef ;
}

::v-deep .el-form--inline .el-form-item__label {
  color: #a7a7a7;
}

.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}

.body ::v-deep .el-form-item {
  margin-bottom: 0;
}
.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}

</style>
<style>

.el-table .custom-row {
  background: #f8f8fa;
}
</style>