页面新增改进

imcs-ui/src/views/zuihou/prepareProductMgr/cuttingToolMgr/components/customizeCuttingTool/components/Edit.vue

@@ -26,16 +26,17 @@
       	<el-select v-model="customizeCuttingTool.cuttingToolType.key" :placeholder='$t("common.pleaseSelect")' style="width: 93%;">
           <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.CUTTING_TOOL_TYPE" />
       	</el-select>
+      </el-form-item>
+      <!-- 刀位号 -->
+      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cutterNo")+"："' prop="cutterNo">
+      	<el-input-number v-model="customizeCuttingTool.cutterNo" :min="0"></el-input-number>
       </el-form-item>      
       <el-form-item v-if="customizeCuttingTool.cutterNo > 0"  :label='$t("cuttingTool.form.customizeCuttingtool.deviceId")+"："' prop="deviceId" >        
       	<el-select v-model="customizeCuttingTool.deviceId" :placeholder='$t("common.pleaseSelect")' style="width: 50%;" >
           <el-option :key="item.name" :label="item.name" :value="item.id" v-for="(item, index) in deviceData.records" />
       	</el-select>
       </el-form-item>
-      <!-- 刀位号 -->
-      <el-form-item v-if="customizeCuttingTool.cutterNo > 0 " :label='$t("cuttingTool.form.customizeCuttingtool.cutterNo")+"："' prop="cutterNo">
-      	<el-input-number v-model="customizeCuttingTool.cutterNo" :min="1"></el-input-number>
-      </el-form-item>
+      
 
       <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolPicture")+"："' prop="cuttingToolPicture">
         <el-upload
@@ -186,10 +187,7 @@ export default {
         ],
         cutterCode: [
           { required: true, message: this.$t("rules.require"), trigger: 'change' },
-        ],
-        deviceId: [
-        	{ required: true, message: this.$t("rules.require"), trigger: 'change' },
-        ],
+        ],        
         cuttingToolType: [
           { required: true, validator: (rule, value, callback) => {
               console.log("this.customizeCuttingTool.cuttingToolType.key="+this.customizeCuttingTool.cuttingToolType.key)
@@ -269,7 +267,7 @@ export default {
         },
         deviceId: '',
         resourceIdList: [],
-        cutterNo: 1,
+        cutterNo: 0,
         cuttingToolPicture: '',
         cuttingToolInstallPicture: '',
         remark: '',