gjy 3 år sedan
förälder
incheckning
26e3b6e2ff

+ 4 - 0
src/App.vue

@@ -72,4 +72,8 @@ export default {
 {
 overflow: scroll!important;
 }
+.el-table .el-scrollbar .el-scrollbar__wrap
+{
+overflow: scroll!important;
+}
 </style>

+ 3 - 2
src/views/customer/customerList.vue

@@ -155,7 +155,7 @@
         </el-table-column>
         <el-table-column prop="compAddress" label="地址"></el-table-column>
         <el-table-column prop="customerPhone" label="电话"> </el-table-column>
-        <el-table-column prop="payTaxesCard" label="纳税人识别号">
+        <el-table-column width='170' prop="payTaxesCard" label="纳税人识别号">
           <template scope="scope">
             <span
               v-if="
@@ -175,9 +175,10 @@
         <el-table-column prop="bankCard" label="银行卡号"> </el-table-column>
         <el-table-column prop="totalDeposit" label="总定金(元)">
         </el-table-column>
-        <el-table-column prop="freezingDeposit" label="冻结定金(元)">
+        <el-table-column width='150' prop="freezingDeposit" label="冻结定金(元)">
         </el-table-column>
         <el-table-column
+         width='150'
           class="table_td"
           prop="depositRatio"
           label="定金比例(元/吨)"

+ 1 - 1
src/views/platformaudit/driverreview.vue

@@ -51,7 +51,7 @@
         ref="expandstable"
         :expand-row-keys="expands"
         :row-key="getRowKeys"
-        height="780"
+        height="680"
       >
         <el-table-column type="expand">
           <template slot-scope="props">

+ 28 - 6
src/views/purchasingManagement/purchaseOrderList.vue

@@ -730,18 +730,20 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="合同编号" :label-width="formLabelWidth">
-          <ws-select
+          <el-select
             v-model="aduitlist.contractNo"
             placeholder="请选择合同编号"
             class="deal"
+            filterable
+            :filter-method="dataFilter"
           >
-            <ws-option
-              v-for="item in contractNolist"
+            <el-option
+              v-for="item in options"
               :key="item.constKey"
               :label="item.contractNo"
               :value="item.contractNo"
             />
-          </ws-select>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -959,6 +961,7 @@ export default {
       year: '',
       pickerOptions: {},
       value2: '',
+      options:[],
       deptBudgetTotal: 0,
       currentPage: 1,
       tranTypeKey: 1,
@@ -992,7 +995,7 @@ export default {
       deptBudgetList: {},
       pcFlag: 1,
       invoiceList: [],
-      contractNolist: [],
+      contractNoList: [],
       pricechange: [],
       aduitlist: {
         unloadingCharge: 0,
@@ -1062,6 +1065,24 @@ export default {
       this.customerlist.compName = ''
       this.customerlist.payTaxesCard = ''
     },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.aduitlist.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
+      }
+    },
     //修改基差
     varietyClick(row) {
       if (row.basis) {
@@ -1730,7 +1751,8 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          this.contractNolist = response
+          this.contractNoList = response
+          this.options=response
         })
     },
     handleRemove(file) {

+ 27 - 5
src/views/salesManagement/salesPlanOrderList.vue

@@ -751,18 +751,20 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="合同编号" :label-width="formLabelWidth">
-          <ws-select
+          <el-select
             v-model="aduitlist.contractNo"
             placeholder="请选择合同编号"
             class="deal"
+            filterable
+            :filter-method="dataFilter"
           >
-            <ws-option
-              v-for="item in contractNolist"
+            <el-option
+              v-for="item in options"
               :key="item.constKey"
               :label="item.contractNo"
               :value="item.contractNo"
             />
-          </ws-select>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -1036,7 +1038,8 @@ export default {
       transactionRecordList: {},
       pcFlag: 1,
       invoiceList: [],
-      contractNolist: [],
+      contractNoList: [],
+      options:[],
       pricechange: [],
       searchTypeList: [
         { value: '待审核', type: 1 },
@@ -1124,6 +1127,24 @@ export default {
       })
       }
     },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.aduitlist.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
+      }
+    },
     //完成
     handle(item) {
       this.$confirm(`状态修改为已完成后不可再进行交易操作,是否确定修改?`, {
@@ -1689,6 +1710,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.contractNolist = response
+          this.options=response
         })
     },
     Changepricerecord(item) {