bugs修改

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/finishedOrder/index.vue

@@ -252,7 +252,7 @@
 				partsTracedBackCardVisible: false,
 	      tableKey: 0,
 				orderId:"",
-				plandIds: "",
+				planId: "",
         rowData:{},
 	      queryParams: initQueryParams({}),
 	      selection: [],