Merge remote-tracking branch 'origin/dev' into dev

src/views/mes/pro/workorder/indexApply.vue

@@ -167,6 +167,7 @@
           plain
           icon="el-icon-plus"
           size="mini"
+          :disabled="single"
           @click="handleDofinish"
           v-hasPermi="['mes:pro:workorder:dofinish']"
         >生成任务单</el-button
@@ -178,6 +179,7 @@
           plain
           icon="el-icon-plus"
           size="mini"
+          :disabled="single"
           @click="handleToolNumCheck"
           v-hasPermi="['mes:pro:workorder:dofinish']"
         >工装量具齐套检查</el-button
@@ -953,6 +955,7 @@
       handleQuery() {
         this.getList();
       },
+    
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm("queryForm");
@@ -1014,9 +1017,19 @@
         //   this.optType = "view";
         // });
       },
-      handleSelectionChange(val) {
-        this.selectedRows = val;
+      handleSelectionChange(selection) {
+      // this.selectedRows = val;
+      this.selectedRows = selection;
+      this.ids = selection.map(item => item.toolId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
       },
+    //   // 多选框选中数据
+    // handleSelectionChange(selection) {
+    //   this.ids = selection.map(item => item.toolId)
+    //   this.single = selection.length!==1
+    //   this.multiple = !selection.length
+    // },
       /** 修改按钮操作 */
       handleUpdate(row) {
         this.reset();

src/views/mes/tm/tool/index.vue

@@ -236,7 +236,7 @@
         <el-row>
            <el-col :span="12">
             <el-form-item label="工装夹具名称" prop="toolName">
-              <el-input v-model="form.toolName" placeholder="请输入工装夹具名称" />
+              <el-input v-model="form.toolName" readonly />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -253,17 +253,25 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="型号" prop="spec">
-              <el-input v-model="form.spec" placeholder="请输入型号" />
+              <el-input v-model="form.spec" readonly />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item  label="SN码" prop="toolCode">
+          <el-col :span="12">
+            <!-- <el-form-item  label="SN码" prop="toolCode">
               <el-input v-model="form.toolCode" placeholder="请输入SN码" />
+            </el-form-item> -->
+             <el-form-item prop="toolCode">
+              <template slot="label"> SN码 </template>
+              <el-input
+                disabled
+                v-model="form.toolCode"
+                placeholder="自动生成"
+              ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <el-form-item  label-width="80">
               <el-switch v-model="autoGenFlag"
                   active-color="#13ce66"
@@ -271,7 +279,7 @@
                   @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
               </el-switch>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item  label="数量" prop="quantity">
               <!-- <el-input v-if="form.codeFlag=='Y'" readonly v-model="form.quantity" /> -->
@@ -428,6 +436,9 @@ export default {
   created() {
     this.getList();
     this.getTypeList();
+    if (this.mode == "add") {
+      this.gCode();
+    }
   },
   methods: {
     /** 查询工装夹具清单列表 */
@@ -477,6 +488,7 @@ export default {
       };
       this.autoGenFlag = false;
       this.resetForm("form");
+      this.gCode();
     },
     onToolTypeChanged(){
       var types = this.toolTypeOptions.filter((item) =>{
@@ -579,16 +591,24 @@ export default {
         ...this.queryParams
       }, `tool_${new Date().getTime()}.xlsx`)
     },
+    // //自动生成编码
+    // handleAutoGenChange(autoGenFlag){
+    //   debugger;
+    //   if(autoGenFlag){
+    //     genCode('TOOL_CODE').then(response =>{
+    //       this.form.toolCode = response;
+    //     });
+    //   }else{
+    //     this.form.toolCode = null;
+    //   }
+    // },
+
+
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      debugger;
-      if(autoGenFlag){
-        genCode('TOOL_CODE').then(response =>{
-          this.form.toolCode = response;
-        });
-      }else{
-        this.form.toolCode = null;
-      }
+     gCode() {
+      genCode("TOOL_CODE").then((response) => {
+        this.form.toolCode = response;
+      });
     },
     handleBrandSelect(){
       this.$refs.brSelect.showFlag = true;