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

imcs-ui/src/views/zuihou/prepareProductMgr/plateMgr/components/Edit.vue

@@ -14,7 +14,7 @@
         <el-input v-model="tenant.name" :placeholder='$t("common.pleaseEnter")'/>
       </el-form-item>
       <!--所属产线-->
-      <el-form-item v-if="$store.state.account.user.roles.indexOf('舱体') < 0 && $store.state.account.user.roles.indexOf('框体') < 0" label='所属产线：' prop="zoneId">
+      <!-- <el-form-item v-if="$store.state.account.user.roles.indexOf('舱体') < 0 && $store.state.account.user.roles.indexOf('框体') < 0" label='所属产线：' prop="zoneId">
         <el-select
           v-model="tenant.zoneId"
            :placeholder='$t("common.pleaseSelect")'
@@ -27,7 +27,7 @@
             :value="item.id"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <!--品牌-->
     	<el-form-item :label='$t("prepare.table.tray.brand")+"："' prop="brand">
       	<el-select style="width:100%" :placeholder='$t("common.pleaseSelect")' v-model="tenant.brand.key" value>

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

@@ -351,7 +351,10 @@ export default {
         },
       },
       rules: {
-        custId: [
+        orderName: [
+        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        ],
+        zoneId: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
         ],
         deliveryTime: [
@@ -642,7 +645,14 @@ export default {
         areaMgrApi.getList({status:1}).then(res => {
     		res = res.data
     		if(res.isSuccess){
-    			this.zoneList = res.data
+          //this.zoneList = res.data
+           res.data.forEach((element) => {
+             if(element.name != '智能生产保障系统')
+              this.zoneList.push({
+                  id: element.id,
+                  name: element.name
+              })
+          });
     		}
     	})
     },

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

@@ -256,7 +256,6 @@ export default {
     },
     setTenant (val) {
     	if(val){
-    		console.log("dsfsfsfas === ", val)
     		this.tenant = { ...val };
     		// 获取原材料详情
     		this.getMaterial(val.meterialId);
@@ -269,7 +268,6 @@ export default {
     getMaterial(id) {
     	MaterialApi.get({ id }).then(res=> {
     		res = res.data;
-    		console.log("获取【原材料】详情 === ", res)
     		if(res.code == 0) {
     			// 如果存在，才赋值
     			if(res.data) {
@@ -295,7 +293,12 @@ export default {
     		this.$emit("success", this.selection[0]);
     		// 关闭弹出框
     		this.isVisible = false
-    	} else {
+    	}else if(!this.selection.length){
+	        this.$message({
+          message: "请选择一条数据~~",
+          type: 'warning'
+        })
+      } else {
     		this.$message({
           message: "只能选择一条数据~~",
           type: 'warning'

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

@@ -308,6 +308,7 @@ export default {
       this.queryParams = initQueryParams({})
       // 清空列表选中的数据
       this.$refs.table.clearSelection()
+      this.fetch()
     },
     submitForm () {
     	this.selection.forEach(item => {

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

@@ -70,7 +70,7 @@
 	        </div>
 	      </template>
       </el-table-column>
-      <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
+      <el-table-column align="center" type="selection" width="55px" :reserve-selection="true" />
       <!-- 订单编号 -->
       <el-table-column prop="orderNo" :label='$t("runCenter.table.oder.orderNo")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 订单名称 -->
@@ -78,16 +78,16 @@
       <!-- 简称 -->
       <!--<el-table-column prop="custDesc" :label='$t("runCenter.table.oder.custDesc")' :show-overflow-tooltip="true"></el-table-column>-->
       <!-- 来源 -->
-      <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" width="80px">
+      <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" style="width: 9%;">
       	<template slot-scope="{ row }">
 	      	<el-tag v-if="row.source == '1'">{{$t("runCenter.common.source.self")}}</el-tag>
 					<el-tag v-if="row.source == '2'" type="success">{{$t("runCenter.common.source.out")}}</el-tag>
 				</template>
       </el-table-column>
       <!-- 交货日期 -->
-      <el-table-column prop="deliveryTime" :label='$t("runCenter.table.oder.deliveryTime")' :show-overflow-tooltip="true"></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="status" :label='$t("runCenter.table.oder.status")' align="center" width="90px">
+      <el-table-column prop="status" :label='$t("runCenter.table.oder.status")' align="center" style="width: 9%;">
       	<template slot-scope="{ row }">
           <el-tag :type="row.status=='1' ? 'success' : 'danger'">
           	{{ row.status=='1' ? $t("common.status.valid") : $t("common.frozen") }}
@@ -95,16 +95,16 @@
         </template>
       </el-table-column>
       <!-- 下单日期 -->
-      <el-table-column prop="orderTime" :label='$t("runCenter.table.oder.orderTime")' width="180px"></el-table-column>
+      <el-table-column prop="orderTime" :label='$t("runCenter.table.oder.orderTime")' style="width: 12%;"></el-table-column>
       <!-- 创建时间 -->
-      <el-table-column prop="createTime" :label='$t("runCenter.table.oder.createTime")' width="180px"></el-table-column>
+      <el-table-column prop="createTime" :label='$t("runCenter.table.oder.createTime")' style="width: 12%;"></el-table-column>
       <!-- 操作 -->
       <el-table-column
         :label="$t('table.operation')"
         fixed="right"
         align="center"
         column-key="operation"
-        width="60px"
+        style="width: 8%;"
       >
         <template slot-scope="{ row }">
         	<el-tooltip class="item" :content='$t("runCenter.buttons.viewOrder")' effect="dark" placement="top-start">

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

@@ -66,26 +66,26 @@
       </el-table-column>
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
       <!-- 订单编号 -->
-      <el-table-column prop="orderNo" :label='$t("runCenter.table.oder.orderNo")' :show-overflow-tooltip="true" width="180px"></el-table-column>
+      <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" width="180px"></el-table-column>
+      <el-table-column prop="orderName" :label='$t("runCenter.table.oder.orderName")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
       <!-- 交货日期 -->
-      <el-table-column prop="deliveryTime" :label='$t("runCenter.table.oder.deliveryTime")' :show-overflow-tooltip="true" width="160px"></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" width="80px">
+      <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" style="width: 8%;">
       	<template slot-scope="{ row }">
 	      	<el-tag v-if="row.source == '1'">{{$t("runCenter.common.source.self")}}</el-tag>
 					<el-tag v-if="row.source == '2'" type="success">{{$t("runCenter.common.source.out")}}</el-tag>
 				</template>
       </el-table-column>
       <!-- 零件 -->
-      <el-table-column prop="bomDesc" :label='$t("runCenter.table.oder.bomName")' :show-overflow-tooltip="true" width="100px"></el-table-column>
+      <el-table-column prop="bomDesc" :label='$t("runCenter.table.oder.bomName")' :show-overflow-tooltip="true" style="width: 10%;"></el-table-column>
       <!-- 产品代号 -->
-      <el-table-column prop="bomAlias" :label='$t("runCenter.table.oder.bomAlias")' :show-overflow-tooltip="true" width="100px"></el-table-column>
+      <el-table-column prop="bomAlias" :label='$t("runCenter.table.oder.bomAlias")' :show-overflow-tooltip="true" style="width: 10%;"></el-table-column>
      	<!-- 零件交货日期 -->
-      <el-table-column prop="pdeliveryTime" :label='$t("runCenter.table.oder.pdeliveryTime")' :show-overflow-tooltip="true" width="160px"></el-table-column>
+      <el-table-column prop="pdeliveryTime" :label='$t("runCenter.table.oder.pdeliveryTime")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
       <!-- 计划状态 -->
-      <el-table-column prop="planStatus" :label='$t("runCenter.table.plan.pStatus")' :show-overflow-tooltip="true" width="120" align="center">
+      <el-table-column prop="planStatus" :label='$t("runCenter.table.plan.pStatus")' :show-overflow-tooltip="true" style="width: 12%;" align="center">
         <template slot-scope="{ row }">
 	      	<el-tag v-if="row.planStatus == '0'" type="warning">{{$t("runCenter.common.planStatus.zero")}}</el-tag>
 	      	<el-tag v-if="row.planStatus == '1'" type="info">{{$t("runCenter.common.planStatus.one")}}</el-tag>
@@ -122,15 +122,15 @@
 <!--      &lt;!&ndash; 优先级 &ndash;&gt;-->
 <!--      <el-table-column prop="prority" :label='$t("runCenter.table.plan.priority")' :show-overflow-tooltip="true" width="120"></el-table-column>-->
       <!-- 零件总数 -->
-      <el-table-column prop="planBomNum" :label='$t("runCenter.table.oder.planAllNum")' :show-overflow-tooltip="true" width="80px">
+      <el-table-column prop="planBomNum" :label='$t("runCenter.table.oder.planAllNum")' :show-overflow-tooltip="true" style="width: 8%;">
       	<!--<template slot-scope="scope">
       		<div class="pointerCls" @click="view(scope.row)">{{ scope.row.planBomNum }}</div>
       	</template>-->
       </el-table-column>
       <!-- 不合格数量 -->
-      <el-table-column prop="produceNum" :label='$t("runCenter.table.oder.buhegeNum")' :show-overflow-tooltip="true" width="100px"></el-table-column>
+      <el-table-column prop="produceNum" :label='$t("runCenter.table.oder.buhegeNum")' :show-overflow-tooltip="true" style="width: 8%;"></el-table-column>
       <!-- 已完成（数量） -->
-      <el-table-column prop="completeNum" :label='$t("runCenter.table.oder.completeNum")' :show-overflow-tooltip="true" width="80px"></el-table-column>
+      <el-table-column prop="completeNum" :label='$t("runCenter.table.oder.completeNum")' :show-overflow-tooltip="true" style="width: 8%;"></el-table-column>
       <!-- 操作 -->
       <el-table-column
         :label="$t('table.operation')"
@@ -252,7 +252,7 @@
 				partsTracedBackCardVisible: false,
 	      tableKey: 0,
 				orderId:"",
-				plandIds: "",
+				planId: "",
         rowData:{},
 	      queryParams: initQueryParams({}),
 	      selection: [],

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

@@ -68,24 +68,24 @@
 	        </div>
 	      </template>
       </el-table-column>
-      <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
+      <el-table-column align="center" type="selection" width="55px" :reserve-selection="true" />
       <!-- 订单编号 -->
-      <el-table-column prop="orderNo" :label='$t("runCenter.table.oder.orderNo")' :show-overflow-tooltip="true" width="180px"></el-table-column>
+      <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" width="180px"></el-table-column>
+      <el-table-column prop="orderName" :label='$t("runCenter.table.oder.orderName")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
       <!-- 简称 -->
       <!--<el-table-column prop="custDesc" :label='$t("runCenter.table.oder.custDesc")' :show-overflow-tooltip="true" width="120px"></el-table-column>-->
       <!-- 来源 -->
-      <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" width="80px">
+      <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" style="width: 8%;">
       	<template slot-scope="{ row }">
 	      	<el-tag v-if="row.source == '1'">{{$t("runCenter.common.source.self")}}</el-tag>
 					<el-tag v-if="row.source == '2'" type="success">{{$t("runCenter.common.source.out")}}</el-tag>
 				</template>
       </el-table-column>
       <!-- 交货日期 -->
-      <el-table-column prop="deliveryTime" :label='$t("runCenter.table.oder.deliveryTime")' :show-overflow-tooltip="true" width="120px"></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="orderStatus" :label='$t("runCenter.table.oder.orderStatus")' align="center" width="90px">
+      <el-table-column prop="orderStatus" :label='$t("runCenter.table.oder.orderStatus")' align="center" style="width: 10%;">
       	<template slot-scope="{ row }">
       		<el-tag v-if="row.orderStatus == '0'" type="info">{{$t("runCenter.common.orderStatus.zero")}}</el-tag>
 	      	<el-tag v-if="row.orderStatus == '1'" type="warn">{{$t("runCenter.common.orderStatus.one")}}</el-tag>
@@ -126,7 +126,7 @@
 				</template>
       </el-table-column>-->
       <!-- 审核状态 -->
-      <el-table-column prop="auditStatus" :label='$t("runCenter.table.oder.auditStatus")' align="center" width="90px">
+      <el-table-column prop="auditStatus" :label='$t("runCenter.table.oder.auditStatus")' align="center" style="width: 8%;">
       	<template slot-scope="{ row }">
 	      	<el-tag v-if="row.auditStatus == '1'" type="info">{{$t("common.audio.daiAudio")}}</el-tag>
 					<el-tag v-if="row.auditStatus == '2'" type="success">{{$t("common.audio.audioOk")}}</el-tag>
@@ -134,7 +134,7 @@
 				</template>
       </el-table-column>
       <!-- 启用状态 -->
-      <el-table-column prop="status" :label='$t("runCenter.table.oder.status")' :show-overflow-tooltip="true" width="100px">
+      <el-table-column prop="status" :label='$t("runCenter.table.oder.status")' :show-overflow-tooltip="true" style="width: 8%;">
       	<template slot-scope="{ row }">
           <el-tag :type="row.status=='1' ? 'success' : 'danger'">
           	{{ row.status=='1' ? $t("common.status.valid") : $t("common.frozen") }}
@@ -142,16 +142,16 @@
         </template>
       </el-table-column>
       <!-- 下单日期 -->
-      <el-table-column prop="orderTime" :label='$t("runCenter.table.oder.orderTime")' width="160px"></el-table-column>
+      <el-table-column prop="orderTime" :label='$t("runCenter.table.oder.orderTime")' style="width: 12%;"></el-table-column>
       <!-- 创建时间 -->
-      <el-table-column prop="createTime" :label='$t("runCenter.table.oder.createTime")' width="160px"></el-table-column>
+      <el-table-column prop="createTime" :label='$t("runCenter.table.oder.createTime")' style="width: 12%;"></el-table-column>
       <!-- 操作 -->
       <el-table-column
         :label="$t('table.operation')"
         fixed="right"
         align="center"
         column-key="operation"
-        width="60px"
+        style="width: 10%;"
       >
         <template slot-scope="{ row }">
         	<el-tooltip class="item" :content='$t("runCenter.buttons.viewOrder")' effect="dark" placement="top-start">

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

@@ -68,24 +68,24 @@
 	        </div>
 	      </template>
       </el-table-column>
-      <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
+      <el-table-column align="center" type="selection" width="55px" :reserve-selection="true" />
       <!-- 订单编号 -->
-      <el-table-column prop="orderNo" :label='$t("runCenter.table.oder.orderNo")' :show-overflow-tooltip="true" width="180px"></el-table-column>
+      <el-table-column prop="orderNo" :label='$t("runCenter.table.oder.orderNo")' :show-overflow-tooltip="true" style="width: 9%;"></el-table-column>
       <!-- 订单名称 -->
-      <el-table-column prop="orderName" :label='$t("runCenter.table.oder.orderName")' :show-overflow-tooltip="true" width="180px"></el-table-column>
+      <el-table-column prop="orderName" :label='$t("runCenter.table.oder.orderName")' :show-overflow-tooltip="true" style="width: 9%;"></el-table-column>
       <!-- 简称 -->
       <!--<el-table-column prop="custDesc" :label='$t("runCenter.table.oder.custDesc")' :show-overflow-tooltip="true" width="120px"></el-table-column>-->
       <!-- 来源 -->
-      <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" width="80px">
+      <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" style="width: 9%;">
       	<template slot-scope="{ row }">
 	      	<el-tag v-if="row.source == '1'">{{$t("runCenter.common.source.self")}}</el-tag>
 					<el-tag v-if="row.source == '2'" type="success">{{$t("runCenter.common.source.out")}}</el-tag>
 				</template>
       </el-table-column>
       <!-- 交货日期 -->
-      <el-table-column prop="deliveryTime" :label='$t("runCenter.table.oder.deliveryTime")' :show-overflow-tooltip="true" width="120px"></el-table-column>
+      <el-table-column prop="deliveryTime" :label='$t("runCenter.table.oder.deliveryTime")' :show-overflow-tooltip="true" style="width: 9%;"></el-table-column>
       <!-- 订单状态 -->
-      <el-table-column prop="orderStatus" :label='$t("runCenter.table.oder.orderStatus")' align="center" width="90px">
+      <el-table-column prop="orderStatus" :label='$t("runCenter.table.oder.orderStatus")' align="center" style="width: 9%;">
       	<template slot-scope="{ row }">
       		<el-tag v-if="row.orderStatus == '0'" type="info">{{$t("runCenter.common.orderStatus.zero")}}</el-tag>
 	      	<el-tag v-if="row.orderStatus == '1'" type="warn">{{$t("runCenter.common.orderStatus.one")}}</el-tag>
@@ -94,7 +94,7 @@
 				</template>
       </el-table-column>
       <!-- 审核状态 -->
-      <el-table-column prop="auditStatus" :label='$t("runCenter.table.oder.auditStatus")' align="center" width="100px">
+      <el-table-column prop="auditStatus" :label='$t("runCenter.table.oder.auditStatus")' align="center" style="width: 9%;">
       	<template slot-scope="{ row }">
 	      	<el-tag v-if="row.auditStatus == '1'" type="info">{{$t("common.audio.daiAudio")}}</el-tag>
 					<el-tag v-if="row.auditStatus == '2'" type="success">{{$t("common.audio.audioOk")}}</el-tag>
@@ -102,7 +102,7 @@
 				</template>
       </el-table-column>
       <!-- 启用状态 -->
-      <el-table-column prop="status" :label='$t("runCenter.table.oder.status")' :show-overflow-tooltip="true" width="100px">
+      <el-table-column prop="status" :label='$t("runCenter.table.oder.status")' :show-overflow-tooltip="true" style="width: 9%;">
       	<template slot-scope="{ row }">
           <el-tag :type="row.status=='1' ? 'success' : 'danger'">
           	{{ row.status=='1' ? $t("common.status.valid") : $t("common.frozen") }}
@@ -110,16 +110,16 @@
         </template>
       </el-table-column>
       <!-- 下单日期 -->
-      <el-table-column prop="orderTime" :label='$t("runCenter.table.oder.orderTime")' width="160px"></el-table-column>
+      <el-table-column prop="orderTime" :label='$t("runCenter.table.oder.orderTime")' style="width: 9%;"></el-table-column>
       <!-- 创建时间 -->
-      <el-table-column prop="createTime" :label='$t("runCenter.table.oder.createTime")' width="160px"></el-table-column>
+      <el-table-column prop="createTime" :label='$t("runCenter.table.oder.createTime")' style="width: 9%;"></el-table-column>
       <!-- 操作 -->
       <el-table-column
         :label="$t('table.operation')"
         fixed="right"
         align="center"
         column-key="operation"
-        width="60px"
+        style="width: 10%;"
       >
         <template slot-scope="{ row }">
         	<el-tooltip class="item" :content='$t("runCenter.buttons.viewOrder")' effect="dark" placement="top-start">

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

@@ -103,35 +103,35 @@
       @cell-click="cellClick"
     >
     	<!-- 序号 -->
-    	<el-table-column :label='$t("common.serialNo")' width="55px" align="center">
+    	<el-table-column :label='$t("common.serialNo")' style="width: 3%;" align="center">
 	      <template slot-scope="scope">
 	        <div>
 	          {{scope.$index+(queryParams.current - 1) * queryParams.size + 1}}
 	        </div>
 	      </template>
       </el-table-column>
-      <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
+      <el-table-column align="center" type="selection" style="width: 3%;" :reserve-selection="true" />
       <!-- 订单编号 -->
-      <el-table-column prop="orderNo" :label='$t("runCenter.table.oder.orderNo")' :show-overflow-tooltip="true" width="180px"></el-table-column>
+      <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" width="180px"></el-table-column>
+      <el-table-column prop="orderName" :label='$t("runCenter.table.oder.orderName")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
       <!-- 交货日期 -->
-      <el-table-column prop="deliveryTime" :label='$t("runCenter.table.oder.deliveryTime")' :show-overflow-tooltip="true" width="160px"></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" width="80px">
+      <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" style="width: 8%;">
       	<template slot-scope="{ row }">
 	      	<el-tag v-if="row.source == '1'">{{$t("runCenter.common.source.self")}}</el-tag>
 					<el-tag v-if="row.source == '2'" type="success">{{$t("runCenter.common.source.out")}}</el-tag>
 				</template>
       </el-table-column>
       <!-- 零件 -->
-      <el-table-column prop="bomDesc" :label='$t("runCenter.table.oder.bomName")' :show-overflow-tooltip="true" width="100px"></el-table-column>
+      <el-table-column prop="bomDesc" :label='$t("runCenter.table.oder.bomName")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
       <!-- 产品代号 -->
-      <el-table-column prop="bomAlias" :label='$t("runCenter.table.oder.bomAlias")' :show-overflow-tooltip="true" width="100px"></el-table-column>
+      <el-table-column prop="bomAlias" :label='$t("runCenter.table.oder.bomAlias")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
      	<!-- 零件交货日期 -->
-      <el-table-column prop="pdeliveryTime" :label='$t("runCenter.table.oder.pdeliveryTime")' :show-overflow-tooltip="true" width="160px"></el-table-column>
+      <el-table-column prop="pdeliveryTime" :label='$t("runCenter.table.oder.pdeliveryTime")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
       <!-- 计划状态 -->
-      <el-table-column prop="planStatus" :label='$t("runCenter.table.plan.pStatus")' :show-overflow-tooltip="true" width="120" align="center">
+      <el-table-column prop="planStatus" :label='$t("runCenter.table.plan.pStatus")' :show-overflow-tooltip="true" style="width: 12%;" align="center">
         <template slot-scope="{ row }">
 	      	<el-tag v-if="row.planStatus == '0'" type="warning">{{$t("runCenter.common.planStatus.zero")}}</el-tag>
 	      	<el-tag v-if="row.planStatus == '1'" type="info">{{$t("runCenter.common.planStatus.one")}}</el-tag>
@@ -140,7 +140,7 @@
 				</template>
       </el-table-column>
       <!-- 计划进度 -->
-      <el-table-column prop="process" :label='$t("runCenter.table.plan.planProgress")' :show-overflow-tooltip="true" width="200">
+      <el-table-column prop="process" :label='$t("runCenter.table.plan.planProgress")' :show-overflow-tooltip="true" style="width: 18%;">
       	<template slot-scope="scope">
 		  		<!--<el-progress v-if="scope.row.jindu <= 25" :text-inside="true" :stroke-width="24" :percentage="scope.row.jindu" status="exception"></el-progress>
 		  		<el-progress v-if="scope.row.jindu > 25 && scope.row.jindu <= 50" :text-inside="true" :stroke-width="24" :percentage="scope.row.jindu" status="warning"></el-progress>-->
@@ -149,7 +149,7 @@
 		  	</template>
       </el-table-column>
       <!-- 排产 -->
-      <el-table-column prop="schedulingStatus" :label='$t("runCenter.table.plan.schedulingStatus")' :show-overflow-tooltip="true" width="120" align="center">
+      <el-table-column prop="schedulingStatus" :label='$t("runCenter.table.plan.schedulingStatus")' :show-overflow-tooltip="true" style="width: 12%;" align="center">
       	<template slot-scope="{ row }">
       		<el-tag v-if="row.schedulingStatus == '0'" type="info">待排产</el-tag>
       		<el-tag v-if="row.schedulingStatus == '1'" type="success">已排产</el-tag>
@@ -159,7 +159,7 @@
 				</template>
       </el-table-column>
       <!-- 生产 -->
-      <el-table-column prop="produceStatus" :label='$t("runCenter.table.plan.produceStatus")' :show-overflow-tooltip="true" width="120" align="center">
+      <el-table-column prop="produceStatus" :label='$t("runCenter.table.plan.produceStatus")' :show-overflow-tooltip="true" style="width: 12%;" align="center">
       	<template slot-scope="{ row }">
       		<el-tag v-if="row.produceStatus == '3'" type="warning">{{$t("runCenter.common.produceStatus.panse")}}</el-tag>
 	      	<el-tag v-if="row.produceStatus == '1'" type="info">{{$t("runCenter.common.produceStatus.noStart")}}</el-tag>
@@ -168,24 +168,24 @@
 				</template>
       </el-table-column>
       <!-- 优先级 -->
-      <el-table-column prop="prority" :label='$t("runCenter.table.plan.priority")' :show-overflow-tooltip="true" width="120"></el-table-column>
+      <el-table-column prop="prority" :label='$t("runCenter.table.plan.priority")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
       <!-- 零件总数 -->
-      <el-table-column prop="planBomNum" :label='$t("runCenter.table.oder.planAllNum")' :show-overflow-tooltip="true" width="80px">
+      <el-table-column prop="planBomNum" :label='$t("runCenter.table.oder.planAllNum")' :show-overflow-tooltip="true" style="width: 8%;">
       	<!--<template slot-scope="scope">
       		<div class="pointerCls" @click="view(scope.row)">{{ scope.row.planBomNum }}</div>
       	</template>-->
       </el-table-column>
       <!-- 不合格数量 -->
-      <el-table-column prop="unqualifiedBomNum" :label='$t("runCenter.table.oder.buhegeNum")' :show-overflow-tooltip="true" width="100px"></el-table-column>
+      <el-table-column prop="unqualifiedBomNum" :label='$t("runCenter.table.oder.buhegeNum")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
       <!-- 已完成（数量） -->
-      <el-table-column prop="completeNum" :label='$t("runCenter.table.oder.completeNum")' :show-overflow-tooltip="true" width="80px"></el-table-column>
+      <el-table-column prop="completeNum" :label='$t("runCenter.table.oder.completeNum")' :show-overflow-tooltip="true" style="width: 8%;"></el-table-column>
       <!-- 操作 -->
       <el-table-column
         :label="$t('table.operation')"
         fixed="right"
         align="center"
         column-key="operation"
-        width="170px"
+        width="200px"
       >
         <template slot-scope="{ row }">
         	<!-- 生产详情-->

imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/AddInspection.vue

@@ -9,12 +9,14 @@
   	top="50px"
   >
     <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">      
-      <el-form-item label='选择工序' prop="procedureId">
+      <el-form-item label='选择工序' prop="taskId">
         <template>
-          <div v-if="procedureList.length>0">         
-            <div v-for="procedure in procedureList" :key="procedure.id">
-                <el-radio v-model="tenant.procedureId" :label="procedure.id" border>{{procedure.no}} {{procedure.name}}</el-radio>
-            </div>            
+          <div v-if="procedureList.length>0">
+            <el-radio-group v-model="tenant.taskId">         
+              <div v-for="procedure in procedureList" :key="procedure.id">
+                  <el-radio :label="procedure.id" border>{{procedure.procedureNo}} {{procedure.procedureName}}</el-radio>
+              </div>
+            </el-radio-group>            
           </div>
           <div class="hint" v-else><span>没有可以选择的工序</span></div>
 				</template>
@@ -55,7 +57,7 @@ export default {
       },
       roles: [],
       rules: {
-        procedureId: [
+        taskId: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
         ]
       }
@@ -85,7 +87,7 @@ export default {
         bomId: '',        
         orderId: '',
         planId: '',
-        procedureId: '',
+        taskId: '',        
         zoneId: '',
         result: '',
         report: '',
@@ -114,7 +116,7 @@ export default {
       }
       // 字典表
       this.dicts = dicts      
-      this.getProcedures({bomId: this.tenant.bomId,workpieceId:this.tenant.workpieceId})
+      this.getProcedures(this.tenant)
     },
     close () {
       this.$emit('close')
@@ -154,6 +156,8 @@ export default {
             })
             // 通知列表
 	          this.$emit("success");
+            // 刷新父页面
+            this.$emit("refresh");
 	          // 通知列表-并关闭弹出框
 	          this.$emit("close");
           }

imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/MyDraw.vue

@@ -144,6 +144,7 @@
       		:dialog-visible="addViewVisible"
 			    :title="addViewTitle"
       		@close="addViewClose"
+          @refresh="fetch"
     	/>
 
     </el-form>
@@ -182,6 +183,7 @@ export default {
     	expands: [], // 展开行的key
     	qiyongStatus: [], //状态
     	statusList: [], // 启用状态
+      workpieceId: [],
     	queryParams: initQueryParams({}),
     	selection: [],
     	loading: false,
@@ -316,7 +318,8 @@ export default {
     setTenant (val) {
     	if(val){
     		this.tenant = { ...val }
-    	}
+    	}      
+      this.getWorkpiece()
       this.fetch()
     },
     close () {
@@ -324,6 +327,7 @@ export default {
     },
     addViewClose() {
       this.addViewVisible = false;
+      //this.$emit('close')
     },    
     // 【重置】按钮-事件
     reset () {
@@ -407,6 +411,18 @@ export default {
         this.addViewTitle = "选择抽检工序"
         this.addViewVisible = true
     },    
+    //获取工件ID
+    async getWorkpiece(){
+        let params = {current:1, size:1000, model:{planId: this.tenant.id}} 
+        await inspectionApi.getWorkpiece(params).then(response => {
+            const res = response.data           
+            if (res.isSuccess) {               
+               res.data.records.forEach(item =>{
+                  this.workpieceId.push(item.id);
+               });               
+            }
+       });
+    },
     // 获取列表数据-函数
     fetch (params = {}) {
       this.loading = true
@@ -416,7 +432,7 @@ export default {
       this.queryParams.size = params.size ? params.size : this.queryParams.size
 			// 必须传的参数
       this.queryParams.model.planId = this.tenant.id     
-
+     
 			// 测试数据，真实数据，请使用page
       inspectionApi.page(this.queryParams).then(response => {      
         const res = response.data	        
@@ -425,11 +441,11 @@ export default {
         	this.tableData.total = this.tenant.planBomNum;
           //console.log(this.tenant)          
           this.tableData.records = []
-          let workpieceIdArr = this.tenant.workpieceIds.split(',')
+          //let workpieceIdArr = this.tenant.workpieceIds.split(',')
           //只显示未加工完成的零件
           for(let i=Number(this.tenant.completeNum); i<this.tableData.total; i++){
             let plan = {bomName:this.tenant.bomDesc, partsNo:this.tenant.partsNo,partsAlias:this.tenant.partsAlias,
-                startTime:this.tenant.startTime, endTime:this.tenant.endTime, id:workpieceIdArr[i], hasChildren:false
+                startTime:this.tenant.startTime, endTime:this.tenant.endTime, id:this.workpieceId[i], hasChildren:false
             }            
             if(res.data.records.length > 0){
                plan.children = []

imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/ViewResult.vue

@@ -163,6 +163,7 @@ export default {
     	expands: [], // 展开行的key
     	qiyongStatus: [], //状态
     	statusList: [], // 启用状态
+      workpieceId: [],
     	queryParams: initQueryParams({}),
     	selection: [],
     	loading: false,
@@ -250,6 +251,7 @@ export default {
     	if(val){        
     		this.tenant = { ...val }
     	}
+      this.getWorkpiece()
       this.fetch()
     },
     close () {
@@ -263,7 +265,18 @@ export default {
       // 清空列表选中的数据
       this.$refs.table.clearSelection()
     },
-    
+    //获取工件ID
+    async getWorkpiece(){
+        let params = {current:1, size:1000, model:{planId: this.tenant.id}} 
+        await inspectionApi.getWorkpiece(params).then(response => {
+            const res = response.data           
+            if (res.isSuccess) {               
+               res.data.records.forEach(item =>{
+                  this.workpieceId.push(item.id);
+               });               
+            }
+       });
+    },    
     // 获取列表数据-函数
     fetch (params = {}) {
       this.loading = true
@@ -283,11 +296,10 @@ export default {
         	// 总数
         	this.tableData.total = this.tenant.planBomNum;
           //console.log(this.tenant)          
-          this.tableData.records = []
-          let workpieceIdArr = this.tenant.workpieceIds.split(',')
+          this.tableData.records = []          
           for(let i=Number(this.tenant.completeNum); i<this.tableData.total; i++){
             let plan = {bomName:this.tenant.bomDesc, partsNo:this.tenant.partsNo,partsAlias:this.tenant.partsAlias,
-                startTime:this.tenant.startTime, endTime:this.tenant.endTime, id:workpieceIdArr[i], hasChildren:false
+                startTime:this.tenant.startTime, endTime:this.tenant.endTime, id:this.workpieceId[i], hasChildren:false
             }            
             if(res.data.records.length > 0){
                plan.children = []