Merge remote-tracking branch 'origin/master' into master

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(()=> {
 						// 数据变更

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()
     	}
       // 字典表

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

@@ -2,13 +2,10 @@
   <div class="app-container">
 		<!-- 搜索模块 -->
     <div class="filter-container">
-    	<span>
-    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>
-    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>
-    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+      <!-- 订单名称 -->
+      <span style="margin-left: 15px;">
+    		<span>{{$t("runCenter.searchForm.orderName")}}：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("runCenter.searchForm.deliveryTime")}}：</span>
@@ -181,12 +178,9 @@
 	import TenantEdit from "./components/Edit"
 	import TenantView from "./components/View"
 	// 【订单管理】-API
-	import
-    orderMgrApi from "@/api/runManageCenter/orderMgr"
+	import orderMgrApi from "@/api/runManageCenter/orderMgr"
 	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
-  import planMgrApi from "@/api/runManageCenter/planMgr";
+	import { downloadFile,  initQueryParams } from '@/utils/commons'
   import FileImport from "@/components/zuihou/Import";
 	export default {
 	  name: "DraftOrder",
@@ -492,10 +486,16 @@
 	    fetch (params = {}) {
 	      this.loading = true
 	      if (this.queryParams.timeRange) {
-	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0]
-	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1]
+	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0] + " 00:00:00"
+	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1] + " 23:59:59"
 	      }
 
+        // 如果【零件交货日期】有值
+        if (this.queryParams.timeRange1) {
+          this.queryParams.model.pdeliveryTimeStart = this.queryParams.timeRange1[0] + " 00:00:00"
+          this.queryParams.model.pdeliveryTimeEnd = this.queryParams.timeRange1[1] + " 23:59:59"
+        }
+
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
 	      // 查询必须参数-草稿：orderstatus = 1 and source = 1

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/failAuditOrder/index.vue

@@ -2,13 +2,23 @@
   <div class="app-container">
 		<!-- 搜索模块 -->
     <div class="filter-container">
-    	<span>
-    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>
-    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>
-    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+<!--    	<span>-->
+<!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+<!--    	<span style="margin-left: 15px;">-->
+<!--    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+<!--      &lt;!&ndash; 零件名称 &ndash;&gt;-->
+<!--      <span>-->
+<!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.bomDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+      <!-- 订单名称 -->
+      <span style="margin-left: 15px;">
+    		<span>{{$t("runCenter.searchForm.orderName")}}：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("runCenter.searchForm.deliveryTime")}}：</span>
@@ -220,8 +230,7 @@
 	// 【订单管理】-API
 	import orderMgrApi from "@/api/runManageCenter/orderMgr"
 	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
+	import { initQueryParams } from '@/utils/commons'
 	export default {
 	  name: "DraftOrder",
 	  directives: { elDragDialog },
@@ -469,9 +478,14 @@
 	    fetch (params = {}) {
 	      this.loading = true
 	      if (this.queryParams.timeRange) {
-	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0]
-	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1]
+	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0] + " 00:00:00"
+	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1] + " 23:59:59"
 	      }
+        // 如果【零件交货日期】有值
+        if (this.queryParams.timeRange1) {
+          this.queryParams.model.pdeliveryTimeStart = this.queryParams.timeRange1[0] + " 00:00:00"
+          this.queryParams.model.pdeliveryTimeEnd = this.queryParams.timeRange1[1] + " 23:59:59"
+        }
 
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/finishedOrder/index.vue

@@ -2,13 +2,23 @@
   <div class="app-container">
 		<!-- 搜索模块 -->
     <div class="filter-container">
-    	<span>
+<!--    	<span>-->
+<!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+<!--    	<span style="margin-left: 15px;">-->
+<!--    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+      <!-- 零件名称 -->
+      <span>
     		<span>{{$t("runCenter.searchForm.bomName")}}：</span>
-    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+    		<el-input v-model="queryParams.model.bomDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>
-    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+      <!-- 订单名称 -->
+      <span style="margin-left: 15px;">
+    		<span>{{$t("runCenter.searchForm.orderName")}}：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("runCenter.searchForm.deliveryTime")}}：</span>
@@ -24,6 +34,22 @@
 		      align="right">
 		    </el-date-picker>
     	</span>
+    </div>
+    <div>
+      <span>
+    		<span>{{$t("runCenter.searchForm.deliveryTime2")}}：</span>
+    		<el-date-picker
+          v-model="queryParams.timeRange1"
+          type="daterange"
+          :picker-options="pickerOptions"
+          :range-separator='$t("common.separator")'
+          :start-placeholder='$t("common.startTime")'
+          :end-placeholder='$t("common.endTime")'
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          align="right">
+		    </el-date-picker>
+    	</span>
       <span style="margin-left: 15px;">
 	      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">
 	        {{ $t("table.search") }}
