rev:质检模块和原材料入库优化

mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue

@@ -11,7 +11,7 @@
     >
       <el-row :gutter="20">
         <el-col :span="18" style="border: 1px solid white">
-          <span />
+          <span/>
         </el-col>
         <el-col :span="6">
           <span>
@@ -44,9 +44,9 @@
             label-position="right"
             label-suffix=":"
           >
-            <el-form-item label="物料编码">
+            <el-form-item label="质检单号">
               <el-input
-                v-model="form1.material_code"
+                v-model="form1.inspection_code"
                 disabled
                 size="mini"
                 style="width: 210px"
@@ -62,43 +62,41 @@
                 class="filter-item"
               />
             </el-form-item>
-            <el-form-item label="批号">
-              <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</label>
+            <el-form-item label="采购订单">
               <el-input
-                v-model="form1.pcsn"
+                v-model="form1.source_bill_code"
                 disabled
                 size="mini"
                 style="width: 210px"
                 class="filter-item"
               />
             </el-form-item>
-            <el-form-item label="样品编号">
+            <el-form-item label="重量">
               <el-input
-                v-model="form1.sample_code"
+                v-model="form1.qty"
+                disabled
                 size="mini"
                 style="width: 210px"
                 class="filter-item"
-                :disabled="form1.bill_status === '99'"
               />
             </el-form-item>
-
-            <el-form-item label="烧结炉号">
-              <el-input
-                v-model="form1.other_device_no"
+            <el-form-item>
+              <label slot="label">结&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;果:</label>
+              <el-select
+                v-model="form1.result"
+                clearable
                 size="mini"
                 style="width: 210px"
+                placeholder="结果"
                 class="filter-item"
                 :disabled="form1.bill_status === '99'"
-              />
-            </el-form-item>
-            <el-form-item label="烧结温度">
-              <el-input
-                v-model="form1.other_device_wd"
-                size="mini"
-                style="width: 210px"
-                class="filter-item"
-                :disabled="form1.bill_status === '99'"
-              />
+              >
+                <el-option
+                  v-for="item in dict.qc_result"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item>
               <label slot="label">等&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;级:</label>
@@ -112,88 +110,17 @@
                 :disabled="form1.bill_status === '99'"
               >
                 <el-option
-                  v-for="item in dict.ST_IVT_LEVEL"
+                  v-for="item in dict.qc_grade"
                   :label="item.label"
                   :value="item.value"
                 />
               </el-select>
             </el-form-item>
-            <el-form-item>
-              <label slot="label">重&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;损:</label>
-              <el-input
-                v-model="form1.weightlost"
-                size="mini"
-                style="width: 210px"
-                class="filter-item"
-                :disabled="form1.bill_status === '99'"
-              />
-            </el-form-item>
-
-            <el-form-item>
-              <label slot="label">结&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;论:</label>
-              <el-select
-                v-model="form1.result"
-                clearable
-                size="mini"
-                style="width: 210px"
-                placeholder="结论"
-                class="filter-item"
-                :disabled="form1.bill_status === '99'"
-              >
-                <el-option
-                  v-for="item in dict.QC_RESULT_LHZJD"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item v-if="form1.result==='07'" label="改料编码">
-              <el-input
-                v-model="form1.change_material_code"
-                prefix-icon="el-icon-search"
-                placeholder="请选择物料"
-                size="mini"
-                style="width: 210px"
-                class="filter-item"
-                clearable
-                @clear="cleanMater"
-                @focus="materShow=true"
-              />
-            </el-form-item>
-            <el-form-item v-if="form1.result==='07'" label="改料名称">
-              <el-input
-                v-model="form1.change_material_name"
-                disabled
-                size="mini"
-                style="width: 210px"
-                class="filter-item"
-              />
-            </el-form-item>
-
-            <el-form-item v-if="form1.result==='07'" label="改用批号">
-              <el-input
-                v-model="form1.change_pcsn"
-                disabled
-                size="mini"
-                style="width: 210px"
-                class="filter-item"
-              />
-            </el-form-item>
-
-            <el-form-item label="金相备注">
-              <el-input
-                v-model="form1.metallography_remark"
-                :disabled="form1.bill_status === '99'"
-                style="width: 380px;"
-                rows="2"
-                type="textarea"
-              />
-            </el-form-item>
-
-            <el-form-item label="检验备注">
+            <el-form-item label="备注">
               <el-input
                 v-model="form1.remark"
                 :disabled="form1.bill_status === '99'"
+                placeholder="合格白色，超出标准范围红色"
                 style="width: 380px;"
                 rows="2"
                 type="textarea"
@@ -253,26 +180,6 @@
           width="100"
           :formatter="crud.formatQlNum4"
         />
