Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/components/TmTool/index.vue

@@ -16,10 +16,10 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="刀模版具编码" prop="toolCode">
+      <el-form-item label="SN编码" prop="toolCode">
         <el-input
           v-model="queryParams.toolCode"
-          placeholder="请输入刀模版具编码"
+          placeholder="请输入SN编码"
           clearable
           @keyup.enter.native="handleQuery"
         />

src/views/mes/pro/productionSolution/components/ProogingSpecificationSheet.vue

@@ -548,6 +548,11 @@
             <el-input v-model="form.printingMethod" placeholder />
           </el-form-item>
         </el-col>
+        <el-col :lg="6" :md="8" :sm="12" :xs="12">
+          <el-form-item label="模数" prop="module">
+            <el-input v-model="form.module" placeholder />
+          </el-form-item>
+        </el-col>
       </el-row>
       
       <!-- <el-row>
@@ -674,6 +679,7 @@ export default {
         layerNum: "",
         width: "",
         height: "",
+        module: "",
         printingPaperlenth: "",
         printPaperwidth: "",
         sendworkMultiple: "",
@@ -783,6 +789,7 @@ export default {
         purchaseUnit: "",
         rowNum: "",
         isCreateSpec: "",
+        module: "",
         isNeedShoeImg: "",
         dieSunkOffsetOilTankNum: "",
         printingMethod: "",

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

@@ -55,7 +55,7 @@
           :disabled="single"
           @click="confirmUpdate"
           v-hasPermi="['pro:materialRequest:edit']"
-        >确认补料</el-button>
+        >确认申请</el-button>
       </el-col>
       
       <!--   <el-col :span="1.5">

src/views/mes/tm/warehouse/itemIndex.vue

@@ -8,7 +8,7 @@
       size="mini"
       @click="$refs['ItemSelectRef'].showFlag = true"
     >新增</el-button>
-    <ItemSelect v-if="$attrs.optType === 'add'" ref="ItemSelectRef" @onSelected="onItemSelect" />
+    <ItemSelect v-if="$attrs.optType === 'add'" ref="ItemSelectRef" @onSelected="onItemSelect" :toolRequestItemList="tmToolRequestItemList" />
     <el-table v-loading="loading" :data="tmToolRequestItemList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column
@@ -69,7 +69,9 @@ export default {
     id:{
       type:String,
       default:''
-    }
+    },
+ 
+
   },
   data() {
     return {
@@ -85,6 +87,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+
       // 刀模版物料申请单表格数据
       tmToolRequestItemList: [],
       // 弹出层标题

src/views/mes/tm/warehouse/selectmachinesrecord.vue

@@ -72,6 +72,11 @@ export default {
   name: "MdItemSingle",
   dicts: ["sys_yes_no", "mes_item_product"],
   components: { Treeselect },
+  props:{
+    toolRequestItemList:{
+      type:Array
+    }
+  },
   data() {
     return {
       showFlag: false,
@@ -80,6 +85,7 @@ export default {
       selectedRows: [],
       // 非单个禁用
       single: true,
+
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
@@ -171,7 +177,25 @@ export default {
           });
           return;
       }
-      console.log(this.selectedRows)
+      let a=0;
+      if(!this.toolRequestItemList.length==0){
+        
+        this.toolRequestItemList.forEach(item => {
+          this.selectedRows.forEach(items =>{
+            if(item.toolCode === items.toolCode){
+              this.$message.error(item.toolCode+'数据已经被选择,请不要重复选择');
+              a++;
+            }
+          });
+        });
+       if(!a==0){
+        return;
+       }
+      }
+
+      
+      
+      console.log(this.selectedRows);
       this.$emit('onSelected',this.selectedRows);
       this.showFlag = false;
     }