Przeglądaj źródła

解决前端订单名称验证

oyq28 3 lat temu
rodzic
commit
1b27625c51

+ 2 - 2
imcs-ui/src/views/zuihou/largeScreen/twoDatasModel/Index.vue

@@ -87,7 +87,7 @@
 		  		<el-row class="marginBottom15" :gutter="15">
 					  <el-col :span="11" align="left">
 					  	<div class="allTitleLeft font13">今日持续加工时间</div>
-					  	<div class="allFont"  ref="runningTime">{{ (allDatas[0]/60).toFixed(1) }}小时</div>
+					  	<div class="allFont"  ref="runningTime">{{ allDatas[0] }}小时</div>
 					  </el-col>
 					  <el-col :span="13">
 					  	<el-row :gutter="15" v-show="false">
@@ -601,7 +601,7 @@
 	  	openMessageTips(data){
 	  		// 如果是【数据模式】
 		  if(this.$route.fullPath.indexOf("/largeScreen/twoDatasModel") > -1){  	  
-			  //console.log("接收websocket的推送信息 == ",data)
+			  console.log("接收websocket的推送信息 == ",data)
 			  if(data.type == 'PUSH_TYPE_DATA_SCREEN'){
 					this.$nextTick(()=> {
 						// 数据变更

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

@@ -335,12 +335,27 @@ export default {
     }
   },
   data () {
+    let validateExsit = (rule, value, callback) => {
+      //后台方法
+      if(this.type=="edit" && value === this.oldName){
+        return callback()
+      }
+      this.checkExist(value).then(res => {
+        res = res.data               
+        if (res && res.data) {         
+          callback(new Error('名称已存在'))
+        }else{
+          callback()
+        }
+      })
+    }
     return {
       type: 'add',
       tenant: this.initTenant(),
       screenWidth: 0,
       width: this.initWidth(),
       confirmDisabled: false,
+      oldName: '',
       dialog: {
         isVisible: false,
         title: ""
@@ -364,7 +379,8 @@ export default {
       },
       rules: {
         orderName: [
-        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+          { validator: validateExsit, trigger: 'blur'}
         ],
         zoneId: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
@@ -495,6 +511,9 @@ export default {
         zoneId: '',
       }
     },
+    checkExist(name){
+      return orderMgrApi.checkField({"orderName":name})
+    },
 
     initWidth () {
       this.screenWidth = document.body.clientWidth
@@ -511,6 +530,7 @@ export default {
     	if(val){
     		this.tenant = { ...val }
     		// 修改的时候,订单详情数据(BOM产品)
+        this.oldName = val.orderName
     		this.getBomList()
     	}
       // 字典表

+ 1 - 1
imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/SchedResource.vue

@@ -22,7 +22,7 @@
 		      class="noPaddingTable"
 		      style="width: 100%;"
 		    >
-		    	<el-table-column label="基础信息" align="center">
+		    	<el-table-column label="基础信息" align="center" fixed="left"  width="100%">
 			    	<!-- 序号 -->
 			    	<el-table-column :label='$t("common.serialNo")' width="50px" align="center">
 				      <template slot-scope="scope">