-
-        <el-table-column
-          prop="down_limit_value"
-          label="下限临界值(≤)"
-          width="100"
-          :formatter="crud.formatQlNum4"
-        />
-
-        <el-table-column
-          prop="up_limit_value"
-          label="上限临界值(≥)"
-          width="100"
-          :formatter="crud.formatQlNum4"
-        />
-        <el-table-column
-          v-if="false"
-          prop="is_ok"
-          label="是否合格"
-          width="155"
-        />
         <el-table-column
           prop="value"
           width="155px"
@@ -304,34 +211,22 @@
             />
           </template>
         </el-table-column>
-
-        <el-table-column
-          prop="item_remark"
-          label="项点备注"
-          width="160"
-        />
-        <el-table-column
-          v-if="false"
-          prop="form_remark"
-          label="表单备注"
-          width="160"
-        />
       </el-table>
     </el-dialog>
 
-    <MaterDtl :dialog-show.sync="materShow" :mater-opt-code="'05'" @tableChanged2="tableChanged2" />
+    <MaterDtl :dialog-show.sync="materShow" :mater-opt-code="'05'" @tableChanged2="tableChanged2"/>
   </div>
 </template>
 
 <script>
-import CRUD, { crud } from '@crud/crud'
+import CRUD, {crud} from '@crud/crud'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
-import crudPhysicalMst from '@/views/wms/ql_manage/physicalMst'
+import crudPhysicalMst from '@/views/wms/ql_manage/physicalMst/physicalMst'
 
 export default {
   name: 'Dialog1',
-  dicts: ['QL_TEST_POINTTYPE', 'QC_RESULT_LHZJD', 'ST_IVT_LEVEL'],
-  components: { MaterDtl },
+  dicts: ['QL_TEST_POINTTYPE', 'qc_grade', 'qc_result'],
+  components: {MaterDtl},
   mixins: [crud()],
   props: {
     visiable1: {
@@ -381,19 +276,20 @@ export default {
       }
       crudPhysicalMst.getResult(param).then(res => {
         this.form1 = res
-        if (res.grade === '') {
-          this.form1.grade = '01'
+        const rows = this.form1.tableData
+        for (let i = 0; i < rows.length; i++) {
+          const row = rows[i]
+          this.$set(row, 'value', row.value)
+        }
+        if (res.grade === '' || !res.grade) {
+          this.form1.grade = '1'
         }
       })
     },
-    hand() {
-
-    },
-    cellStyle({ row, column, rowIndex, columnIndex }) {
+    cellStyle({row, column, rowIndex, columnIndex}) {
       // https://blog.csdn.net/qq_41648113/article/details/109337781
       // https://blog.csdn.net/Akatsuki233/article/details/100311040
       // https://blog.csdn.net/qq_45414633/article/details/107795124
-
       const inspection_type = row.inspection_type
       const is_limit_remark = row.is_limit_remark
       const value = parseFloat(row.value)
@@ -434,18 +330,18 @@ export default {
     computerResult() {
       const rows = this.form1.tableData
       for (let i = 0; i < rows.length; i++) {
-        if (rows[i].up_limit !== '') {
+        if (!rows[i].up_limit && rows[i].inspection_type === '02') {
           if (rows[i].value === undefined) {
             this.crud.notify('有标准项点未输入完', CRUD.NOTIFICATION_TYPE.INFO)
             return false
           }
         }
       }
-      this.form1.result = '01'
+      this.$set(this.form1, 'result', '1')
       var remark = ''
       for (var row of rows) {
         if (row.is_ok === '0') {
-          this.form1.result = '02'
+          this.$set(this.form1, 'result', '2')
         } else {
           if (row.is_limit_remark === '1' && row.form_remark) {
             remark += row.form_remark.replace('\n', '') + ','
@@ -453,24 +349,17 @@ export default {
         }
       }
 
-      this.form1.remark = remark
       this.$set(this.form1, 'remark', remark)
-
-      if (this.form1.metallography_remark !== '') {
-        this.form1.result = ''
-        return this.crud.notify('金相异常，需人工判定', CRUD.NOTIFICATION_TYPE.INFO)
-      }
-
-      if (this.form1.result === '01') return this.crud.notify('计算结果为合格', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      if (this.form1.result === '02') return this.crud.notify('计算结果为不合格', CRUD.NOTIFICATION_TYPE.INFO)
+      if (this.form1.result === '1') return this.crud.notify('计算结果为合格', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      if (this.form1.result === '2') return this.crud.notify('计算结果为不合格', CRUD.NOTIFICATION_TYPE.INFO)
     },
     format_inspection_item_type(row, column) {
       return this.dict.label.QL_TEST_POINTTYPE[row.inspection_item_type]
     },
 
     onSubmit() {
+      debugger
       const msg = '是否继续！'
-
       const data = this.form1.tableData
       var flag = 0
       for (var row of data) {