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

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

@@ -1,6 +1,6 @@
 <template>
   <ele-modal :visible.sync="visible" :title="title" width="80vw" append-to-body>
-    <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="90px" class="create-form">
       <el-row :gutter="15">
         <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
           <el-form-item label="销售订单号:">
@@ -19,7 +19,7 @@
         </el-col>
         <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
           <el-form-item label="订单类型:">
-            <el-select v-model="form.orderType" placeholder="请选择">
+            <el-select v-model="form.orderType" placeholder="请选择" @change="chooseType">
               <el-option
                 v-for="item in typeList"
                 :key="item.id"
@@ -155,7 +155,10 @@
         visible: false,
         loading: false,
         form: {
-          productInfoList: []
+          productInfoList: [],
+			deliveryRequirements:1,
+			orderType:1,
+			orderLibraryType:2
         },
         // 表单验证规则
         rules: {
@@ -232,6 +235,15 @@
             });
         });
       },
+	  
+	  // 选择订单类型
+	  chooseType(val){
+		  if(val==2){
+			  this.$set(this.form,'orderLibraryType',1)
+		  }else{
+			  this.$set(this.form,'orderLibraryType',2) 
+		  } 
+	  },
 
       async getSaleCode () {
         const res = await getCode('sale_order');
@@ -307,4 +319,7 @@
     margin: 10px 0;
     cursor: pointer;
   }
+  .create-form .el-form-item{
+	  margin-bottom: 15px!important;
+  }
 </style>

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

@@ -62,9 +62,9 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="生产状态:">
-          <el-select v-model="where.proStu" placeholder="请选择" class="w100">
+          <el-select v-model="where.proStu" placeholder="请选择">
             <el-option
-              v-if="chooseName == 'first'"
+              v-if="activeName == 'first'"
               v-for="item in awaitProcuct"
               :key="item.value"
               :label="item.label"
@@ -72,7 +72,7 @@
             >
             </el-option>
             <el-option
-              v-if="chooseName == 'second'"
+              v-if="activeName == 'second'"
               v-for="item in alreadyProcuct"
               :key="item.value"
               :label="item.label"
@@ -84,12 +84,15 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="按单按库:">
-          <DictSelection
-            dictName="按单按库"
-            clearable
-            v-model="where.orderLibraryType"
-          >
-          </DictSelection>
+		   <el-select v-model="where.orderLibraryType" placeholder="请选择">
+		     <el-option
+		       v-for="item in orderTypeList"
+		       :key="item.value"
+		       :label="item.label"
+		       :value="item.value"
+		     >
+		     </el-option>
+		   </el-select>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
@@ -180,7 +183,8 @@
   import { pullSalesOrder, deleteOrder } from '@/api/saleOrder';
   export default {
     props: {
-      selection: Array
+      selection: Array,
+	  activeName:String
     },
     components: {
       ImportException,
@@ -196,15 +200,16 @@
         lineNumber: '',
         model: '',
         brandNo: '',
-        orderSource: '',
-        orderType: '',
+        orderSource: 0,
+        orderType: 0,
         proStu: '',
-        orderLibraryType: '',
+        orderLibraryType: 0,
         salesman: ''
       };
       return {
         fileUrl,
         // 表单数据
+		defaultWhere,
         where: { ...defaultWhere },
         time: [],
         fileList: [],
@@ -218,7 +223,11 @@
           { value: 6, label: '已完成' },
           { value: 7, label: '已延期' }
         ],
-        chooseName: 'first'
+		orderTypeList:[
+			{ value: 0, label: '所有' },
+			{ value: 1, label: '按单' },
+			{ value: 2, label: '按库' },
+		]
       };
     },
     computed: {
@@ -227,12 +236,20 @@
         return this.$store.state.theme.styleResponsive;
       }
     },
+	watch: {
+	  activeName: {
+	    handler () {
+	      if (this.activeName=='first') {
+	         this.where.proStu = 1
+	      }else{
+			 this.where.proStu = 0
+		  }
+	    },
+	    immediate: true
+	  }
+	},
     created () {},
     methods: {
-      setData (activeName) {
-        this.chooseName = activeName;
-        this.where.proStu = '';
-      },
       /* 搜索 */
       search () {
         if (this.time.length) {
@@ -245,6 +262,11 @@
       reset () {
         this.time = [];
         this.where = { ...this.defaultWhere };
+		if (this.activeName=='first') {
+		   this.where.proStu = 1
+		}else{
+		   this.where.proStu = 0
+		}
         this.search();
       },
       toImport () {

src/views/saleOrder/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="ele-body">
     <el-card shadow="never" v-loading="loading">
-      <order-search ref="searchRefs" @search="reload" :selection="selection"> </order-search>
+      <order-search ref="searchRefs" @search="reload" :selection="selection" :activeName="activeName"> </order-search>
 	  <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
 	    <el-tab-pane label="待排产" name="first"></el-tab-pane>
 	    <el-tab-pane label="已排产" name="second"></el-tab-pane>
@@ -272,9 +272,7 @@
       },
 	  
 	  handleClick(tab, event) {
-		  this.$refs.searchRefs.setData(this.activeName)
 		  this.reload()
-		  // console.log('activeName',this.activeName);
 	  },
 	  openDetails(row){
 		  this.$refs.detailDialog.open(row)