托书查询条件调整

src/views/book/book-list.vue

@@ -47,15 +47,15 @@
                   <a-input placeholder="请输入外销发票" v-model="queryParam.exportInvoiceNo"></a-input>
                 </a-form-item>
               </a-col>
-               <!-- <a-col :md="6" :sm="8">
+               <a-col :md="6" :sm="8">
                 <a-form-model-item label="类型">
-                  <a-select v-model="queryParam.flourOrGarment">
+                  <a-select v-model="queryParam.type">
                     <a-select-option value="">请选择</a-select-option>
-                    <a-select-option value="1">成衣</a-select-option>
-                    <a-select-option value="0">面辅料</a-select-option>
+                    <a-select-option value="成衣">成衣</a-select-option>
+                    <a-select-option value="面料">面料</a-select-option>
                   </a-select>
                 </a-form-model-item>
-              </a-col> -->
+              </a-col>
             </template>
             <a-col :md="6" :sm="8">
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">

src/views/book/packingListModal.vue

@@ -40,7 +40,7 @@
              </a-col>
              <a-col :md="6" :sm="8">
               <a-form-item label="预发货日期">
-                <a-date-picker placeholder="请输入预发货日期" style="width:100%;" v-model="queryParam.hod"/>
+                <a-date-picker placeholder="请输入预发货日期" style="width:100%;" v-model="queryParam.preDeliveryDate"/>
               </a-form-item>
              </a-col>
               <a-col :md="6" :sm="8">
@@ -390,11 +390,11 @@ export default {
         this.$message.error('请选择数据！');
       }else if(this.selectedRows.length !==1 && this.error.length !==0){
         var cc =this.error.toString()
-        this.$message.error(cc+'必须相同！');
+        this.$message.error('所勾选数据'+cc+'必须相同！');
         this.error = []
       }else if(this.fatherList.length !== 0 && this.errorFather.length !==0){
         var fatherCc = this.errorFather.toString()
-        this.$message.error(fatherCc+'必须相同！');
+        this.$message.error('所勾选数据与已存在数据'+fatherCc+'必须相同！');
         this.errorFather = []
       }else{
         this.$emit('callback',this.selectedRows)

src/views/book/packingListModalFabrics.vue

@@ -22,7 +22,7 @@
 
             <a-col :md="6" :sm="8">
               <a-form-item label="外销发票号">
-                <a-input placeholder="请输入外销发票号" v-model="queryParam.orderNumber"></a-input>
+                <a-input placeholder="请输入外销发票号" v-model="queryParam.exportInvoiceNo"></a-input>
               </a-form-item>
             </a-col>
 
@@ -31,6 +31,17 @@
                 <a-input placeholder="请输入集装箱" v-model="queryParam.containerNumber"></a-input>
               </a-form-item>
             </a-col>
+            <template v-if="toggleSearchStatus">
+               <a-col :md="6" :sm="8">
+                <a-form-model-item label="类型">
+                  <a-select v-model="queryParam.type">
+                    <a-select-option value="">请选择</a-select-option>
+                    <a-select-option value="面辅料">面辅料</a-select-option>
+                    <a-select-option value="面料">面料</a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+            </template>
 
             <a-col :md="6" :sm="8">
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -216,12 +227,11 @@ export default {
       if(this.selectedRows.length === 0){
         this.$message.error('请选择数据！');
       }else if(this.selectedRows.length !==1 && this.error.length !==0){
-        var cc =this.error.toString()
-        this.$message.error(cc+'必须相同！');
+        this.$message.error('所勾选数据的成衣工厂必须相同！');
         this.error = []
       }else if(this.fatherList.length !== 0 && this.errorFather.length !==0){
         var fatherCc = this.errorFather.toString()
-        this.$message.error(fatherCc+'必须相同！');
+        this.$message.error('所勾选的数据必须与已存在数据成衣工厂必须相同！');
         this.errorFather = []
       }else{
         this.$emit('callback',this.selectedRows)
@@ -231,22 +241,18 @@ export default {
 
      //勾选两条以上数据进行校验
     dataSet(){
-       var distributionPointTest = [],
-            customerTest = []
+       var garmentFactoryTest = []
        this.selectedRows.map(item=>{
-         distributionPointTest.push(item.distributionPoint)
-         customerTest.push(item.customer)
+         garmentFactoryTest.push(item.garmentFactory)
       })
-      if([...new Set(distributionPointTest)].length !== 1){this.error.push('分销点')}
-      if([...new Set(customerTest)].length !== 1){this.error.push('客户')}
+      if([...new Set(distributionPointTest)].length !== 1){this.error.push('成衣')}
     },
 
     
     //父组件列表有值时，进行判断
     fatherDataSet(fathers,sons){
       var father = fathers[0]
-      if(father.distributionPoint !== sons.distributionPoint){this.errorFather.push('分销点')}
-      if(father.customer !== sons.customer){this.errorFather.push('客户')}
+      if(father.garmentFactory !== sons.garmentFactory){this.errorFather.push('成衣工厂')}
     },
 
     close() {