1.修改bug2.工序检验实现部分3.缺陷定义实现部分

loulijun2021

2022-07-16 392f9468875a8721c17c4e15c288333017cac4a1

 src/views/zzmx/chda.vue

@@ -22,11 +22,12 @@
            <el-form-item label="存货类型" style=" display: flex;">
              <el-select
                v-model="form.stocktypecode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
                @change="val=>stocktypecodeChange(val,'form')"
              >
                <!--                @change="val=>stocktypecodeChange(val,'form')"-->
                <el-option
                  v-for="item in stocktypeArr"
                  :key="item.code"
@@ -35,9 +36,10 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item label="物料类型" style=" display: flex;">
            <el-form-item v-if="false" label="物料类型" style=" display: flex;">
              <el-select
                v-model="form.materialtypecode"
                filterable
                :disabled="form.stocktypecode===''"
                :popper-append-to-body="false"
                style="width: 200px"
@@ -54,10 +56,12 @@
            <el-form-item label="所属仓库" style=" display: flex;">
              <el-select
                v-model="form.storehousecode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <!--                @focus="getWareHouseSelect"-->
                <el-option
                  v-for="item in storehouseArr"
                  :key="item.code"
@@ -77,7 +81,7 @@
      <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>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>
      <el-divider />
      <div class="elTableDiv">
@@ -103,20 +107,17 @@
          />
          <el-table-column
            prop="partcode"
            show-overflow-tooltip
            label="物料编码"
            sortable="custom"
          />
          <el-table-column
            prop="partname"
            show-overflow-tooltip
            label="物料名称"
            sortable="custom"
          />
          <el-table-column
            prop="partspec"
            label="物料规格"
            show-overflow-tooltip
            width="110"
            sortable="custom"
          />
@@ -131,15 +132,14 @@
            label="存货类型"
            sortable="custom"
          />
          <el-table-column
            prop="materialtypename"
            label="物料类别"
            sortable="custom"
          />
          <!--          <el-table-column-->
          <!--            prop="materialtypename"-->
          <!--            label="物料类别"-->
          <!--            sortable="custom"-->
          <!--          />-->
          <el-table-column
            prop="stck_name"
            label="仓库名称"
            show-overflow-tooltip
            sortable="custom"
          />
          <el-table-column
@@ -163,16 +163,18 @@
          <el-table-column
            prop="lm_date"
            label="创建时间"
            show-overflow-tooltip
            sortable="custom"
            width="160"
          />
          <el-table-column
            label="工艺路线"
            width="80"
            prop="proute_id"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <i class="el-icon-share" @click="routeClick(row)" />
                <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)" />
              </div>
            </template>
          </el-table-column>
@@ -181,7 +183,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -204,28 +206,29 @@
    <!--新增编辑对话框-->
    <el-dialog
      :close-on-click-modal="false"
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      width="800px"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="物料编码" prop="materialcode">
          <el-input v-model="dialogForm.materialcode" :disabled="operation!=='add'" style="width: 220px" />
          <el-input v-model="dialogForm.materialcode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="物料名称" prop="materialname">
          <el-input v-model="dialogForm.materialname" style="width: 220px" />
          <el-input v-model="dialogForm.materialname" style="width: 200px" />
        </el-form-item>
        <el-form-item label="物料规格" prop="materialspec">
          <el-input v-model="dialogForm.materialspec" style="width: 220px" />
          <el-input v-model="dialogForm.materialspec" style="width: 200px" />
        </el-form-item>
        <el-form-item label="使用单位" prop="uomcode">
          <el-select
            v-model="dialogForm.uomcode"
            filterable
            :popper-append-to-body="false"
            style="width: 220px"
            style="width: 200px"
            placeholder="请选择"
          >
            <el-option
@@ -236,29 +239,16 @@
            />
          </el-select>
        </el-form-item>
        <el-form-item label="所属仓库" prop="warehousecode">
          <el-select
            v-model="dialogForm.warehousecode"
            :popper-append-to-body="false"
            style="width: 220px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in storehouseArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="存货类型" prop="stocktypecode">
          <el-select
            v-model="dialogForm.stocktypecode"
            filterable
            :popper-append-to-body="false"
            style="width: 220px"
            style="width: 200px"
            placeholder="请选择"
            @change="val=>stocktypecodeChange(val,'dialogForm')"
          >
            <!--            @change="val=>stocktypecodeChange(val,'dialogForm')"-->

            <el-option
              v-for="item in stocktypeArr"
              :key="item.code"
@@ -267,11 +257,29 @@
            />
          </el-select>
        </el-form-item>
        <el-form-item label="物料类型" prop="materialtypecode">
        <el-form-item label="所属仓库" prop="warehousecode">
          <el-select
            v-model="dialogForm.warehousecode"
            filterable
            :popper-append-to-body="false"
            style="width: 200px"
            placeholder="请选择"
          >
            <!--            @focus="getWareHouseSelect2"-->
            <el-option
              v-for="item in storehouseArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item v-if="false" label="物料类型" prop="materialtypecode">
          <el-select
            v-model="dialogForm.materialtypecode"
            :popper-append-to-body="false"
            style="width: 220px"
            style="width: 200px"
            filterable
            :disabled="dialogForm.stocktypecode===''"
            placeholder="请选择"
          >
