领刀模板寿命和商城版本工序新增几个字段

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

@@ -44,6 +44,94 @@
           />
         </template>
       </el-table-column>
+      <el-table-column label="封切机开边" prop="sacmForEdgeOpening" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.sacmForEdgeOpening"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="封切机粘贴复合" prop="sacmForPasteComposite" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.sacmForPasteComposite"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="封切机热复合" prop="sacmForThermalComposite" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.sacmForThermalComposite"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="封切机贴标" prop="sacmForLabeling" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.sacmForLabeling"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="封切机装扣" prop="sacmForBuckleUp" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.sacmForBuckleUp"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="封切机压痕" prop="sacmForCreasing" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.sacmForCreasing"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="封切机风琴" prop="sacmForOrgan" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.sacmForOrgan"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="封切机热切" prop="sacmForThermalCutting" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.sacmForThermalCutting"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="封切机热自合" prop="sacmForThermalSelfFusion" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.sacmForThermalSelfFusion"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="封切机压齿" prop="sacmForMolarTooth" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.sacmForMolarTooth"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="封切机分切" prop="sacmForSlitting" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.sacmForSlitting"
+          />
+        </template>
+      </el-table-column>
       <el-table-column label="工序备注" prop="processRemark" align="center" />
       <el-table-column
         v-if="mode != 'info'"

src/views/mes/tm/toolrequestuse/selectSn.vue

@@ -106,6 +106,8 @@ export default {
       total: 0,
       // 物料产品表格数据
       itemList: null,
+
+      lifetime: null,
       // 部门树选项
       itemTypeOptions: undefined,
       defaultProps: {
@@ -177,7 +179,8 @@ export default {
     handleRowChange(row) {
       if (row) {
         this.selectedRows = row;
-        this.selectedItemId = row.taskId
+        this.selectedItemId = row.taskId;
+        this.lifetime = row.lifeTime;
       }
     },
      // 单选选中数据
@@ -194,14 +197,26 @@ export default {
     },
     //确定选中
     confirmSelect(){
+      if(this.lifetime<0){
+        const materialRequestIds = this.lifetime
+      this.$modal.confirm('当前刀模板具寿命为"' + materialRequestIds + '",确定选择吗？').then(function () {
+        return;
+      }).then(() => {
+        
+      }).catch(() => { 
+        this.showFlag=true;
+      });
+      }
       if (!this.selectedItemId) {
         this.$notify({
           title: "提示",
           type: "warning",
           message: "请至少选择一条数据!",
         });
+
         return;
       }
+
       console.log(this.selectedRows)
       this.$emit('onSelected',this.selectedRows);
       this.showFlag = false;