Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/financialManagement/collectionManagementList.vue

@@ -54,7 +54,7 @@
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
+      <el-table-column class="table_td" prop="contractNo" label="合同编号" width="120"></el-table-column>
       <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
       <el-table-column class="table_td" prop="buyer" label="买方"></el-table-column>
       <el-table-column class="table_td" prop="seller" label="卖方"></el-table-column>

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -53,31 +53,32 @@
           style="text-align: right; line-height: 60px; padding-right: 10px"
           :span="8"
         >
-          <ws-select
+          <el-select
             v-model="contractNo"
             placeholder="请选择合同"
             clearable
+            filterable
+            :filter-method="dataFilter"
             @change="contractchange"
             maxlength="500"
             type="input"
             class="findValue"
           >
-            <ws-option key="" label="全部合同" value="" />
-            <ws-option
+            <el-option
               v-if="item.reportStatus"
-              v-for="item in contractNoList"
+              v-for="item in options"
               :key="item.constKey"
               :label="item.contractNo + '(' + item.reportStatus + ')'"
               :value="item.contractNo"
             />
-            <ws-option
+            <el-option
               v-if="!item.reportStatus"
-              v-for="item in contractNoList"
+              v-for="item in options"
               :key="item.constKey"
               :label="item.contractNo"
               :value="item.contractNo"
             />
-          </ws-select>
+          </el-select>
         </el-col>
       </el-row>
       <el-table
@@ -100,11 +101,13 @@
         <el-table-column
           class="table_td"
           prop="contractNo"
+          width="120"
           label="合同编号"
         ></el-table-column>
         <el-table-column
           class="table_td"
           prop="closePositionDate"
+          width="100"
           label="平仓日期"
         ></el-table-column>
         <el-table-column
@@ -409,9 +412,10 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
+      options:[],
       contractNoList: [],
       modification: [],
-      contractNo: '',
+      contractNo: '全部合同',
       compId: sessionStorage.getItem('ws-pf_compId'),
       roleId: sessionStorage.getItem('ws-pf_roleId'),
       deptCircularPage: {},
@@ -700,6 +704,8 @@ export default {
         .toPromise()
         .then((response) => {
           this.contractNoList = response
+          this.contractNoList.unshift({contractNo:'全部合同'})
+          this.options=this.contractNoList
         })
     },
     handleRemove(file) {
@@ -788,6 +794,24 @@ export default {
       }
       return fmt
     },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.contractNo = val 
