Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/paymentManagement.vue

@@ -24,15 +24,12 @@
         <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button>-->
-        <ws-button :type="searchType == 1 ? 'primary' : ''" @click="screen(1)" >待审核
-        </ws-button>
+        <ws-button :type="searchType == ''? 'primary' : ''" @click="screen(-1)">全部</ws-button>
+        <ws-button :type="searchType == 1 ? 'primary' : ''" @click="screen(1)">待审核</ws-button>
         <div v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">
-          <ws-button :type="searchType == 7 ? 'primary' : ''" @click="screen(7)"
-          >待付款</ws-button>
-          </div>
-        <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)"
-          v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
-        <ws-button :type="searchType == -1 ? 'primary' : ''" @click="screen(-1)">全部</ws-button>
+          <ws-button :type="searchType == 7 ? 'primary' : ''" @click="screen(7)">待付款</ws-button>
+        </div>
+        <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)" v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
       </template>
       <template slot="right">
         <el-select class='warehouse_select' v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange" style="margin: 0 10px">
@@ -329,7 +326,7 @@ import download from '../../components/WsDownload/download'
         deptCircularPage: {},
         deptBudgetTotal: 0,
         paymentForm: false,
-        searchType: 1,
+        searchType: "",
         searchTypeText: '',
         searchKeyWord: '',
         warehouseList: [],
@@ -1047,20 +1044,20 @@ import download from '../../components/WsDownload/download'
       },
       selectInit(row) {
         //在这里一定要记得类型匹配的上。
-        if (row.status != '已驳回') {
-          if (
-            row.taskId == null &&
-            row.status != '已通过' &&
-            row.status != '部分付款'
-          ) {
-            return false
-          } else {
-            return true
-          }
-        } else {
-          return true
-        }
-        // return true
+        // if (row.status != '已驳回') {
+        //   if (
+        //     row.taskId == null &&
+        //     row.status != '已通过' &&
+        //     row.status != '部分付款'
+        //   ) {
+        //     return false
+        //   } else {
+        //     return true
+        //   }
+        // } else {
+        //   return true
+        // }
+        return true
       },
       handleSelectionChange(val) {
         this.modification = val
@@ -1293,4 +1290,7 @@ import download from '../../components/WsDownload/download'
   .warehouse_select{
     width:100%;
   }
+  .el-button{
+    margin: 5px;
+  }
 </style>

src/views/houseSelfCollect/weightCheck.vue

@@ -694,7 +694,6 @@
                 .toPromise()
                 .then((response) => {
                   for (let i = 0; i < this.purchasePriceList.length; i++) {
-                    console.log(this.purchasePriceList, 'shangxiang')
                     if (
                       this.weighingList.goodsName == this.purchasePriceList[i].goodsName
                     ) {

src/views/tradeServicesManagement/inOutRecord.vue

@@ -101,7 +101,7 @@
       <div>
         <el-input
           v-model="adjustment"
-          placeholder="输入申请金额"
+          placeholder=""
           size="small"
         ></el-input>
       </div>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -111,7 +111,7 @@
               <el-col :span="8">
 
                 <el-form-item label="姓名：" span="1" prop="driverName" label-width="125px">
-                  <el-select v-show="!item.temporaryDriverFlag" v-model="item.driver" placeholder="请选择司机"
+                  <el-select v-show="!item.temporaryDriverFlag" v-model="item.driver" filterable clearable placeholder="请选择司机"
                     class="row-item" @change="
                              (val) => {
                                carchange(val, index)