前端添加打标编码

imcs-ui/.project

@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>com.aptana.projects.webnature</nature>
 	</natures>
 	<filteredResources>
@@ -33,5 +39,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1742439258972</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

imcs-ui/src/lang/zh/runCenter.js

@@ -353,6 +353,7 @@ export default {
 			status: "启用状态",
 			customerName: '客户名称',
 			orderName: '订单名称',
+			batchNo: '打标编码',
 			deliveryTime: '交付时间',
 			orderTime: '下单时间',
 			product: '产品',

imcs-ui/src/main.js

@@ -81,15 +81,16 @@ Vue.use(Print)
 //注册全局弹框
 //import Notice from "@/components/Notice/index.js"
 //Vue.use(Notice)
-import VueNotification from "@kugatsu/vuenotification"; 
-Vue.use(VueNotification, {
-  timer: 20,
-  error:{
-    background: "white",
-    color: "red"
-  },
-  position: "bottomRight",
-});
+
+// import VueNotification from "@kugatsu/vuenotification"; 
+// Vue.use(VueNotification, {
+//   timer: 20,
+//   error:{
+//     background: "white",
+//     color: "red"
+//   },
+//   position: "bottomRight",
+// });
 
 Vue.config.productionTip = false
 

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

@@ -20,6 +20,7 @@
       <el-form-item :label="$t(&quot;runCenter.form.orderName&quot;)+&quot;：&quot;" prop="orderName">
         <el-input v-model="tenant.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 50%;"/>
       </el-form-item>
+
       <!-- 所属产线 -->
       <el-form-item
         :label="$t(&quot;runCenter.form.zoneId&quot;)+&quot;：&quot;"
@@ -86,6 +87,21 @@
           </el-radio>
         </template>
       </el-form-item>
+
+        <!-- 打标机内容（存储到order表的batch_no字段） -->
+      <el-form-item 
+        :label="$t(&quot;runCenter.form.batchNo&quot;)+&quot;：&quot;" 
+        prop="batchNo"
+      >
+        <el-input 
+          v-model="tenant.batchNo" 
+          :placeholder="batchNoPlaceholder" 
+             @focus="handleBatchNoFocus"      
+             @blur="handleBatchNoBlur"        
+          style="width: 50%;"
+        />
+      </el-form-item>
+
       <!-- 零件 -->
       <el-form-item
         :label="$t(&quot;runCenter.form.lingjian&quot;)+&quot;：&quot;"
@@ -382,6 +398,9 @@ export default {
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
           { validator: validateExsit, trigger: 'blur'}
         ],
+        batchNo: [
+        	{ required: false, message: this.$t("rules.require"), trigger: 'blur' }
+        ],
         zoneId: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
         ],
@@ -394,7 +413,8 @@ export default {
         status: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'change' }
         ]
-      }
+      },
+       batchNoPlaceholder: this.$t('common.pleaseEnter')  // 默认提示
     }
   },
   computed: {
@@ -433,6 +453,22 @@ export default {
     }
   },
   methods: {
+
+
+    // 输入框获取焦点时显示格式提示
+  handleBatchNoFocus() {
+    this.batchNoPlaceholder = '示例格式：01-01-25-001(批号-组号-年号-件号)';
+  },
+  
+  // 输入框失去焦点时恢复默认提示
+  handleBatchNoBlur() {
+    // 如果输入框为空才恢复默认提示，否则保持格式提示
+    if (!this.tenant.batchNo) {
+      this.batchNoPlaceholder = this.$t('common.pleaseEnter');
+    }
+  },
+
+
   	// 【原料炉批号】点击-事件
   	changeMetral(row) {
   		// 当前选择的行。row

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

@@ -20,6 +20,8 @@
       <el-form-item :label="$t(&quot;runCenter.form.orderName&quot;)+&quot;：&quot;" prop="orderName">
         <el-input v-model="tenant.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 50%;"/>
       </el-form-item>
+      
+     
       <!-- 所属产线 -->
       <el-form-item
         :label="$t(&quot;runCenter.form.zoneId&quot;)+&quot;：&quot;"
@@ -30,7 +32,7 @@
           :placeholder="$t(&quot;common.pleaseSelect&quot;)"
           style="width: 50%;"
         >
-          <el-option
+         <el-option
             v-for="item in zoneList"
             :key="item.id"
             :label="item.name"
@@ -164,13 +166,6 @@
           align="center"
           width="100px"
         />
-        <!-- 零件批号 -->
-        <!--<el-table-column
-          prop="brand"
-          :label="$t(&quot;runCenter.table.orderSldPro.brand&quot;)"
-          align="center"
-          width="100px"
-        />-->
         <!-- 原料炉批号 -->
         <el-table-column
           prop="furnaceBatchNo"
@@ -259,13 +254,6 @@
           width="60px"
         >
           <template slot-scope="{ row }">
-            <!--<el-tooltip class="item" :content='$t("common.edit")' effect="dark" placement="top-start">
-			          <i
-			            class="el-icon-edit table-operation"
-			            style="color: #2db7f5;"
-			            @click="edit(row)"
-			          />
-			        </el-tooltip>-->
             <el-tooltip
               class="item"
               :content="$t(&quot;common.delete&quot;)"
@@ -401,7 +389,7 @@ export default {
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
           { validator: validateExsit, trigger: 'blur'}
         ],
-        zoneId: [
+         zoneId: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
         ],
         deliveryTime: [
@@ -538,7 +526,7 @@ export default {
         deliveryTime: moment(new Date()).format('YYYY-MM-DD'),
         status: '1',
         hasMaterial: '1',
-        zoneId: ''        
+        zoneId: ''
       }
     },
     checkExist(name){
@@ -756,7 +744,6 @@ export default {
     	customerMgrApi.getList({}).then(res => {
     		res = res.data
     		if(res.isSuccess){
-    			// console.log("88888== ",res)
     			this.customList = res.data.data
     		}
     	})
@@ -766,7 +753,6 @@ export default {
         areaMgrApi.getList({status:1}).then(res => {
     		res = res.data
     		if(res.isSuccess){
-          //this.zoneList = res.data
            res.data.forEach((element) => {
              if(element.name != '智能生产保障系统')
               this.zoneList.push({