2023-10-12 设备和质量修改

2 years ago · af1e285eda
4 changed files with 240 additions and 92 deletions
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@ -2269,8 +2269,7 @@
              message: '操作成功',
              type: 'success',
              duration: 1500,
-              onClose: () => {
-              }
+              onClose: () => {}
            })
          } else {
            this.$alert(data.msg, '错误', {
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@ -165,16 +165,28 @@
          </el-select>
        </el-form-item>
      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="物料" prop="partNo" :rules="rules.partNoType">
-          <el-select v-model="modalData.partNo" placeholder="请选择" style="width: 456px">
-            <el-option
-              v-for = "i in partList"
-              :key = "i.partNo"
-              :label = "i.partDesc"
-              :value = "i.partNo">
-            </el-option>
-          </el-select>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="物料编码">
+          <el-input v-model="modalData.partNo" readonly style="width: 221px"></el-input>
+        </el-form-item>
+        <el-form-item label="物料名称">
+<!--          <el-select v-model="modalData.partNo" placeholder="请选择" style="width: 456px">-->
+<!--            <el-option-->
+<!--              v-for = "i in partList"-->
+<!--              :key = "i.partNo"-->
+<!--              :label = "i.partDesc"-->
+<!--              :value = "i.partNo">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+          <el-input v-model="modalData.partDesc" readonly style="width: 221px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="物料类别">
+          <el-input v-model="modalData.spec" readonly style="width: 221px"></el-input>
+        </el-form-item>
+        <el-form-item label="SKU">
+          <el-input v-model="modalData.sku" readonly style="width: 221px"></el-input>
        </el-form-item>
      </el-form>
      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -185,7 +197,12 @@
          <el-input v-model="modalData.batchRollNo" style="width: 221px"></el-input>
        </el-form-item>
      </el-form>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="特殊要求">
+          <el-input type="textarea" v-model="modalData.specialRequirements" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 60px;text-align:center">
        <el-button type="primary" @click="saveData()">保存</el-button>
        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
      </el-footer>
@ -195,22 +212,25 @@
    <el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px">
      <el-form :inline="true"  label-position="top" @keyup.enter.native = "getDataList()">
        <el-form-item :label="'物料编码'">
-          <el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
+          <el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'物料类别'">
+          <el-input v-model="detailData.spec" readonly style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item :label="'PN'">
-          <el-input v-model="detailData.cinvSourceCode" disabled style="width: 100px"></el-input>
+          <el-input v-model="detailData.cinvSourceCode" readonly style="width: 100px"></el-input>
        </el-form-item>
        <el-form-item :label="'SKU'">
-          <el-input v-model="detailData.sku" disabled style="width: 100px"></el-input>
+          <el-input v-model="detailData.sku" readonly style="width: 100px"></el-input>
        </el-form-item>
        <el-form-item :label="'物料名称'">
-          <el-input v-model="detailData.partDesc" disabled style="width: 200px"></el-input>
+          <el-input v-model="detailData.partDesc" readonly style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item :label="'送检数量'">
-          <el-input v-model="detailData.rollQty" disabled style="width: 80px"></el-input>
+          <el-input v-model="detailData.rollQty" readonly style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'抽样数量'">
-          <el-input v-model="detailData.samplingQty" disabled style="width: 80px"></el-input>
+          <el-input v-model="detailData.samplingQty" readonly style="width: 80px"></el-input>
        </el-form-item>
      </el-form>
      <el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()">
@ -505,7 +525,10 @@
          inspectorName: '',
          submit_flag: '',
          seqNo: '',
-          batchRollNo: ''
+          batchRollNo: '',
+          spec: '',
+          sku: '',
+          specialRequirements: ''
        },
        // 展示列集
        columnList: [
@ -629,6 +652,18 @@
            status: true,
            fixed: '',
          },
+          {
+            columnProp: 'spec',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '物料类别',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
          {
            columnProp: 'cinvSourceCode',
            headerAlign: "center",
@ -737,6 +772,18 @@
            status: true,
            fixed: '',
          },
+          {
+            columnProp: 'specialRequirements',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '特殊要求',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
        ],
        //项目清单
        detailData:{
@ -755,7 +802,8 @@
          inspectionRemark: '',
          submitFlag: '',
          cinvSourceCode: '',
-          sku: ''
+          sku: '',
+          spec: ''
        },
        detailInformationFlag:false,
        detailList:[],
@ -991,13 +1039,6 @@
              trigger: 'change'
            }
          ],
-          partNoType:[
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
          rollQtyType:[
            {
              required: true,
@ -1085,6 +1126,8 @@
            this.partList = data.rows
            this.modalData.partNo = this.partList[0].partNo
            this.modalData.partDesc = this.partList[0].partDesc
+            this.modalData.spec = this.partList[0].spec
+            this.modalData.sku = this.partList[0].sku
          } else {
            this.$alert(data.msg, '错误', {
              confirmButtonText: '确定'
@ -1163,7 +1206,10 @@
          resourceDesc: '',
          rollQty: '',
          seqNo: '',
-          batchRollNo: ''
+          batchRollNo: '',
+          spec: '',
+          sku: '',
+          specialRequirements: ''
        };
        this.operationList = [];
        this.resourceList = [];
@ -1440,11 +1486,12 @@
        this.detailData.inspectionRemark = row.inspectionRemark
        this.detailData.cinvSourceCode = row.cinvSourceCode
        this.detailData.sku = row.sku
+        this.detailData.spec = row.spec
        faiDetailSearch(this.detailData).then(({data}) => {
          this.detailList = data.rows
        })
-        this.inspectorSearch();
-        this.detailInformationFlag = true;
+        this.inspectorSearch()
+        this.detailInformationFlag = true
      },

      // 子明细记录信息查询
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@ -163,16 +163,28 @@
          </el-select>
        </el-form-item>
      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="物料" prop="partNo" :rules="rules.partNoType">
-          <el-select v-model="modalData.partNo" placeholder="请选择" style="width: 456px">
-            <el-option
-              v-for = "i in partList"
-              :key = "i.partNo"
-              :label = "i.partDesc"
-              :value = "i.partNo">
-            </el-option>
-          </el-select>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="物料编码">
+          <el-input v-model="modalData.partNo" readonly style="width: 221px"></el-input>
+        </el-form-item>
+        <el-form-item label="物料名称">
+<!--          <el-select v-model="modalData.partNo" placeholder="请选择" style="width: 456px">-->
+<!--            <el-option-->
+<!--              v-for = "i in partList"-->
+<!--              :key = "i.partNo"-->
+<!--              :label = "i.partDesc"-->
+<!--              :value = "i.partNo">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+          <el-input v-model="modalData.partDesc" readonly style="width: 221px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="物料类别">
+          <el-input v-model="modalData.spec" readonly style="width: 221px"></el-input>
+        </el-form-item>
+        <el-form-item label="SKU">
+          <el-input v-model="modalData.sku" readonly style="width: 221px"></el-input>
        </el-form-item>
      </el-form>
      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -183,7 +195,12 @@
          <el-input v-model="modalData.batchRollNo" style="width: 221px"></el-input>
        </el-form-item>
      </el-form>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="特殊要求">
+          <el-input type="textarea" v-model="modalData.specialRequirements" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 60px;text-align:center">
        <el-button type="primary" @click="saveData()">保存</el-button>
        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
      </el-footer>
@ -193,22 +210,25 @@
    <el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px">
      <el-form :inline="true"  label-position="top" @keyup.enter.native = "getDataList()">
        <el-form-item :label="'物料编码'">
-          <el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
+          <el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'物料类别'">
+          <el-input v-model="detailData.spec" readonly style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item :label="'PN'">
-          <el-input v-model="detailData.cinvSourceCode" disabled style="width: 100px"></el-input>
+          <el-input v-model="detailData.cinvSourceCode" readonly style="width: 100px"></el-input>
        </el-form-item>
        <el-form-item :label="'SKU'">
-          <el-input v-model="detailData.sku" disabled style="width: 100px"></el-input>
+          <el-input v-model="detailData.sku" readonly style="width: 100px"></el-input>
        </el-form-item>
        <el-form-item :label="'物料名称'">
-          <el-input v-model="detailData.partDesc" disabled style="width: 200px"></el-input>
+          <el-input v-model="detailData.partDesc" readonly style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item :label="'送检数量'">
-          <el-input v-model="detailData.rollQty" disabled style="width: 80px"></el-input>
+          <el-input v-model="detailData.rollQty" readonly style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'抽样数量'">
-          <el-input v-model="detailData.samplingQty" disabled style="width: 80px"></el-input>
+          <el-input v-model="detailData.samplingQty" readonly style="width: 80px"></el-input>
        </el-form-item>
      </el-form>
      <el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()">
@ -501,7 +521,10 @@
          inspectorName: '',
          submit_flag: '',
          seqNo: '',
-          batchRollNo: ''
+          batchRollNo: '',
+          spec: '',
+          sku: '',
+          specialRequirements: ''
        },
        // 展示列集
        columnList: [
@ -625,6 +648,18 @@
            status: true,
            fixed: '',
          },
+          {
+            columnProp: 'spec',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '物料类别',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
          {
            columnProp: 'cinvSourceCode',
            headerAlign: "center",
@ -733,6 +768,18 @@
            status: true,
            fixed: '',
          },
+          {
+            columnProp: 'specialRequirements',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '特殊要求',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
        ],
        //项目清单
        detailData:{
@ -751,7 +798,8 @@
          inspectionRemark: '',
          submitFlag: '',
          cinvSourceCode: '',
-          sku: ''
+          sku: '',
+          spec: ''
        },
        detailInformationFlag:false,
        detailList:[],
@ -987,13 +1035,6 @@
              trigger: 'change'
            }
          ],
-          partNoType:[
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
          rollQtyType:[
            {
              required: true,
@ -1081,6 +1122,8 @@
            this.partList = data.rows
            this.modalData.partNo = this.partList[0].partNo
            this.modalData.partDesc = this.partList[0].partDesc
+            this.modalData.spec = this.partList[0].spec
+            this.modalData.sku = this.partList[0].sku
          } else {
            this.$alert(data.msg, '错误', {
              confirmButtonText: '确定'
@ -1159,7 +1202,10 @@
          resourceDesc: '',
          rollQty: '',
          seqNo: '',
-          batchRollNo: ''
+          batchRollNo: '',
+          spec: '',
+          sku: '',
+          specialRequirements: ''
        };
        this.operationList = [];
        this.resourceList = [];
@ -1426,6 +1472,7 @@
        this.detailData.inspectionRemark = row.inspectionRemark
        this.detailData.cinvSourceCode = row.cinvSourceCode
        this.detailData.sku = row.sku
+        this.detailData.spec = row.spec
        fqcDetailSearch(this.detailData).then(({data}) => {
          this.detailList = data.rows
        })
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@ -173,16 +173,36 @@
          </el-select>
        </el-form-item>
      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="物料" prop="partNo" :rules="rules.partNoType">
-          <el-select v-model="modalData.partNo" placeholder="请选择" style="width: 456px">
-            <el-option
-              v-for = "i in partList"
-              :key = "i.partNo"
-              :label = "i.partDesc"
-              :value = "i.partNo">
-            </el-option>
-          </el-select>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="物料编码">
+<!--          <el-select v-model="modalData.partNo" placeholder="请选择" style="width: 221px">-->
+<!--            <el-option-->
+<!--              v-for = "i in partList"-->
+<!--              :key = "i.partNo"-->
+<!--              :label = "i.partDesc"-->
+<!--              :value = "i.partNo">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+          <el-input v-model="modalData.partNo" readonly style="width: 221px"></el-input>
+        </el-form-item>
+        <el-form-item label="物料名称">
+<!--          <el-select v-model="modalData.partDesc" placeholder="请选择" style="width: 221px">-->
+<!--            <el-option-->
+<!--              v-for = "i in partList"-->
+<!--              :key = "i.partNo"-->
+<!--              :label = "i.partDesc"-->
+<!--              :value = "i.partNo">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+          <el-input v-model="modalData.partDesc" readonly style="width: 221px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="物料类别">
+          <el-input v-model="modalData.spec" readonly style="width: 221px"></el-input>
+        </el-form-item>
+        <el-form-item label="SKU">
+          <el-input v-model="modalData.sku" readonly style="width: 221px"></el-input>
        </el-form-item>
      </el-form>
      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -203,7 +223,12 @@
          <el-input v-model="modalData.batchRollNo" style="width: 456px"></el-input>
        </el-form-item>
      </el-form>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="特殊要求">
+          <el-input type="textarea" v-model="modalData.specialRequirements" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 60px;text-align:center">
        <el-button type="primary" @click="saveData()">保存</el-button>
        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
      </el-footer>
@ -213,22 +238,25 @@
    <el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px">
      <el-form :inline="true"  label-position="top" @keyup.enter.native = "getDataList()">
        <el-form-item :label="'物料编码'">
-          <el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
+          <el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'物料类别'">
+          <el-input v-model="detailData.spec" readonly style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item :label="'PN'">
-          <el-input v-model="detailData.cinvSourceCode" disabled style="width: 100px"></el-input>
+          <el-input v-model="detailData.cinvSourceCode" readonly style="width: 100px"></el-input>
        </el-form-item>
        <el-form-item :label="'SKU'">
-          <el-input v-model="detailData.sku" disabled style="width: 100px"></el-input>
+          <el-input v-model="detailData.sku" readonly style="width: 100px"></el-input>
        </el-form-item>
        <el-form-item :label="'物料名称'">
-          <el-input v-model="detailData.partDesc" disabled style="width: 200px"></el-input>
+          <el-input v-model="detailData.partDesc" readonly style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item :label="'送检数量'">
-          <el-input v-model="detailData.rollQty" disabled style="width: 80px"></el-input>
+          <el-input v-model="detailData.rollQty" readonly style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'抽样数量'">
-          <el-input v-model="detailData.samplingQty" disabled style="width: 80px"></el-input>
+          <el-input v-model="detailData.samplingQty" readonly style="width: 80px"></el-input>
        </el-form-item>
      </el-form>
      <el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()">
@ -582,7 +610,10 @@
          resourceDesc: '',
          rollQty: '',
          seqNo: '',
-          batchRollNo: ''
+          batchRollNo: '',
+          spec: '',
+          sku: '',
+          specialRequirements: ''
        },
        // 展示列集
        columnList: [
@ -718,6 +749,18 @@
            status: true,
            fixed: '',
          },
+          {
+            columnProp: 'spec',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '物料类别',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
          {
            columnProp: 'cinvSourceCode',
            headerAlign: "center",
@ -826,6 +869,18 @@
            status: true,
            fixed: '',
          },
+          {
+            columnProp: 'specialRequirements',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '特殊要求',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
        ],
        //项目清单
        detailData:{
@ -844,7 +899,8 @@
          inspectionRemark: '',
          submitFlag: '',
          cinvSourceCode: '',
-          sku: ''
+          sku: '',
+          spec: ''
        },
        detailInformationFlag:false,
        detailList:[],
@ -1091,13 +1147,6 @@
              trigger: 'change'
            }
          ],
-          partNoType: [
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
          rollQtyType: [
            {
              required: true,
@ -1111,7 +1160,7 @@
              message: ' ',
              trigger: 'change'
            }
-          ],
+          ]
        },
        // orderNoData:{
        //   limit: 10,
@ -1362,6 +1411,8 @@
            this.partList = data.rows
            this.modalData.partNo = this.partList[0].partNo
            this.modalData.partDesc = this.partList[0].partDesc
+            this.modalData.spec = this.partList[0].spec
+            this.modalData.sku = this.partList[0].sku
          } else {
            this.$alert(data.msg, '错误', {
              confirmButtonText: '确定'
@ -1389,13 +1440,16 @@
          resourceDesc: '',
          rollQty: '',
          seqNo: '',
-          batchRollNo: ''
-        };
-        this.operationList = [];
-        this.resourceList = [];
-        this.partList = [];
-        this.modalDisableFlag = false;
-        this.modalFlag = true;
+          batchRollNo: '',
+          spec: '',
+          sku: '',
+          specialRequirements: ''
+        }
+        this.operationList = []
+        this.resourceList = []
+        this.partList = []
+        this.modalDisableFlag = false
+        this.modalFlag = true
      },

      // 新增IPQC巡检记录
@ -1612,6 +1666,7 @@
        this.detailData.inspectionRemark = row.inspectionRemark
        this.detailData.cinvSourceCode = row.cinvSourceCode
        this.detailData.sku = row.sku
+        this.detailData.spec = row.spec
        ipqcDetailSearch(this.detailData).then(({data}) => {
          this.detailList = data.rows
        })