Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/views/saleOrder/components/AdditionalOrder.vue

@@ -12,7 +12,7 @@
             <el-input clearable :maxlength="20" v-model="form.code" />
           </el-form-item>
         </el-col>
-        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+<!--        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
           <el-form-item label="订单类型:">
             <DictSelection
               dictName="订单类型"
@@ -21,7 +21,7 @@
             >
             </DictSelection>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
           <el-form-item label="按单按库:">
             <DictSelection
@@ -60,6 +60,7 @@
       cache-key="systemRoleTable2"
       row-key="id"
       @done="setSelect"
+	  :initLoad="false"
     >
       <!-- <template v-slot:name='{row}'>
 			<el-link :underline="false" @click="openDetails(row)">
@@ -237,6 +238,11 @@
       this.requestDict('生产状态');
     },
     methods: {
+	  reload(where) {
+	    this.$nextTick(() =>
+	      this.$refs.table.reload({ page: 1, limit: 10, where })
+	    );
+	  },
       /* 表格数据源 */
       async datasource ({ page, limit, where, order }) {
         const params = {
@@ -272,8 +278,10 @@
         this.form = {};
         this.search();
       },
-      open () {
+      open (orderType) {
+		this.$set(this.form,'orderType',orderType)
         this.visible = true;
+		this.reload()
       },
       cancel () {
         this.form = {};

src/views/saleOrder/components/create-order.vue

@@ -290,6 +290,7 @@
         } else {
           this.$set(this.form, 'orderLibraryType', 2);
         }
+		this.$set(this.form, 'customerName', '');
       },
 
       async getSaleCode () {

src/views/saleOrder/components/order-search.vue

@@ -289,10 +289,14 @@
           return this.$message.warning('请先勾选一个或多个订单！');
         }
         const productCode = this.selection[0].productCode;
+		const orderType = this.selection[0].orderType;
         for (var i = 0; i < this.selection.length; i++) {
           if (productCode != this.selection[i].productCode) {
             return this.$message.warning('物料编码不一致！');
           }
+			if (orderType != this.selection[i].orderType) {
+			  return this.$message.warning('订单类型不一致！');
+			}
         }
         const list = [];
         this.selection.map((item) => {

src/views/saleOrder/salesToProduction.vue

@@ -24,6 +24,7 @@
                 dictName="订单计划类型"
                 clearable
                 v-model="form.planType"
+                disabled
               >
               </DictSelection>
             </el-form-item>
@@ -394,8 +395,10 @@
           });
           if (this.form.salesOrders.every((itm) => itm.orderType == 2)) {
             this.form.planType = 2;
-          } else {
+          } else if (this.form.salesOrders.every((itm) => itm.orderType == 1)) {
             this.form.planType = 1;
+          } else {
+            this.form.planType = 3;
           }
         });
       },
@@ -493,7 +496,7 @@
         this.form.salesOrders.splice(index, 1);
       },
       addEquipment() {
-        this.$refs.additionalRefs.open();
+        this.$refs.additionalRefs.open(this.form.planType);
       },
       openVersion() {
         this.$refs.versionRefs.open();