Przeglądaj źródła

解决前端展示功能

oyq28 10 godzin temu
rodzic
commit
c91f872c2e

+ 1 - 10
imcs-ui/public/index.html

@@ -9,16 +9,7 @@
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
     />
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-    <title><%= webpackConfig.name %></title>
-    <script>
-      var _hmt = _hmt || [];
-      (function() {
-        var hm = document.createElement("script");
-        hm.src = "https://hm.baidu.com/hm.js?ae92ebc51ffb2f8d62e7164dceac0b71";
-        var s = document.getElementsByTagName("script")[0];
-        s.parentNode.insertBefore(hm, s);
-      })();
-    </script>
+    <title><%= webpackConfig.name %></title>    
   </head>
   <body>
     <div id="app"></div>

+ 11 - 1
imcs-ui/src/api/systemMgr/toolbar.js

@@ -92,7 +92,11 @@ const apiList = {
   reStationSchedule:{
     method: 'POST',
     url: `/authority/toolbar/reStationSchedule`
-  } 
+  },
+  delOrder:{
+    method: 'POST',
+    url: `/authority/toolbar/delOrder`
+  },
 }
 
 export default {
@@ -233,5 +237,11 @@ export default {
       ...apiList.reStationSchedule,
       data  
     })
+  },
+  delOrder (data) {
+    return axiosApi({
+      ...apiList.delOrder,
+      data  
+    })
   }
 }

+ 1 - 0
imcs-ui/src/lang/zh/runCenter.js

@@ -171,6 +171,7 @@ export default {
 			oder: {
 				orderNo: '订单编号',
 				orderName: '订单名称',
+				orderId: '订单ID',
 				custDesc: '客户简称',
 				bomName: '零件',
 				planAllNum: '零件总数',

+ 49 - 2
imcs-ui/src/views/zuihou/dispatchMgr/tools/Index.vue

@@ -512,6 +512,22 @@
   			</el-form-item>
 	  </el-form>	
 	</el-card>
+
+	<el-card class="box-card">
+        <div slot="header" class="clearfix">强制订单删除</div>
+		<el-form ref="form4" :model="form22" :rules="rules15" label-width="80px">
+			<el-row :gutter="12" >
+				<el-col :xs="6" :sm="5">
+					<el-form-item label="订单ID:" prop="orderId">
+                    	<el-input v-model="form22.orderId" placeholder="订单ID"></el-input>						
+					</el-form-item>
+				</el-col>											
+			</el-row>
+			<el-form-item>
+    			<el-button type="primary" @click="delOrder">删除</el-button>    		
+  			</el-form-item>
+	  </el-form>
+	</el-card>
   </div>
 </template>
 
@@ -617,8 +633,7 @@
 			orderName:""	
 		  },
 		  form22:{			
-			start: "",
-			goal: ""			
+			orderId: ""					
 		  },
 		  lineList: [{"name":"框体","value":"KT"},{"name":"舱体","value":"CT"},{"name":"保障中心","value":"BZ"},{"name":"翼片","value":"YP"},{"name":"中舱","value":"ZC"}],
 		  typeList: [{"name":"全部","value":"0"},{"name":"FANUC","value":"1"},{"name":"HEIDENHAIN","value":"2"},{"name":"DMG","value":"3"},{"name":"HELLER","value":"4"}],
@@ -1342,6 +1357,38 @@
 				}				
 			});
 		},
+		delOrder () {
+            this.$confirm('确认是否删除订单数据?', this.$t("common.tips"), {
+	      	distinguishCancelAndClose: true,
+	        confirmButtonText: this.$t("common.confirm"),
+	        cancelButtonText: this.$t("common.cancel"),
+	        type: "warning"
+	      }).then(() => {
+			this.$refs.form4.validate((valid) => {
+				if(valid){
+					toolbarApi.delOrder({orderId: this.form22.orderId}).then(response=>{
+						const res = response.data
+						if(res.isSuccess){
+							this.$message({
+              					message: this.$t('tips.updateSuccess'),
+              					type: 'success'
+            				})
+						}else{
+							this.$message({
+              					message: res.msg,
+              					type: 'warning'
+            				})
+						}
+					}).finally(()=>{
+					   return true		
+					})					
+				}else{
+					return false
+				}				
+			});	     
+		      
+	      }).catch(() => {})
+	    },
 		cleanCache(){			
 			this.$refs.form18.validate((valid) => {
 				if(valid){					

+ 3 - 3
imcs-ui/src/views/zuihou/runManageCenter/orderMgr/Index.vue

@@ -63,10 +63,10 @@
 		  	<!--已完成-->
 		  	<finished-order ref="finishedOrder" @setTabNums="setTabNums"></finished-order>
 		  </el-tab-pane>
-		  <el-tab-pane name="taskOrder" :label='$t("runCenter.common.tab7")+"("+tabNum.tab7+")"'>
-		  	<!-- 【自定义订单】 -->
+		  <!--
+		  <el-tab-pane name="taskOrder" :label='$t("runCenter.common.tab7")+"("+tabNum.tab7+")"'>		  	
 		  	<task-order ref="taskOrder" @setTabNums="setTabNums" @audioStatus="frashAudioStatus"></task-order>
-		  </el-tab-pane>
+		  </el-tab-pane> -->
 		</el-tabs>
 		
   </div>

+ 3 - 1
imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/index.vue

@@ -116,7 +116,9 @@
       <el-table-column prop="orderNo" :label='$t("runCenter.table.oder.orderNo")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column> -->
       <!-- 订单名称 -->
       <el-table-column prop="orderName" :label='$t("runCenter.table.oder.orderName")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
-      <!-- 交货日期 -->
+	 <!-- 订单ID --> 
+	  <el-table-column prop="orderId" :label='$t("runCenter.table.oder.orderId")' :show-overflow-tooltip="true" style="width: 10%;"></el-table-column>
+	  <!-- 交货日期 -->
       <el-table-column prop="deliveryTime" :label='$t("runCenter.table.oder.deliveryTime")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
       <!-- 来源 -->
       <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" style="width: 8%;">