FQC修改

src/views/mes/pro/ItemTemplateMapping/index.vue

@@ -71,7 +71,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!--<el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -106,7 +106,7 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+       <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -165,15 +165,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['pro:scheduleSetupRule:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['pro:scheduleSetupRule:remove']"
-            >删除</el-button
+            >查看</el-button
           >
         </template>
       </el-table-column>
@@ -266,7 +258,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -472,7 +464,7 @@ export default {
         this.templateChange()
       })
       this.open = true
-      this.title = '修改客户产品标签模板对照表'
+      this.title = '查看客户产品标签模板对照表'
     },
     /** 提交按钮 */
     submitForm() {

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

@@ -236,6 +236,13 @@
         <el-button type="primary" @click="confirmCommand">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="提示" :visible.sync="textRulesVisible" width="500px" append-to-body>
+      <div style="max-height: 400px;overflow:auto;" v-html="textRules"></div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="textRulesVisible = false">否</el-button>
+        <el-button type="primary" @click="handleTipByYes">是</el-button>
+      </div>
+    </el-dialog>
 
     <!-- 用户导入对话框 -->
     <el-dialog title="导入工单" :visible.sync="upload.open" width="400px">
@@ -795,7 +802,8 @@ export default {
       // 生产工单树选项
       workorderOptions: [],
       selectedRows: [],
-
+      textRulesVisible: false,
+      textRules: '',
       daterangePurchaseDate: [],
       beginRequestDate: [],
       // 弹出层标题
@@ -1024,6 +1032,25 @@ export default {
       }
       )
     },
+    handleTipByYes() {
+      let params = [];
+      this.selectedRows.forEach((item, index) => {
+        params.push({
+          arrangeSort: index + 1,
+          workorderId: item.workorderId,
+          workorderCode: item.workorderCode,
+          arrangeCode: null
+        })
+      });
+      batchAddArrange(params).then(response => {
+        this.arrangeOpen2 = true;
+        this.groupCode = response;
+        this.$modal.msgSuccess("新增编排单成功");
+        this.getList();
+      }).finally(() => {
+        this.textRulesVisible = false
+      });
+    },
     async handleArrange(type) {
       if(type === 'del') {
         if(this.ids.length === 0) return this.$message.warning('请勾选要取消编排的工单')
@@ -1060,54 +1087,9 @@ export default {
         })
       });
       checkArrangeRulesApi(cparams).then(res => {
-        if(res.data && typeof res.data == 'object') {
-          const text = res.data.join('\n')
-          this.$confirm(
-            text,
-            '提示',
-            {
-              distinguishCancelAndClose: true,
-              confirmButtonText: '是',
-              cancelButtonText: '否',
-          }).then(() => {
-            let params = [];
-            this.selectedRows.forEach((item, index) => {
-              params.push({
-                arrangeSort: index + 1,
-                workorderId: item.workorderId,
-                workorderCode: item.workorderCode,
-                arrangeCode: null
-              })
-            });
-            batchAddArrange(params).then(response => {
-              this.arrangeOpen2 = true;
-              this.groupCode = response;
-              this.$modal.msgSuccess("新增编排单成功");
-              this.getList();
-            });
-          }).catch((action) => {
-            // if (action === 'cancel') {
-            //   let params = [];
-            //   this.selectedRows.forEach((item, index) => {
-            //     if(!list.includes(item.workorderCode)) {
-            //       params.push({
-            //         arrangeSort: index + 1,
-            //         workorderId: item.workorderId,
-            //         workorderCode: item.workorderCode,
-            //         arrangeCode: null
-            //       })
-            //     }
-            //   });
-            //   if(params.length > 0) {
-            //     batchAddArrange(params).then(response => {
-            //       this.arrangeOpen2 = true;
-            //       this.groupCode = response;
-            //       this.$modal.msgSuccess("新增编排单成功");
-            //       this.getList();
-            //     });
-            //   }
-            // }
-          })
+        if(res.data && typeof res.data == 'object' && res.data.length > 0) {
+          this.textRules = res.data.join('<br />')
+          this.textRulesVisible = true
         } else {
           let params = [];
           this.selectedRows.forEach((item, index) => {

src/views/mes/qc/qctemplate/index.vue

@@ -392,7 +392,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         const params = JSON.parse(JSON.stringify(this.form))
-        if (params.qcType === 'IQC') {
+        if (params.qcType === 'IQC' || params.qcType === 'FQC') {
           params.qcTypesParam = []
         } else {
           if (!params.qcTypesParam || params.qcTypesParam.length === 0) return this.$message.warning('检测种类必选')

src/views/mes/qc/templateProcess/index.vue

@@ -186,20 +186,20 @@
                       @select="onItemTypeSelected" placeholder="请选择所属分类"/>
         </el-form-item>
         <el-form-item label="工序名称" prop="processName">
-          <el-input v-model="form.processName" placeholder="请输入工序名称" :disabled="form.qcType === 'IQC'">
-            <el-button slot="append" @click="visible = true" icon="el-icon-search" :disabled="form.qcType === 'IQC'"></el-button>
+          <el-input v-model="form.processName" placeholder="请输入工序名称" :disabled="form.qcType === 'IQC' || form.qcType === 'FQC'">
+            <el-button slot="append" @click="visible = true" icon="el-icon-search" :disabled="form.qcType === 'IQC'|| form.qcType === 'FQC'"></el-button>
           </el-input>
         </el-form-item>
         <el-form-item label="最大数量" prop="maxNum" >
-          <el-input v-model="form.maxNum" placeholder="请输入最大数量" :disabled="form.qcType === 'IQC'"/>
+          <el-input v-model="form.maxNum" placeholder="请输入最大数量" :disabled="form.qcType === 'IQC'|| form.qcType === 'FQC'"/>
         </el-form-item>
         <el-form-item label="是否质检确认" prop="isConfirm">
-          <el-select style="width:100%;" v-model="form.isConfirm" placeholder="请选择是否质检确认" :disabled="form.qcType === 'IQC'">
+          <el-select style="width:100%;" v-model="form.isConfirm" placeholder="请选择是否质检确认" :disabled="form.qcType === 'IQC'|| form.qcType === 'FQC'">
             <el-option :label="item.dictKey" :value="item.dictValue" v-for="item in boolOpt" :key="item.dictValue"/>
           </el-select>
         </el-form-item>
         <el-form-item label="是否新品" prop="isNewProduct" >
-          <el-select style="width:100%;" v-model="form.isNewProduct" placeholder="请选择是否新品" :disabled="form.qcType === 'IQC'">
+          <el-select style="width:100%;" v-model="form.isNewProduct" placeholder="请选择是否新品" :disabled="form.qcType === 'IQC'|| form.qcType === 'FQC'">
             <el-option :label="item.dictKey" :value="item.dictValue" v-for="item in boolOpt" :key="item.dictValue"/>
           </el-select>
         </el-form-item>
@@ -359,7 +359,7 @@ export default {
         templateId: [
           {required: true, message: "检测模板不能为空", trigger: "blur"}
         ], processName: [
-          {required: this.form.qcType !== 'IQC', message: "工序名称不能为空", trigger: "blur"}
+          {required: this.form.qcType !== 'IQC'&& this.form.qcType !== 'FQC', message: "工序名称不能为空", trigger: "blur"}
         ],
       }
     }