44

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -158,7 +158,7 @@
           </ele-pro-table>
         </el-tab-pane>
         <el-tab-pane label="质检项参数" name="质检项参数">
-          <term :qualityParam="qualityParam"></term>
+          <term :qualityParam="qualityParam" ref="qualityParamRef"></term>
         </el-tab-pane>
         <el-tab-pane label="生产节拍" name="生产节拍">
           <el-form label-width="100px" ref="form" :model="beatParam">
@@ -1756,6 +1756,11 @@
           this.tableData.taskParam[this.currentIndex].baseCountUnit2 =
             this.baseCountUnit2;
 
+            if(this.$refs.qualityParamRef) {
+              this.tableData.taskParam[this.currentIndex].qualityParam =  this.$refs.qualityParamRef.getDate()  || []
+             
+            }
+
           workingProcedureUpdate({
             id: this.tableData.id,
             categoryId: this.treeData.categoryId,

src/views/material/BOMmanage/components/workmanship.vue

@@ -22,21 +22,17 @@
             <el-form-item label="版本:" label-width="100px">
               <el-input
                 clearable
-                v-model.trim="where.fixCode"
+                v-model.trim="where.versions"
                 placeholder="请输入"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="状态:" label-width="100px">
-              <el-input clearable v-model.trim="where.name" placeholder="请输入" />
-            </el-form-item>
-          </el-col>
+
         </el-row>
         <el-row type="flex" :gutter="15">
           <el-col :span="6">
             <el-form-item label="所属工作中心" label-width="100px">
-              <el-input clearable v-model.trim="where.name" placeholder="请输入" />
+              <el-input clearable v-model.trim="where.workCenterName" placeholder="请输入" />
             </el-form-item>
           </el-col>
           <el-col :span="18">

src/views/material/BOMmanage/qualityTesting/term.vue

@@ -8,7 +8,7 @@
     >
 
     <div class="content_box" v-if="list.length > 0">
-      <div class="content_box_list" v-for="(item, index) in list" :key="index">
+      <div class="content_box_list" v-for="(item, idx) in list" :key="idx">
         <div class="content_ll">
           <div class="name">标准编码</div>
           <div class="">{{
@@ -45,7 +45,7 @@
               type="danger"
               :underline="false"
               icon="el-icon-delete"
-              @click="handDel(index)"
+              @click="handDel(idx)"
             >
               删除
             </el-link>
@@ -55,17 +55,25 @@
         <el-form ref="form" style="width: 100%">
           <el-table
             style="margin-top: 15px"
-            :data="item.qualityStandard.parameterStandards"
+            :data="
+              item.qualityStandard && item.qualityStandard.parameterStandards
+            "
             border
           >
             <el-table-column
-              :label="item.qualityStandard.singleWeightDivision"
+              :label="
+                item.qualityStandard &&
+                item.qualityStandard.singleWeightDivision
+              "
               align="center"
             >
               <el-table-column
                 label="参数上限"
                 align="center"
-                v-if="item.qualityStandard.parameterType == 3"
+                v-if="
+                  item.qualityStandard &&
+                  item.qualityStandard.parameterType == 3
+                "
               >
                 <template slot-scope="scope">
                   <el-form-item label-width="0" prop="finalValue">
@@ -81,7 +89,10 @@
               <el-table-column
                 label="参数下限"
                 align="center"
-                v-if="item.qualityStandard.parameterType == 3"
+                v-if="
+                  item.qualityStandard &&
+                  item.qualityStandard.parameterType == 3
+                "
               >
                 <template slot-scope="scope">
                   <el-form-item label-width="0" prop="initialValue">
@@ -96,7 +107,10 @@
               <el-table-column
                 label="默认值"
                 align="center"
-                v-if="item.qualityStandard.parameterType != 3"
+                v-if="
+                  item.qualityStandard &&
+                  item.qualityStandard.parameterType != 3
+                "
               >
                 <template slot-scope="scope">
                   <el-form-item label-width="0" prop="defaultValue">
@@ -111,7 +125,7 @@
             </el-table-column>
 
             <el-table-column
-              :label="item.qualityStandard.tolerance"
+              :label="item.qualityStandard && item.qualityStandard.tolerance"
               align="center"
             >
               <el-table-column label="质检标准" align="center">
@@ -135,6 +149,19 @@
                 </template>
               </el-table-column>
             </el-table-column>
+
+            <el-table-column label="操作" align="center" width="70">
+              <template slot-scope="scope">
+                <el-link
+                  type="danger"
+                  :underline="false"
+                  icon="el-icon-delete"
+                  @click="handDel2(idx, scope.$index)"
+                >
+                  删除
+                </el-link>
+              </template>
+            </el-table-column>
           </el-table>
         </el-form>
       </div>
@@ -151,22 +178,28 @@
     components: { termPop },
 
     props: {
-        qualityParam: {
-            type: Array,
-            default() {
+      qualityParam: {
+        type: Array
+      }
+    },
 
-                return [];
-            }
-        }
+    watch: {
+      qualityParam: {
+        handler(val) {
+          this.list = val;
+          this.$forceUpdate();
+        },
+        deep: true,
+        immediate: true
+      }
     },
+
     data() {
       return {
         list: []
       };
     },
 
-    
-
     created() {
       EventBus.$on('inspectionSelection', (data) => {
         let _arr = this.updateOrCreateObjectInArray(this.list, data.message);
@@ -199,6 +232,14 @@
             this.list.splice(index, 1);
           })
           .catch(() => {});
+      },
+
+      handDel2(idx, index) {
+        this.list[idx].qualityStandard.parameterStandards.splice(index, 1);
+      },
+
+      getDate() {
+        return this.list;
       }
     }
   };

vue.config.js

@@ -33,8 +33,8 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.124:50001',
         // target: 'http://192.168.1.147:18086',
-        // target: 'http://192.168.1.125:18086',
-        target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''