@@ -479,8 +505,8 @@
 	    fetch (params = {}) {
 	      this.loading = true
 	      if (this.queryParams.timeRange) {
-	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0]
-	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1]
+	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0] + " 00:00:00"
+	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1] + " 23:59:59"
 	      }
 
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/outNewOrder/index.vue

@@ -2,13 +2,18 @@
   <div class="app-container">
 		<!-- 搜索模块 -->
     <div class="filter-container">
-    	<span>
-    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>
-    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>
-    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+<!--    	<span>-->
+<!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+<!--    	<span style="margin-left: 15px;">-->
+<!--    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+      <!-- 订单名称 -->
+      <span style="margin-left: 15px;">
+    		<span>{{$t("runCenter.searchForm.orderName")}}：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("runCenter.searchForm.deliveryTime")}}：</span>
@@ -220,8 +225,7 @@
 	// 【订单管理】-API
 	import orderMgrApi from "@/api/runManageCenter/orderMgr"
 	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
+	import { initQueryParams } from '@/utils/commons'
 	export default {
 	  name: "DraftOrder",
 	  directives: { elDragDialog },
@@ -463,10 +467,16 @@
 	    fetch (params = {}) {
 	      this.loading = true
 	      if (this.queryParams.timeRange) {
-	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0]
-	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1]
+	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0] + " 00:00:00"
+	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1] + " 23:59:59"
 	      }
 
+        // 如果【零件交货日期】有值
+        if (this.queryParams.timeRange1) {
+          this.queryParams.model.pdeliveryTimeStart = this.queryParams.timeRange1[0] + " 00:00:00"
+          this.queryParams.model.pdeliveryTimeEnd = this.queryParams.timeRange1[1] + " 23:59:59"
+        }
+
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
 	      // 查询必须参数-新增外部：orderstatus  = 1 and source = 2

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/reviewedOrder/index.vue

@@ -5,6 +5,11 @@
 <!--    	<span>-->
 <!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
 <!--    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+      <!-- 零件名称 -->
+<!--      <span>-->
+<!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.bomDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
 <!--    	</span>-->
     	<span style="margin-left: 15px;">
     		<span>{{$t("runCenter.searchForm.orderName")}}：</span>
@@ -213,9 +218,10 @@
 	import TenantView from "./components/View"
 	// 【订单管理】-API
 	import orderMgrApi from "@/api/runManageCenter/orderMgr"
+  // 【计划管理】-API
+  import planMgrApi from "@/api/runManageCenter/planMgr"
 	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
+	import { initQueryParams } from '@/utils/commons'
 	export default {
 	  name: "DraftOrder",
 	  directives: { elDragDialog },
@@ -493,10 +499,16 @@
 	    fetch (params = {}) {
 	      this.loading = true
 	      if (this.queryParams.timeRange) {
-	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0]
-	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1]
+	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0] + " 00:00:00"
+	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1] + " 23:59:59"
 	      }
 
+        // 如果【零件交货日期】有值
+        if (this.queryParams.timeRange1) {
+          this.queryParams.model.pdeliveryTimeStart = this.queryParams.timeRange1[0] + " 00:00:00"
+          this.queryParams.model.pdeliveryTimeEnd = this.queryParams.timeRange1[1] + " 23:59:59"
+        }
+
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
 	      // 查询必须参数

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

@@ -373,8 +373,7 @@
 	// 【计划管理】-API
 	import planMgrApi from "@/api/runManageCenter/planMgr"
 	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
+	import { initQueryParams } from '@/utils/commons'
 	export default {
 	  name: "DraftOrder",
 	  directives: { elDragDialog },
@@ -1021,13 +1020,13 @@
 	      this.loading = true
 	      // 如果【订单交货日期】有值
 	      if (this.queryParams.timeRange) {
-	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0]
-	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1]
+	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0] + " 00:00:00"
+	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1] + " 23:59:59"
 	      }
 	      // 如果【零件交货日期】有值
 	      if (this.queryParams.timeRange1) {
-	        this.queryParams.model.pdeliveryTimeStart = this.queryParams.timeRange1[0]
-	        this.queryParams.model.pdeliveryTimeEnd = this.queryParams.timeRange1[1]
+	        this.queryParams.model.pdeliveryTimeStart = this.queryParams.timeRange1[0] + " 00:00:00"
+	        this.queryParams.model.pdeliveryTimeEnd = this.queryParams.timeRange1[1] + " 23:59:59"
 	      }
 
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current

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">