@@ -283,11 +291,12 @@
            />
          </el-select>
        </el-form-item>
        <el-form-item label="最小库存" prop="minstockqty">
          <el-input v-model="dialogForm.minstockqty" style="width: 220px" />
        </el-form-item>

        <el-form-item label="最大库存" prop="maxstockqty">
          <el-input v-model="dialogForm.maxstockqty" style="width: 220px" />
          <el-input v-model="dialogForm.maxstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
          <el-form-item label="最小库存" prop="minstockqty" style="margin-left: 10px">
            <el-input v-model="dialogForm.minstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
          </el-form-item>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
@@ -303,7 +312,7 @@
      :close-on-click-modal="false"
      title="单位设置"
      :visible.sync="officeDialogVisible"
      width="50%"
      width="800px"
      top="15vh"
      class="officeDialogVisible"
      @close="handleCloseOffice"
@@ -316,7 +325,7 @@
        :data="officeTableData"
        border
        highlight-current-row
        height="400"
        height="300"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        @sort-change="sortChangeOfOffice"
@@ -356,7 +365,12 @@
          sortable="custom"
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1" v-model="row.digdect" placeholder="请输入" />
            <el-input
              v-if="row.isVisible===1"
              v-model="row.digdect"
              oninput="value=value.replace(/[^0-9]/g,'')"
              placeholder="请输入"
            />
            <div v-else> {{ row.digdect }}</div>
          </template>
        </el-table-column>
@@ -423,8 +437,9 @@
      :close-on-click-modal="false"
      title="关联工艺路线"
      :visible.sync="dialogVisibleRoute"
      width="50%"
      width="800px"
      top="15vh"
      :fullscreen="isFullscreen"
      class="dialogVisibleRoute"
      @closed="handleCloseRoute"
      @close="handleCloseRoute"
@@ -525,7 +540,7 @@

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Zzjg',
  name: 'CHDA',
  components: {
    Pagination
  },
@@ -542,6 +557,7 @@
      }
    }
    return {
      isFullscreen: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -560,6 +576,7 @@
      stocktypeArr: [], // 存货类型数组
      materialtypeArr: [], // 物料类型数组
      storehouseArr: [], // 所属仓库数组
      storehouseArr2: [], // 所属仓库数组对话框
      tableData: [],
      dialogVisible: false,
      dialogForm: {
@@ -591,21 +608,21 @@
        uomcode: [
          { required: true, message: '请选择使用单位', trigger: ['blur', 'change'] }
        ],
        warehousecode: [
          { required: true, message: '请选择所属仓库', trigger: ['blur', 'change'] }
        ],
        // warehousecode: [
        //   { required: true, message: '请选择所属仓库', trigger: ['blur', 'change'] }
        // ],
        stocktypecode: [
          { required: true, message: '请选择存货类型', trigger: ['blur', 'change'] }
        ],
        materialtypecode: [
          { required: true, message: '请输入物料类型', trigger: ['blur', 'change'] }
        ],
        minstockqty: [
          { required: true, message: '请输入最小库存', trigger: ['blur', 'change'] }
        ],
        maxstockqty: [
          { required: true, message: '请输入最大库存', trigger: ['blur', 'change'] }
        ]
        // minstockqty: [
        //   { required: true, message: '请输入最小库存', trigger: ['blur', 'change'] }
        // ],
        // maxstockqty: [
        //   { required: true, message: '请输入最大库存', trigger: ['blur', 'change'] }
        // ]

      },
      officeDialogVisible: false,
@@ -655,6 +672,10 @@
      const { data: res } = await WareHouseSelect()
      this.storehouseArr = res
    },
    // async getWareHouseSelect2() {
    //   const { data: res } = await WareHouseSelect()
    //   this.storehouseArr2 = res
    // },
    async getuomSelect() {
      const { data: res } = await UomSelect()
      this.uomArr = res
@@ -709,7 +730,7 @@
    async   edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true
      await this.stocktypecodeChange(row.stocktypecode, 'dialogForm')
      // await this.stocktypecodeChange(row.stocktypecode, 'dialogForm')
      this.$nextTick(() => {
        this.dialogForm.id = row.id
        this.dialogForm.materialcode = row.partcode
@@ -770,8 +791,8 @@
            warehousecode: this.dialogForm.warehousecode,
            stocktypecode: this.dialogForm.stocktypecode,
            materialtypecode: this.dialogForm.materialtypecode,
            minstockqty: this.dialogForm.minstockqty,
            maxstockqty: this.dialogForm.maxstockqty,
            minstockqty: this.dialogForm.minstockqty === '' ? 0 : this.dialogForm.minstockqty,
            maxstockqty: this.dialogForm.maxstockqty === '' ? 0 : this.dialogForm.maxstockqty,
            OperType: this.operation === 'add' ? 'Add' : 'Update'
          }
          AddUpdateInventoryFile(data).then(res => {
@@ -791,6 +812,10 @@
      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
        }
      })
    },
    /* 点击关联工艺路线模块*/
@@ -932,6 +957,7 @@
      const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, data)
      if (res.code === '200') {
        this.$message.success('保存成功！')
        await this.getInventoryFileSelect()
        this.dialogVisibleRoute = false
      }
    },
@@ -966,7 +992,7 @@
    // 新增
    addOffice() {
      let number = Math.random() * Math.random()// 作为删除时的标识符
      number = number === 0 ? Math.random() * Math.random() : number
      number = number === 0 ? (10 + Math.random()) : number
      const data = { code: '', name: '', digdect: '', r_ule: '', isVisible: 1, number: number }
      this.officeTableData.unshift(data)
    },