前端

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -7,11 +7,11 @@
         <el-button @click='warehousetypechange(3)' :type="serviceManagementType == 3 ? 'primary' : ''">收购入库</el-button>
       </template>
       <template slot="right">
-        <ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType"
+        <el-select v-model="warehouseName"  filterable placeholder="" @change="warehouseNameChange" :value="searchType"
           style="margin: 0 10px">
-          <ws-option v-for="item in warehouseList" :key="'cangku' + item.value" :label="item.value" :value="item.value"
+          <el-option v-for="item in warehouseList" :key="'cangku' + item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
-        </ws-select>
+        </el-select>
         <!-- <el-checkbox @change='checkchange' v-model="checked">默认</el-checkbox> -->
       </template>
     </BaseHeaderLayout>
@@ -268,7 +268,9 @@
                 <ws-form-item
                   v-if='serviceManagementType == 1 || serviceManagementType == 3 && deptBudgetList.outType == "自运"'
                   label="车队" span="1" prop="fleetName">
-                  <el-select :disabled='recheck' v-model="deptBudgetList.fleet" placeholder="非车队车辆">
+                  <el-select @change="fleetNameChange" :disabled='recheck' v-model="deptBudgetList.fleet" placeholder="非车队车辆">
+                    <el-option  key="0" label="非车队"
+                      value="非车队" />
                     <el-option v-for="item in fleetNameList" :key="item.value" :label="item.fleetName"
                       :value="item.fleetName" />
                   </el-select>
@@ -745,6 +747,19 @@ export default {
     }
   },
   methods: {
+    fleetNameChange(e){
+        console.log(e,this.fleetNameList)
+        if(e=='非车队'){
+          this.weighingList.freight=''
+        }else{
+          for (let i = 0; i < this.fleetNameList.length; i++) {
+            if (this.fleetNameList[i].carNo == this.weighingList.fleetName) {
+              this.weighingList.freight = this.fleetNameList[i].tranPrice
+            }
+          }
+        }
+        
+      },
     getNowTime() {
       var now = new Date();
       var year = now.getFullYear(); //得到年份
@@ -2739,6 +2754,7 @@ export default {
                   .then((response) => {
                     this.deptBudgetList.warehouseInOutId = response
                     if(!this.deptBudgetList.id){
+                      this.$delete(this.deptBudgetList,'statusFlag')
                       inspectAdd(this.deptBudgetList)
                       .toPromise()
                       .then((response1) => {
@@ -2844,9 +2860,10 @@ export default {
                       })
                     }else{
                       this.deptBudgetList.id=zjid
-                      if (this.serviceManagementType==3) {
-                        this.deptBudgetList.statusFlag = this.qyJurisdiction&&!this.zjJurisdiction ? 7 : 1
-                      }
+                      // if (this.serviceManagementType==3) {
+                      //   this.deptBudgetList.statusFlag = this.qyJurisdiction&&!this.zjJurisdiction ? 7 : 1
+                      // }
+                      this.$delete(this.deptBudgetList,'statusFlag')
                       getinspectEdit(this.deptBudgetList)
                       .toPromise()
                       .then((response) => {
@@ -2981,9 +2998,7 @@ export default {
                       .catch((response) => { })
                   })
               } else if (this.statusTypetext == '确认') {
-                if (this.serviceManagementType==3) {
-                  this.deptBudgetList.statusFlag = 2
-                }
+                this.$delete(this.deptBudgetList,'statusFlag')
                 this.deptBudgetList.flag = 2
                 getinspectEdit(this.deptBudgetList)
                   .toPromise()

src/views/profitable/cashout.vue

@@ -30,12 +30,12 @@
                 <ws-option label="保证金" value="保证金" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
-          <!-- <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
+          <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
             <ws-select v-model="deptBudgetList.flag" placeholder="" class="typeselect" >
                 <ws-option label="否" value="否" style="color: #8890b1" />
                 <ws-option label="是" value="是" style="color: #8890b1" />
             </ws-select>
-          </el-form-item> -->
+          </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="合同费用"' label="合同编号" span="1" prop="contractNo" class="readonly">
             <el-select v-model="deptBudgetList.contractNo" filterable clearable placeholder="选择合同" class="typeselect" @change="selectcontract">
               <el-option v-for="item in contractList" :key="item.id" :label="item.contractNo" :value="item.contractNo"
@@ -43,7 +43,7 @@
             </el-select>
           </el-form-item>
            <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓库名称" span="1" prop="contractNo" class="readonly">
-            <el-select v-model="deptBudgetList.warehouseName" placeholder="选择仓库" class="typeselect" @change="selectwarehouse">
+            <el-select v-model="deptBudgetList.warehouseName" filterable placeholder="选择仓库" class="typeselect" @change="selectwarehouse">
               <el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
                 style="color: #8890b1" />
             </el-select>
@@ -102,7 +102,7 @@
         <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"&&deptBudgetList.flag!="是"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.warehouseName" placeholder="选择仓库" @change="((value)=>{selectware(value, scope.$index)})">
+              <el-select v-model="scope.row.warehouseName" filterable placeholder="选择仓库" @change="((value)=>{selectware(value, scope.$index)})">
                 <el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
                   style="color: #8890b1" />
               </el-select>
@@ -110,10 +110,10 @@
           </el-table-column>
           <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="日期">
             <template slot-scope="scope">
-               <ws-select v-model="scope.row.receiptDocDate" placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row,scope.$index)})">
-                <ws-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time" :value="item.time"
+               <el-select v-model="scope.row.receiptDocDate" filterable placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row,scope.$index)})">
+                <el-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time" :value="item.time"
                   style="color: #8890b1" />
-              </ws-select>
+              </el-select>
             </template>
           </el-table-column>
           <el-table-column v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="日期">

src/views/statisticalReport/autoSettlementList.vue

@@ -881,7 +881,7 @@ export default {
         return
       }
       editauto({
-        deductionAmount: Math.abs(this.deductionAmount),
+        deductionAmount: this.deductionAmount,
         id: item.id,
         flag: 1,
       })