+      if (val) {
+        //val存在
+        this.options = this.contractNoList.filter(item => {
+          if (
+            !!~item.contractNo.indexOf(val) ||
+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options = this.contractNoList
+      }
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -65,31 +65,32 @@
           style="text-align: right; line-height: 60px; padding-right: 10px"
           :span="8"
         >
-          <ws-select
+           <el-select
             v-model="contractNo"
             placeholder="请选择合同"
             clearable
+            filterable
+            :filter-method="dataFilter"
             @change="contractchange"
             maxlength="500"
             type="input"
             class="findValue"
           >
-            <ws-option key="" label="全部合同" value="" />
-            <ws-option
+            <el-option
               v-if="item.reportStatus"
-              v-for="item in contractNoList"
+              v-for="item in options"
               :key="item.constKey"
               :label="item.contractNo + '(' + item.reportStatus + ')'"
               :value="item.contractNo"
             />
-            <ws-option
+            <el-option
               v-if="!item.reportStatus"
-              v-for="item in contractNoList"
+              v-for="item in options"
               :key="item.constKey"
               :label="item.contractNo"
               :value="item.contractNo"
             />
-          </ws-select>
+          </el-select>
         </el-col>
       </el-row>
       <div v-if="contractNo != ''">
@@ -131,6 +132,7 @@
         <el-table-column
           class="table_td"
           prop="contractNo"
+          width="120"
           label="合同编号"
         ></el-table-column>
         <el-table-column
@@ -143,7 +145,7 @@
           prop="positionNumber"
           label="仓位号"
         ></el-table-column>
-        <el-table-column class="table_td" prop="carNo" label="车牌号"
+        <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"
           ><template slot-scope="scope">
             {{ scope.row.carNo }}({{ scope.row.tranCarNo }})
           </template></el-table-column
@@ -151,6 +153,7 @@
         <el-table-column
           class="table_td"
           prop="warehousingDate"
+          width="100"
           label="入库日期"
         ></el-table-column>
         <el-table-column
@@ -584,6 +587,7 @@ export default {
       showType: true,
       // 年
       year: '',
+      options:[],
       pickerOptions: {},
       invoiceTypeList: [
         { value: '自开发票', type: 1 },
@@ -606,7 +610,7 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
-      contractNo: '',
+      contractNo: '全部合同',
       inOutTaskNo: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
       roleId: sessionStorage.getItem('ws-pf_roleId'),
@@ -1002,6 +1006,24 @@ export default {
         })
       }
     },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.contractNo = val
+      if (val) {
+        //val存在
+        this.options = this.contractNoList.filter(item => {
+          if (
+            !!~item.contractNo.indexOf(val) ||
+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options =this.contractNoList
+      }
+    },
     handlepass() {
       var that = this
       if (this.modification.length == 0) {
@@ -1238,6 +1260,8 @@ export default {
         .toPromise()
         .then((response) => {
           this.contractNoList = response
+          this.contractNoList.unshift({contractNo:'全部合同'})
+          this.options=this.contractNoList
         })
     },
     handleRemove(file) {

src/views/statisticalReport/salesClosingCashierList.vue

@@ -52,31 +52,32 @@
         style="text-align: right; line-height: 60px; padding-right: 10px"
         :span="8"
       >
-        <ws-select
-          v-model="contractNo"
-          placeholder="请选择合同"
-          clearable
-          @change="contractchange"
-          maxlength="500"
-          type="input"
-          class="findValue"
-        >
-          <ws-option key="" label="全部合同" value="" />
-          <ws-option
-            v-if="item.reportStatus"
-            v-for="item in contractNoList"
-            :key="item.constKey"
-            :label="item.contractNo + '(' + item.reportStatus + ')'"
-            :value="item.contractNo"
-          />
-          <ws-option
-            v-if="!item.reportStatus"
-            v-for="item in contractNoList"
-            :key="item.constKey"
-            :label="item.contractNo"
-            :value="item.contractNo"
-          />
-        </ws-select>
+        <el-select
+            v-model="contractNo"
+            placeholder="请选择合同"
+            clearable
+            filterable
+            :filter-method="dataFilter"
+            @change="contractchange"
+            maxlength="500"
+            type="input"
+            class="findValue"
+          >
+            <el-option
+              v-if="item.reportStatus"
+              v-for="item in options"
+              :key="item.constKey"
+              :label="item.contractNo + '(' + item.reportStatus + ')'"
+              :value="item.contractNo"
+            />
+            <el-option
+              v-if="!item.reportStatus"
+              v-for="item in options"
+              :key="item.constKey"
+              :label="item.contractNo"
+              :value="item.contractNo"
+            />
+          </el-select>
       </el-col>
     </el-row>
 
@@ -100,6 +101,7 @@
       <el-table-column
         class="table_td"
         prop="contractNo"
+        width="120"
         label="合同编号"
       ></el-table-column>
       <el-table-column
@@ -421,9 +423,10 @@ export default {
       multipleSelection: [],
       size: 10,
       spanArr: [],
-      contractNo: '',
+      contractNo: '全部合同',
       roleFlag: '1',
       inOutTaskNo: '',
+      options:[],
       compId: sessionStorage.getItem('ws-pf_compId'),
       roleId: sessionStorage.getItem('ws-pf_roleId'),
       saleList: [],
@@ -503,6 +506,24 @@ export default {
         }
       }
     },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.contractNo = val 
+      if (val) {
+        //val存在
+        this.options = this.contractNoList.filter(item => {
+          if (
+            !!~item.contractNo.indexOf(val) ||
+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options = this.contractNoList
+      }
+    },
     contractchange(e) {
       this.contractNo = e
       this.getList()
@@ -785,6 +806,8 @@ export default {
         .toPromise()
         .then((response) => {
           this.contractNoList = response
+          this.contractNoList.unshift({contractNo:'全部合同'})
+          this.options=this.contractNoList
         })
     },
     // loaddata(){

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -59,31 +59,32 @@
           style="text-align: right; line-height: 60px; padding-right: 10px"
           :span="8"
         >
-          <ws-select
+          <el-select
             v-model="contractNo"
             placeholder="请选择合同"
             clearable
+            filterable
+            :filter-method="dataFilter"
             @change="contractchange"
             maxlength="500"
             type="input"
             class="findValue"
           >
-            <ws-option key="" label="全部合同" value="" />
-            <ws-option
+            <el-option
               v-if="item.reportStatus"
-              v-for="item in contractNoList"
+              v-for="item in options"
               :key="item.constKey"
               :label="item.contractNo + '(' + item.reportStatus + ')'"
               :value="item.contractNo"
             />
-            <ws-option
+            <el-option
               v-if="!item.reportStatus"
-              v-for="item in contractNoList"
+              v-for="item in options"
               :key="item.constKey"
               :label="item.contractNo"
               :value="item.contractNo"
             />
-          </ws-select>
+          </el-select>
         </el-col>
       </el-row>
       <div v-if="contractNo != ''">
@@ -125,6 +126,7 @@
         <el-table-column
           class="table_td"
           prop="contractNo"
+          width="120"
           label="合同编号"
         ></el-table-column>
         <el-table-column
@@ -137,7 +139,7 @@
           prop="positionNumber"
           label="仓位号"
         ></el-table-column>
-        <el-table-column class="table_td" prop="carNo" label="车牌号">
+        <el-table-column class="table_td" prop="carNo" label="车牌号" width="140">
           <template slot-scope="scope">
             {{ scope.row.carNo }}({{ scope.row.tranCarNo }})
           </template>
@@ -145,6 +147,7 @@
         <el-table-column
           class="table_td"
           prop="retrievalDate"
+          width="100"
           label="出库日期"
         ></el-table-column>
         <el-table-column
@@ -500,8 +503,9 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
-      contractNo: '',
+      contractNo: '全部合同',
       inOutTaskNo: '',
+      options:[],
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       warehouseList: [],
@@ -555,6 +559,24 @@ export default {
   //    }
   // },
   methods: {
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.contractNo = val 
+      if (val) {
+        //val存在
+        this.options = this.contractNoList.filter(item => {
+          if (
+            !!~item.contractNo.indexOf(val) ||
+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options = this.contractNoList
+      }
+    },
     handleRowClick(row) {
       if (row.approveStatus == null) {
         this.$refs.warehouseList.toggleRowSelection(row)
@@ -967,6 +989,8 @@ export default {
         .toPromise()
         .then((response) => {
           this.contractNoList = response
+          this.contractNoList.unshift({contractNo:'全部合同'})
+          this.options=this.contractNoList
         })
     },
     //最终结算价