2022-02-26 11:35

imcs-ui/src/views/zuihou/lineSideLibrary/locationMgr/Index.vue

@@ -60,7 +60,7 @@
 			      <el-button type="danger" icon="el-icon-delete" size="medium" v-has-permission="['location:delete']" @click="batchDelete">
 			        {{ $t("table.delete") }}
 			      </el-button>
-			      <el-button type="danger" icon="el-icon-lock" size="medium" v-has-permission="['location:lock']" @click="batchDelete">{{ $t("lineSide.buttons.lockde") }}</el-button>
+			      <!--<el-button type="danger" icon="el-icon-lock" size="medium" v-has-permission="['location:lock']" @click="batchDelete">{{ $t("lineSide.buttons.lockde") }}</el-button>-->
 			      <!-- 设置可存放托盘 -->
 			      <el-button type="success" icon="el-icon-edit" size="medium" v-has-permission="['location:set']" @click="trayOne">
 			        {{ $t("lineSide.common.trayBtn") }}

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/draftOrder/components/Edit.vue

@@ -507,7 +507,7 @@ export default {
         if (valid) {
           this.confirmDisabled = true
           // 验证【数量】不能不填写
-          let flag = false
+          let flag = false, flagBatchNo = false;
           this.tableData.map(item => {
           	if(!item.bomNum){
           		flag = true
@@ -515,6 +515,10 @@ export default {
             if(!item.deliveryTime){
               flag = true
             }
+            // 验证【原料炉批号】
+            if(!item.furnaceBatchNo){
+              flagBatchNo = true
+            }
           })
           if(flag){
           	this.$message({
@@ -524,7 +528,14 @@ export default {
           	this.confirmDisabled = false
           	return false
           }
-
+          if(flagBatchNo){
+          	this.$message({
+	              message: this.$t('请选择【原料炉批号】~'),
+	              type: 'warning'
+	            })
+          	this.confirmDisabled = false
+          	return false
+          }
           // 添加数据
           this.tenant.orderProductList = []
           this.tableData.map(item => {
@@ -532,6 +543,7 @@ export default {
           	this.tenant.orderProductList.push({
           		bomId: item.bomId,
           		bomNum: item.bomNum,
+          		furnaceBatchNo: item.furnaceBatchNo,
           		deliveryTime: item.deliveryTime,
           		remark: item.remark
           	})