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

src/api/V2/statisticalReport/index.js

@@ -102,4 +102,6 @@ export const API_GET_YUNSHUXIALA = '/tranTaskInfo/selectTranTask'
 // 火运，船运运输编号下拉
 export const API_GET_YUNSHUNUMBER = '/tranTaskInfo/selectTask'
 // 火运，船运实际价格
-export const API_POST_YUNSHUSETPRICE = '/tranProcessInfo/api/setUpTranPrice'
+export const API_POST_YUNSHUSETPRICE = '/tranProcessInfo/api/setUpTranPrice'
+//汽运请款
+export const API_POST_SUBMITLOGISTICS = '/tranSettlementReport/api/submitLogistics'

src/api/V2/transport/index.js

@@ -60,4 +60,8 @@ export const API_POST_AUTOMOBILE_TRANPRICE_CAR  = '/tranProcessInfo/api/setUpTra
 // 删除运输车辆
 export const API_POST_DEL_HAULAGE_STAGE= '/tranCarInfo/api/deleteTranCar'
 // 导入
-export const API_GET_IMPORT= '/importController/readDocument'
+export const API_GET_IMPORT= '/importController/readDocument'
+// 车牌号列表
+export const API_GET_CARNUMBER= '/driverCarInfo/selectAllCarNumber'
+// 通过车牌号查找司机
+export const API_GET_DRIVERINFO='/driverViewInfo/selectDriverViewList'

src/model/statisticalReport/index.js

@@ -48,7 +48,8 @@ import {
     API_GET_YUNSHUNUMBER,
     API_POST_YUNSHUSETPRICE,
     API_POST_EDIT_SETTLEMENTWEIGHT,
-    API_POST_INVOICELIST
+    API_POST_INVOICELIST,
+    API_POST_SUBMITLOGISTICS
 } from '@/api/V2/statisticalReport'
 //期货采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
@@ -156,4 +157,6 @@ export const getYunShuXiaLa = appRx.get(API_GET_YUNSHUXIALA, errorCatcher, error
 // 火运，船运运输编号下拉
 export const getYunShuNumber= appRx.get(API_GET_YUNSHUNUMBER, errorCatcher, errorHandle, filter)
 // 火运，船运实际价格
-export const SetYunShuPrice = appRx.post(API_POST_YUNSHUSETPRICE, errorCatcher, errorHandle, filter)
+export const SetYunShuPrice = appRx.post(API_POST_YUNSHUSETPRICE, errorCatcher, errorHandle, filter)
+// 汽运请款
+export const submitlogistics = appRx.post(API_POST_SUBMITLOGISTICS, errorCatcher, errorHandle, filter)

src/model/transport/index.js

@@ -33,7 +33,9 @@ import {
     API_GET_IMPORT,
     API_GET_TRANPROCESSINFO,
     API_POST_TRANPROCESSINFO,
-    API_POST_AUTOMOBILE_TRANPRICE_CAR
+    API_POST_AUTOMOBILE_TRANPRICE_CAR,
+    API_GET_CARNUMBER,
+    API_GET_DRIVERINFO
 } from '@/api/V2/transport'
 // 司机列表
 export const selectDriver = appRx.get(API_GET_TRAN_DRIVERINFO, errorCatcher, errorHandle, filter)
@@ -96,4 +98,8 @@ export const setUpTranPriceCar = appRx.post(API_POST_AUTOMOBILE_TRANPRICE_CAR, e
 //删除车辆
 export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)
 // 导入
-export const importApplFileUrl = appRx.get(API_GET_IMPORT, errorCatcher, errorHandle, filter)
+export const importApplFileUrl = appRx.get(API_GET_IMPORT, errorCatcher, errorHandle, filter)
+// 车牌号
+export const getcarNumber = appRx.get(API_GET_CARNUMBER, errorCatcher, errorHandle, filter)
+// 根据车牌号查找司机
+export const getdriverinfo = appRx.get(API_GET_DRIVERINFO, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -196,7 +196,6 @@
       },
       printBig() {
         
-          localStorage.setItem('print_pay_data',JSON.stringify(this.printData))
          window.open('../../../../../static/payprint.html?type=2&dataList=' +JSON.stringify(this.printData))
       },
     },

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -236,8 +236,7 @@
                   <ws-input v-model="deptBudgetList.agent" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
                 </ws-form-item>
-
-                <ws-form-item v-if='statusTypetext == "初检" && serviceManagementType == 1' label="运费(元/吨)" span="1"
+                <!-- <ws-form-item v-if='statusTypetext == "初检" && serviceManagementType == 1' label="运费(元/吨)" span="1"
                   prop="freight">
                   <ws-input v-model="deptBudgetList.freight" placeholder="请输入运费" size="small" type="number"
                     @mousewheel.native.prevent />
@@ -246,7 +245,7 @@
                       position: relative;
                       top: -1px;
                     " src="../../../public/img/edit.png" @click="editClick(2)" alt="" />
-                </ws-form-item>
+                </ws-form-item> -->
                 <ws-form-item v-if='serviceManagementType == 1' label="入库类型" span="1">
                   <ws-select v-model="deptBudgetList.inOutType" placeholder class="typeselect"
                     @change="selectstorageType" :disabled="isSelectType">
@@ -279,7 +278,7 @@
                     v-if="options2.length == 0 && serviceManagementType == 1 || serviceManagementType == 3 && carNumberList.length == 0"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
                   <el-select :disabled="disabled2" v-if="carstatus && options2.length > 0 && serviceManagementType != 3"
-                    filterable clearable v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect"
+                    filterable clearable v-model="deptBudgetList.carNo1" placeholder="请选择车牌号" class="typeselect"
                     @change="carChange($event, 0)">
                     <el-option v-for="(item, index) in options2" :key="index"
                       :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index" />
@@ -939,28 +938,31 @@ export default {
         }
         // debugger
         //客户
-        getcustomer({
-          warehouseId: this.cangid,
-          goodsName: this.deptBudgetList.goodsName
-        })
-          .toPromise()
-          .then((response) => {
-            this.customerList1 = response
-            this.customerList = []
-            let customer = response
-            for (let i = 0; i < response.length; i++) {
-              if (response[i].supplier) {
-                customer = response[i].customerName + '(' + response[i].customerPhone + ')' + '-' + response[i]
-                  .supplier
-              } else {
-                customer = response[i].customerName + '(' + response[i].customerPhone + ')'
-              }
-              this.customerList.push({
-                valueKey: i,
-                value: customer,
-              })
-            }
+        if(this.serviceManagementType==3){
+          getcustomer({
+            warehouseId: this.cangid,
+            goodsName: this.deptBudgetList.goodsName
           })
+            .toPromise()
+            .then((response) => {
+              this.customerList1 = response
+              this.customerList = []
+              let customer = response
+              for (let i = 0; i < response.length; i++) {
+                if (response[i].supplier) {
+                  customer = response[i].customerName + '(' + response[i].customerPhone + ')' + '-' + response[i]
+                    .supplier
+                } else {
+                  customer = response[i].customerName + '(' + response[i].customerPhone + ')'
+                }
+                this.customerList.push({
+                  valueKey: i,
+                  value: customer,
+                })
+              }
+            })
+        }
+        
         for (var i = 0; i < this.purchasePriceList.length; i++) {
           if (this.purchasePriceList[i].goodsName == this.deptBudgetList.goodsName) {
             this.$set(this.deptBudgetList, 'buckleWeightRatio', this.purchasePriceList[i].deductWeight)
@@ -1514,27 +1516,27 @@ export default {
           })
           return
         }
-        if (!String(this.deptBudgetList.freight)) {
-          this.$message({
-            message: '运费不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          this.deptBudgetList.freight < 0 ||
-          this.deptBudgetList.freight > 100000 ||
-          (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
-            String(this.deptBudgetList.freight).length -
-            (String(this.deptBudgetList.freight).indexOf('.') + 1) >
-            2)
-        ) {
-          this.$message({
-            message: '运费输入错误',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!String(this.deptBudgetList.freight)) {
+        //   this.$message({
+        //     message: '运费不能为空',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   this.deptBudgetList.freight < 0 ||
+        //   this.deptBudgetList.freight > 100000 ||
+        //   (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
+        //     String(this.deptBudgetList.freight).length -
+        //     (String(this.deptBudgetList.freight).indexOf('.') + 1) >
+        //     2)
+        // ) {
+        //   this.$message({
+        //     message: '运费输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.inOutDate) {
           this.$message({
             message: '入库日期不能为空！',
@@ -1992,7 +1994,7 @@ export default {
       if (this.reader) {
         this.reader.cancel()
       }
-      if(this.qyJurisdiction&&this.serviceManagementType==1&&this.statusTypetext=='初检'){
+      if(this.qyJurisdiction&&this.serviceManagementType==1&&this.statusTypetext=='初检'&&!this.zjJurisdiction&&!this.fjJurisdiction&&!this.qrJurisdiction){
         this.$message({
             message: '钎样员只能进行收购入库添加',
             type: 'warning',
@@ -2054,27 +2056,27 @@ export default {
             })
             return
           }
-          if (!String(this.deptBudgetList.freight)) {
-            this.$message({
-              message: '运费不能为空',
-              type: 'warning',
-            })
-            return
-          }
-          if (
-            this.deptBudgetList.freight < 0 ||
-            this.deptBudgetList.freight > 100000 ||
-            (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
-              String(this.deptBudgetList.freight).length -
-              (String(this.deptBudgetList.freight).indexOf('.') + 1) >
-              2)
-          ) {
-            this.$message({
-              message: '运费输入错误',
-              type: 'warning',
-            })
-            return
-          }
+          // if (!String(this.deptBudgetList.freight)) {
+          //   this.$message({
+          //     message: '运费不能为空',
+          //     type: 'warning',
+          //   })
+          //   return
+          // }
+          // if (
+          //   this.deptBudgetList.freight < 0 ||
+          //   this.deptBudgetList.freight > 100000 ||
+          //   (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
+          //     String(this.deptBudgetList.freight).length -
+          //     (String(this.deptBudgetList.freight).indexOf('.') + 1) >
+          //     2)
+          // ) {
+          //   this.$message({
+          //     message: '运费输入错误',
+          //     type: 'warning',
+          //   })
+          //   return
+          // }
           if (!this.deptBudgetList.inOutDate) {
             this.$message({
               message: '入库日期不能为空！',
@@ -2724,7 +2726,7 @@ export default {
                 }
                 // console.log(delete this.deptBudgetList.status)
               if (this.statusTypetext == '初检') {
-                if(this.zjJurisdiction){
+                if(this.zjJurisdiction&&this.serviceManagementType==3){
                   this.deptBudgetList.outType=this.outType
                 }
                 
@@ -2906,10 +2908,12 @@ export default {
                   })
               } else if (this.statusTypetext == '复检') {
                 this.deptBudgetList.flag = 1
+                this.$delete(this.deptBudgetList,'statusFlag')
                 getinspectEdit(this.deptBudgetList)
                   .toPromise()
                   .then((response) => {
                     this.deptBudgetList.id=kid
+                    this.deptBudgetList.statusFlag = 1
                     addstorageputList(this.deptBudgetList)
                       .toPromise()
                       .then((response) => {

src/views/houseSelfCollect/inspectionManagementrecord.vue

@@ -57,6 +57,9 @@
           <span class="water-line">|</span>
           <span class="water-right">{{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span>
         </template>
+      </el-table-column>
+      <el-table-column prop="reMemo" label="复检备注" width="120">
+       
       </el-table-column>
       <el-table-column prop="type" label="类型"></el-table-column>
       <el-table-column :key='Math.random()' v-if='serviceManagementType==1' prop="cost" label="成本（元/吨）"></el-table-column>

src/views/houseSelfCollect/settlement.vue

@@ -385,6 +385,7 @@
         window.open('../../../../../static/payprint.html?type=1&dataList=' + JSON.stringify(this.printData))
       },
       printBig() {
+        localStorage.setItem('print_pay_data',JSON.stringify(this.printData))
         window.open('../../../../../static/payprint.html?type=2&dataList=' + JSON.stringify(this.printData))
       },
       getList() {

src/views/outboundManagement/weighingManagementNew.vue

@@ -2135,7 +2135,7 @@
             } else if (this.outContractNo[i].inOutType == '移库出库') {
               for (let q = 0; q < this.warehouseList1.length; q++) {
                 if (this.warehouseList1[q].warehouseName == this.warehouseName) {
-                  if(this.warehouseList1[q].warehouseType==2&&this.warehouseList1[q].createType==1&&this.outContractNo[i].priceType=='定价销售'){
+                  if(this.warehouseList1[q].warehouseType==2&&this.warehouseList1[q].createType==1&&this.outContractNo[i].priceType=='定价采购'){
                     // console.log(this.outContractNo[i].contractPrice,11111111111)
                     this.priceedit=true
                     this.weighingList.contractPrice=this.outContractNo[i].contractPrice

src/views/personnelManagement/cardReplacementManagement.vue

@@ -90,7 +90,7 @@
         form:{},
         dialogVisible2:false,
         deptCircularPage: {},
-        searchType:'1',
+        searchType:'2',
         searchKeyWord:'',
         strokeType:'1',
         title:'附件',

src/views/personnelManagement/leaveList.vue

@@ -103,7 +103,7 @@
         outerVisibleAdd: false,
         outerVisibleReturn: false,
         contractType: 2,
-        searchType: '',
+        searchType: '1',
         // 提交类型
         submitType: true,
         size: 10,

src/views/profitable/expenseallot.vue

@@ -78,7 +78,7 @@
           <el-table-column v-if='deptBudgetList.expensesPurpose==1||deptBudgetList.expensesPurpose==2' 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"
+                <ws-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time+item.goodsSource" :value="item.time"
                   style="color: #8890b1" />
               </ws-select>
             </template>
@@ -89,6 +89,8 @@
               value-format="yyyy-MM-dd"   ></el-date-picker>
             </template>
           </el-table-column>
+          <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="goodsSource" label="货源">
+            </el-table-column>
           <el-table-column v-if='deptBudgetList.expensesPurpose==3' prop="date" label="货源">
               <template slot-scope="scope">
                 <!-- {{scope.row.goodsourcelist}} -->
@@ -211,7 +213,7 @@
           .then(response => {
             for (let i = 0; i < response.length; i++) {
               response[i].issuingDate=response[i].issuingTime.split(' ')[0]
-              arr.push({time:response[i].issuingDate,id:response[i].id,weight:response[i].inWarehouseWeight})
+              arr.push({time:response[i].issuingDate,id:response[i].id,weight:response[i].inWarehouseWeight,goodsSource:response[i].goodsSource})
             }
             this.$set(this.datelist,index,JSON.parse(JSON.stringify(arr)))
           })
@@ -270,6 +272,7 @@
           if(this.datelist[index][i].time==e){
             item.orderId=this.datelist[index][i].id
             item.inWarehouseWeight=this.datelist[index][i].weight
+            item.goodsSource=this.datelist[index][i].goodsSource
           }
         }
         if(this.moneys=='按重量自动分配'){
@@ -327,7 +330,7 @@
             }
           }
         this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
-         if(this.deptBudgetList.expensesPurpose==1){
+         if(this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
         var data=[]
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             if(data.length==0){

src/views/profitable/expenseallotaduit.vue

@@ -15,6 +15,8 @@
           <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
             <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="1"
+                style="color: #8890b1" />
+                <ws-option label="运费" value="2"
                 style="color: #8890b1" />
                 <ws-option label="库点费用" value="3"
                 style="color: #8890b1" />
@@ -57,12 +59,12 @@
           </div>
         </el-form-item>
         </el-form>
-        <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3' style='width:90%;margin:10px auto;'>
+        <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
           <div style='margin-bottom:20px;display:flex;justify-content: space-between;'>
             <div>费用分配</div><span>合计分配：{{amount}}元</span>  </div>
           <!-- <div> -->
           <el-table :data="feeDetailsDistributions">
-            <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
+            <el-table-column v-if='deptBudgetList.purpose=="合同费用"||deptBudgetList.expensesPurpose==2' prop="date" label="仓库名称" min-width="110">
               <template slot-scope="scope">
                 <ws-select disabled v-model="scope.row.warehouseName" placeholder="选择仓库" >
                   <ws-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
@@ -70,7 +72,7 @@
                 </ws-select>
               </template>
             </el-table-column>
-            <el-table-column v-if='deptBudgetList.expensesPurpose==1' prop="date" label="日期">
+            <el-table-column v-if='deptBudgetList.expensesPurpose==1||deptBudgetList.expensesPurpose==2' prop="date" label="日期">
               <template slot-scope="scope">
                 <ws-select disabled v-model="scope.row.receiptDocDate" placeholder="选择日期" >
                   <ws-option v-for="item in datelist" :key="item.time" :label="item.time" :value="item.time"
@@ -84,6 +86,8 @@
                 value-format="yyyy-MM-dd"   ></el-date-picker>
               </template>
             </el-table-column>
+            <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="goodsSource" label="货源">
+            </el-table-column>
             <el-table-column v-if='deptBudgetList.expensesPurpose==3' prop="date" label="货源">
                 <template slot-scope="scope">
                   <ws-select disabled v-model="scope.row.goodsSource" placeholder="选择货源">

src/views/profitable/expensemanagementdetails.vue

@@ -30,6 +30,11 @@
           <el-button style="margin-left:10px" @click="typeChange('')" :type="searchType == ''?'primary':''">全部</el-button>
           <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">收入</el-button>
           <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">支出</el-button>
+          <el-button style="margin-left:30px !important;" @click="costChange('')" :type="expensesPurpose == ''?'primary':''">全部费用</el-button>
+          <el-button @click="costChange(3)" :type="expensesPurpose == 3?'primary':''">库点费用</el-button>
+          <el-button @click="costChange(1)" :type="expensesPurpose == 1?'primary':''">合同费用</el-button>
+          <el-button @click="costChange(5)" :type="expensesPurpose == 5?'primary':''">经营性费用</el-button>
+          <el-button @click="costChange(2)" :type="expensesPurpose == 2?'primary':''">运费</el-button>
         </el-col>
         <el-col style='text-align:right;' :span="6">
           <el-badge v-if="approveStatus" is-dot class="item">
@@ -193,6 +198,7 @@
         currentPage: 1,
         pageSize: 10,
         size:9,
+        expensesPurpose:'',
         recordList:[],
         compId:localStorage.getItem('ws-pf_compId'),
         dialogVisible1:false,
@@ -348,6 +354,10 @@
         this.searchType = num
         this.getList()
       },
+      costChange(num){
+        this.expensesPurpose = num
+        this.getList()
+      },
       edit(row){
         this.$router.push({name:'cashoutedit',query:{id:row.id}})
       },
@@ -471,7 +481,8 @@
             searchKeyWord:this.searchKeyWord,
             currentPage: this.currentPage,
             pageSize:this.pageSize ,
-            searchType:this.searchType
+            searchType:this.searchType,
+            expensesPurpose:this.expensesPurpose
           })
           .toPromise()
           .then(response => {

src/views/profitable/expensemanagentedit.vue

@@ -18,6 +18,8 @@
          <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
             <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="1"
+                style="color: #8890b1" />
+                <ws-option label="运费" value="2"
                 style="color: #8890b1" />
                 <ws-option label="库点费用" value="3"
                 style="color: #8890b1" />
@@ -65,8 +67,8 @@
        />
         </el-form-item>
         </el-form>
-        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"' class='expensetitle'>费用分配</div>
-        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"' style='margin:0  auto 10px;width:90%;'>
+        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"||deptBudgetList.expensesPurpose==2' class='expensetitle'>费用分配</div>
+        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"||deptBudgetList.expensesPurpose==2' style='margin:0  auto 10px;width:90%;'>
             <ws-select v-model="mode" placeholder="费用分配方式" @change="modeselect">
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
@@ -92,8 +94,8 @@
         </ws-select>
         <span v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
         </div>
-        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
-          <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
+        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
+          <el-table-column v-if='deptBudgetList.purpose=="合同费用"||deptBudgetList.expensesPurpose==2' 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-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
@@ -101,10 +103,10 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="日期">
+          <el-table-column v-if='deptBudgetList.purpose=="合同费用"||deptBudgetList.expensesPurpose==2' 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"
+                <ws-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time+'/'+item.goodsSource" :value="item.time"
                   style="color: #8890b1" />
               </ws-select>
             </template>
@@ -115,6 +117,8 @@
               value-format="yyyy-MM-dd"   ></el-date-picker>
             </template>
           </el-table-column>
+          <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="goodsSource" label="货源">
+            </el-table-column>
           <el-table-column v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="货源">
               <template slot-scope="scope">
                 <!-- {{scope.row.goodsourcelist}} -->
@@ -241,7 +245,7 @@ weight: 4000}]],
           .then(response => {
             for (let i = 0; i < response.length; i++) {
               response[i].issuingDate=response[i].issuingTime.split(' ')[0]
-              arr.push({time:response[i].issuingDate,id:response[i].id,weight:response[i].inWarehouseWeight})
+              arr.push({time:response[i].issuingDate,id:response[i].id,weight:response[i].inWarehouseWeight,goodsSource:response[i].goodsSource})
             }
             this.$set(this.datelist,index,JSON.parse(JSON.stringify(arr)))
           })
@@ -391,7 +395,7 @@ weight: 4000}]],
             this.deptBudgetList.expenseAllocationInfoList=[]
           }
         }
-         if(this.deptBudgetList.expensesPurpose==1){
+         if(this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
         var data=[]
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             if(data.length==0){
@@ -521,9 +525,32 @@ weight: 4000}]],
           if(row.id==0){
             this.feeDetailsDistributions.splice(row.index,1)
           }else{
+            this.feeDetailsDistributions.splice(row.index,1)
+            var data=localStorage.getItem('expensebh')
+            var data1=[]
+            for (let i = 0; i < data.length; i++) {
+              if(data[i].id==row.id){
+                var data1=data.splice(row.i,1)
+              }
+            }
+            if(data1.length>0){
+              localStorage.setItem('expensebh',data1)
+            }else{
+              localStorage.removeItem('expensebh')
+            }
+            
             deloneallocationinfo({id:row.id}).toPromise().then((response) => {
             })
+            
+            
+            
           }
+        }else{
+          this.$message({
+                message: '费用分配必须保留一个!',
+                type: 'warning',
+          })
+          return
         }
         var weight=0
         var money=0
@@ -578,7 +605,7 @@ weight: 4000}]],
             this.paymentScreenshot=srcs
           }
           if(localStorage.getItem('expensebh')){
-            if(this.deptBudgetList.expensesPurpose==3||this.deptBudgetList.expensesPurpose==1){
+            if(this.deptBudgetList.expensesPurpose==3||this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
               this.getgoodsourcelist()
             }
           //   console.log(this.feeDetailsDistributions)
@@ -599,12 +626,12 @@ weight: 4000}]],
                     id:data[q].id,weight:data[q].inWarehouseWeight,goodsName:data[q].goodsName,goodsNameKey:data[q].goodsNameKey})
                 }
                 this.$set(this.goodsourcelist,i,JSON.parse(JSON.stringify(arr)))
-              }else if(this.deptBudgetList.expensesPurpose==1){
+              }else if(this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
                 const data  = await getwarehousingorder({contractNo:this.deptBudgetList.contractNo,warehouseName:this.feeDetailsDistributions[i].warehouseName}).toPromise()
                 this.datelist[i]=[]
                 for (let q = 0; q < data.length; q++) {
                   data[i].issuingDate=data[i].issuingTime.split(' ')[0]
-                  arr.push({time:data[i].issuingDate,id:data[i].id,weight:data[i].inWarehouseWeight})
+                  arr.push({time:data[i].issuingDate,id:data[i].id,weight:data[i].inWarehouseWeight,goodsSource:data[i].goodsSource})
                 }
                 this.$set(this.datelist,i,JSON.parse(JSON.stringify(arr)))
               }

src/views/profitable/expensemanagentlook.vue

@@ -18,6 +18,7 @@
             <div style='margin:0 0px 10px;font-weight:bold'>基本信息</div>
           <el-form-item label-width='100px' label="用途" span="1" prop="expensesPurpose">
               <span v-if='deptBudgetList.expensesPurpose==1'>合同费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==2'>运费</span>
               <span v-if='deptBudgetList.expensesPurpose==3'>库点费用</span>
               <span v-if='deptBudgetList.expensesPurpose==5'>经营性费用</span>
           </el-form-item>
@@ -75,7 +76,7 @@
           <div style='margin-bottom:20px;'>费用分配</div>
           <!-- <div> -->
           <el-table :data="deptBudgetList.expenseAllocationInfoList">
-            <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
+            <el-table-column v-if='deptBudgetList.purpose=="合同费用"||deptBudgetList.expensesPurpose==2' prop="date" label="仓库名称" min-width="110">
               <template slot-scope="scope">
                 <ws-select disabled v-model="scope.row.warehouseName" placeholder="选择仓库" @change="((value)=>{selectware(value, scope.row)})">
                   <ws-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
@@ -83,7 +84,7 @@
                 </ws-select>
               </template>
             </el-table-column>
-            <el-table-column v-if='deptBudgetList.expensesPurpose==1' prop="date" label="日期">
+            <el-table-column v-if='deptBudgetList.expensesPurpose==1||deptBudgetList.expensesPurpose==2' prop="date" label="日期">
               <template slot-scope="scope">
                 <ws-select disabled v-model="scope.row.receiptDocDate" placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row)})">
                   <ws-option v-for="item in datelist" :key="item.time" :label="item.time" :value="item.time"
@@ -97,6 +98,8 @@
                 value-format="yyyy-MM-dd"   ></el-date-picker>
               </template>
             </el-table-column>
+            <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="goodsSource" label="货源">
+            </el-table-column>
             <el-table-column v-if='deptBudgetList.expensesPurpose==3' prop="date" label="货源">
                 <template slot-scope="scope">
                   <ws-select disabled v-model="scope.row.orderId" placeholder="选择货源" @change="((value)=>{selectgoodsSource(value, scope.row)})">
@@ -170,13 +173,13 @@
         .toPromise()
         .then((response) => {
           this.deptBudgetList=response
-          // this.srcList=[]
-          // var arr=response.addressUrl.split(',')
-          // for (let i = 0; i < arr.length; i++) {
-          //   if(arr[i]!=''){
-          //     this.srcList.push(arr[i])
-          //   }
-          // }
+          this.srcList=[]
+          var arr=response.addressUrl.split(',')
+          for (let i = 0; i < arr.length; i++) {
+            if(arr[i]!=''){
+              this.srcList.push(arr[i])
+            }
+          }
           if(this.deptBudgetList.expensesPurpose==1){
               getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:response.contractNo}).toPromise()
               .then((response1) => {

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -19,7 +19,7 @@
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <ws-form-item label="标题" span="1" prop="title">
-            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="20" class="typeselect" placeholder="标题须包含企业简称，不超过20个字" />
             <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item label="货名" span="1" prop="goodsName">
@@ -534,7 +534,7 @@
           })
           return
         }
-        if (this.dataList.title.length > 16) {
+        if (this.dataList.title.length > 20) {
           this.$message({
             message: '标题输入错误！',
             type: 'warning'
@@ -1084,7 +1084,7 @@
 
   .container {
     overflow: scroll;
-    height: 93vh;
+    height: 89vh;
   }
 
   /deep/.basicInformation .el-form-item .el-form-item__content {

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -21,7 +21,7 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 标题 -->
           <ws-form-item label="标题" span="1" prop="title">
-            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="20" class="typeselect" placeholder="标题须包含企业简称，不超过20个字" />
           </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName">
@@ -424,16 +424,16 @@
         this.dataList.outputPrivate = CodeToText[value[0]]
         // this.dataList.outputCity = CodeToText[value[1]]
       },
-      submit() {
-        if (this.outputYear) {
-          this.startDate = this.dateFormat('YYYY-mm-dd', this.outputYear[0])
-          this.endDate = this.dateFormat('YYYY-mm-dd', this.outputYear[1])
-        } else {
-          this.startDate = ''
-          this.endDate = ''
-        }
-        // this.getList()
-      },
+      // submit() {
+      //   if (this.outputYear) {
+      //     this.startDate = this.dateFormat('YYYY-mm-dd', this.outputYear[0])
+      //     this.endDate = this.dateFormat('YYYY-mm-dd', this.outputYear[1])
+      //   } else {
+      //     this.startDate = ''
+      //     this.endDate = ''
+      //   }
+      //   // this.getList()
+      // },
       //关闭
       close() {
         this.$router.push({
@@ -517,7 +517,7 @@
           })
           return
         }
-        if (this.dataList.title.length > 16) {
+        if (this.dataList.title.length > 20) {
           this.$message({
             message: '标题输入错误！',
             type: 'warning'
@@ -1070,7 +1070,7 @@
 
   .container {
     overflow: scroll;
-    height: 93vh;
+    height: 89vh;
   }
 
   /deep/.basicInformation .el-form-item .el-form-item__content {

src/views/salesManagement/salesPlanAdd.vue

@@ -21,7 +21,7 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 标题 -->
           <el-form-item label="标题" span="1" prop="title">
-            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="20" class="typeselect" placeholder="标题须包含企业简称，不超过20个字" />
             <span class="unchangeable">*</span>
           </el-form-item>
           <!-- 货名 -->
@@ -536,7 +536,7 @@
           })
           return
         }
-        if (this.dataList.title.length > 16) {
+        if (this.dataList.title.length > 20) {
           this.$message({
             message: '标题输入错误！',
             type: 'warning',
@@ -1123,7 +1123,7 @@
 
   .container {
     overflow: scroll;
-    height: 93vh;
+    height: 89vh;
   }
 
   /deep/.basicInformation .el-form-item .el-form-item__content {

src/views/salesManagement/salesPlanEdit.vue

@@ -21,7 +21,7 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 标题 -->
           <ws-form-item label="标题" span="1" prop="title">
-            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="20" class="typeselect" placeholder="标题须包含企业简称，不超过20个字" />
           </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName">
@@ -32,7 +32,7 @@
           </ws-form-item>
           <!-- 计划销售量（吨） -->
           <ws-form-item label="计划销售量（吨）" span="1" prop="plannedSaleVolume">
-            <el-input v-model="dataList.plannedSaleVolume" class="typeselect" placeholder="请输入计划采购量" />
+            <el-input v-model="dataList.plannedSaleVolume" class="typeselect" placeholder="请输入计划销售量" />
           </ws-form-item>
           <!-- 最小成交量 -->
           <ws-form-item label="最小成交量（吨）" span="1" prop="minimumVolume">
@@ -426,16 +426,16 @@
         this.dataList.outputPrivate = CodeToText[value[0]]
         // this.dataList.outputCity = CodeToText[value[1]]
       },
-      submit() {
-        if (this.outputYear) {
-          this.startDate = this.dateFormat('YYYY-mm-dd', this.outputYear[0])
-          this.endDate = this.dateFormat('YYYY-mm-dd', this.outputYear[1])
-        } else {
-          this.startDate = ''
-          this.endDate = ''
-        }
-        // this.getList()
-      },
+      // submit() {
+      //   if (this.outputYear) {
+      //     this.startDate = this.dateFormat('YYYY-mm-dd', this.outputYear[0])
+      //     this.endDate = this.dateFormat('YYYY-mm-dd', this.outputYear[1])
+      //   } else {
+      //     this.startDate = ''
+      //     this.endDate = ''
+      //   }
+      //   // this.getList()
+      // },
       //关闭
       close() {
         this.$router.push({
@@ -517,7 +517,7 @@
           })
           return
         }
-        if (this.dataList.title.length > 16) {
+        if (this.dataList.title.length > 20) {
           this.$message({
             message: '标题输入错误！',
             type: 'warning',
@@ -1096,7 +1096,7 @@
 
   .container {
     overflow: scroll;
-    height: 93vh;
+    height: 89vh;
   }
 
   /deep/.basicInformation .el-form-item .el-form-item__content {

src/views/statisticalReport/autoSettlementList.vue

@@ -8,10 +8,10 @@
           <ws-button :type="searchType == 2 ? 'primary' : ''" @click="handlestatus(2)">待结算</ws-button>
           <ws-button :type="searchType == 3 ? 'primary' : ''" @click="handlestatus(3)">已结算</ws-button>
           <ws-button :type="searchType == '' ? 'primary' : ''" @click="handlestatus('')">全部</ws-button>
-          <ws-button type="primary" v-hasPermission="`report.transportationReport.view`" @click="handlepass()">通过
-          </ws-button>
-          <ws-button type="primary" v-hasPermission="`report.transportationReport.view`" @click="handlereject()">驳回
+          <ws-button type="primary" v-hasPermission="`report.transportationReport.view`" @click="handlepass()">请款
           </ws-button>
+          <!-- <ws-button type="primary" v-hasPermission="`report.transportationReport.view`" @click="handlereject()">驳回
+          </ws-button> -->
           <ws-button type="primary" v-hasPermission="`report.transportationReport.payment`" @click="handlepayment">付款
           </ws-button>
           <ws-button type="primary" v-hasPermission="`report.transportationReport.draw`" @click="handleninvoice">开发票
@@ -44,8 +44,7 @@
       <el-row>
         <div style="color:red">注：审核时，同一运输阶段勾选任意复选框，当前运输阶段下所有条目都通过审核！</div>
       </el-row>
-      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList"
-        border :summary-method="getSummaries" show-summary @row-click="handleRowClick"
+      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList" :summary-method="getSummaries" show-summary @row-click="handleRowClick"
         @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
@@ -104,14 +103,14 @@
             <!--改结算重量-->
             <i @click="changesettlementWeight(scope.row)" v-if="
               (scope.row.settlementWeightchange &&
-                scope.row.approveStatus == '待物流部审核') ||
+                scope.row.status == '待请款') ||
               (scope.row.settlementWeightchange &&
                 scope.row.status == '已驳回')
             " class="iconfont icon-dui"></i>
             <img v-if="
               (!scope.row.settlementWeightchange &&
                 scope.row.settlementWeight &&
-                scope.row.approveStatus == '待物流部审核') ||
+                scope.row.status == '待请款') ||
               (!scope.row.settlementWeightchange &&
                 scope.row.settlementWeight &&
                 scope.row.status == '已驳回')
@@ -126,16 +125,14 @@
             <!--改扣款-->
             <i @click="changedeductionAmount(scope.row)" v-if="
               (scope.row.deductionAmountchange &&
-                scope.row.approveStatus == '待物流部审核') ||
+                scope.row.status == '待请款') ||
               (scope.row.deductionAmountchange &&
                 scope.row.status == '已驳回')
             " class="iconfont icon-dui"></i>
             <img v-if="
               (!scope.row.deductionAmountchange &&
-                scope.row.deductionAmount &&
-                scope.row.approveStatus == '待物流部审核') ||
+                scope.row.status == '待请款') ||
               (!scope.row.deductionAmountchange &&
-                scope.row.deductionAmount &&
                 scope.row.status == '已驳回')
             " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png" @click="editdeductionAmount(scope.row)" alt="" />
@@ -164,7 +161,14 @@
           </template>
         </el-table-column>
         <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
-        <el-table-column class="table_td" label="账户" prop="">
+        <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+          <template
+            slot-scope="scope">
+            {{ scope.row.name }}
+            <span v-if="scope.row.fleetFlag==1">(队)</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column class="table_td" label="账户" prop="">
           <template slot-scope="scope">
             <div style="
                 display: inline-block;
@@ -176,7 +180,7 @@
               查看
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="状态" prop="status" width="100px">
           <template slot-scope="scope">
             <span v-if="scope.row.approveStatus != null">{{
@@ -310,7 +314,7 @@
     <!--付款截图 -->
     <WinseaContentModal v-model="paymentImg" title="付款截图信息" @on-cancel="handleClose2">
       <p>查看付款截图</p>
-      <ws-upload :editable='false' ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+      <ws-upload :editable='false' ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="paymentScreenshot1" :size-limit="size"
        />
       <!-- <div v-for="item in paymentScreenshot1">
         <img style="width: 100px; height: 100px" :src="item" alt="" />
@@ -326,6 +330,7 @@ import {
   autocontract,
   autopaymoney,
   openinvoicelist,
+  submitlogistics
   // postaudit,
   //   getselectctcontractno,
 } from '@/model/statisticalReport/index'
@@ -404,7 +409,7 @@ export default {
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
-      searchType: '1',
+      searchType: '',
       manualFlag: '',
       searchKeyWord: '',
       startAddress:'',
@@ -482,6 +487,9 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    warehouseNameChange(){
+      this.getList()
+    },
     onChange() {
         this.$refs.upload
           .handleSaveBill()
@@ -864,7 +872,7 @@ export default {
           (String(this.deductionAmount).indexOf('.') + 1) >
           2) ||
         (this.deductionAmount && this.deductionAmount > 100000) ||
-        (this.deductionAmount && this.deductionAmount < 1)
+        (this.deductionAmount && this.deductionAmount < 0)
       ) {
         this.$message({
           message: '扣款金额输入错误',
@@ -921,7 +929,7 @@ export default {
       } else {
         this.paymentImg = true
       }
-      this.paymentScreenshot1 = row.paymentScreenshot.split('$')
+      this.paymentScreenshot1 = row.paymentScreenshot
     },
     //审核
     audit(item, index, status, status2, reason) {
@@ -1002,19 +1010,35 @@ export default {
       if (this.modification.length == 0) {
         this.$message.warning('请选择要通过的条目')
       } else {
-        this.$confirm(`是否确定通过？`, {
+        for (let i = 0; i < this.modification.length; i++) {
+          if(this.modification[i].status=='待请款'&&this.modification[i].approveStatus||this.modification[i].status!='待请款'){
+            this.$message.warning('请选择待请款的条目')
+            return
+          }
+          if(!this.modification[i].unloadingWeight){
+            this.$message.warning('请选择已卸车的车辆')
+            return
+          }
+        }
+        
+        this.$confirm(`是否确定请款？`, {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
           type: 'warning',
         }).then(() => {
+          submitlogistics({tranSettlementReportList:this.modification}).toPromise()
+        .then((response) => {
+          this.$message.success('请款成功')
+          this.getList()
+        })
           //批次通过  选中列表中 数据一个batchId， 选中列表去重
-          var obj = {};
-          that.modification = that.modification.reduce(function (item, next) {
-            obj[next.batchId] ? '' : obj[next.batchId] = true && item.push(next);
-            return item;
-          }, []);
-          console.log('去重后提交数据', that.modification);
-          that.audit(this.modification[0], 0, true, 2)
+          // var obj = {};
+          // that.modification = that.modification.reduce(function (item, next) {
+          //   obj[next.batchId] ? '' : obj[next.batchId] = true && item.push(next);
+          //   return item;
+          // }, []);
+          // console.log('去重后提交数据', that.modification);
+          // that.audit(this.modification[0], 0, true, 2)
         })
       }
     },

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -120,8 +120,8 @@
 					<!-- <el-form-item label="预估运费（元/吨）" span="1">
               {{dataList.estimatedFreight}}
 					</el-form-item> -->
-          <!--发货人-->
-          <el-form-item label="发货人">
+          <!--发货负责人-->
+          <el-form-item label="发货负责人">
             {{dataList.agent}}
             <el-option
               v-for="item in options"
@@ -236,8 +236,8 @@
 					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
               {{dataList1.estimatedFreight}}
           </el-form-item> -->
-          <!--收货人-->
-          <el-form-item label="收货人">
+          <!--收货负责人-->
+          <el-form-item label="收货负责人">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -345,8 +345,8 @@
 					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
           {{dataList.estimatedFreight}}
 					</el-form-item> -->
-          <!--发货人-->
-          <el-form-item label="发货人">
+          <!--发货负责人-->
+          <el-form-item label="发货负责人">
             {{dataList.agent}}
             <el-option
               v-for="item in options"
@@ -689,7 +689,7 @@ export default {
             }
           }
           if(this.dataList.sourceRelationInfoList){
-            if(this.dataList.taskTypeKey==2&&this.dataList.inOutType=="退库"||this.dataList.taskTypeKey==4){
+            if(this.dataList.taskTypeKey==2&&this.dataList.inOutType=='退库'||this.dataList.taskTypeKey==4){
                   this.goods=this.dataList1.sourceId
                 }else 
               for (let i = 0; i < this.dataList.sourceRelationInfoList.length; i++) {
@@ -705,7 +705,7 @@ export default {
 					.then(response1 => {
              for (let i = 0; i < response1.length; i++) {
                 if (response1[i].contractNo == this.dataList.contractNo) {
-                    if(response1[i].priceType == "随行就市"){
+                    if(response1[i].priceType == '随行就市'){
                       this.Pricetype = false
                     }else{
                       this.Pricetype = true

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -567,6 +567,7 @@ export default {
         if (this.contractNoList[i].contractNo == val) {
             this.deptBudgetList.goodsName = this.contractNoList[i].goodsName
             this.deptBudgetList.weight= this.contractNoList[i].weight
+            this.deptBudgetList.tranProcessInfoList[0].weight= this.contractNoList[i].weight
             console.log(this.contractNoList[i])
             if(this.contractNoList[i].inOutType){
               this.deptBudgetList.sendWarehouse = this.contractNoList[i].sendWarehouse
@@ -689,7 +690,7 @@ export default {
     loaddata() {
       this.deptBudgetList.taskNo = 'YS' + this.getdate() + this.MathRand()
       this.deptBudgetList.tranProcessInfoList[0].processNo =
-        this.deptBudgetList.taskNo + '-1'
+        this.deptBudgetList.taskNo 
       // 货名
       packList({ constId: 'CON2' })
         .toPromise()

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -208,7 +208,7 @@
 					</el-form-item>
 					<!--重量（吨）-->
 					<el-form-item label="重量（吨）">
-						<el-input :disabled='dataList1.inOutType=="收购入库"' @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
+						<el-input :disabled='dataList1.inOutType=="收购入库"||dataList1.inOutType=="移库入库"' @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!-- 品级 -->
@@ -248,8 +248,8 @@
 							maxlength="20" size="small" type="number" />
 					</el-form-item> -->
 					<!-- 经办人-->
-					<el-form-item label="收货人">
-            <el-select v-model="dataList1.agent" placeholder="请选择收货人" filterable clearable :filter-method="dataFilter1"
+					<el-form-item label="收货负责人">
+            <el-select v-model="dataList1.agent" placeholder="请选择收货负责人" filterable clearable :filter-method="dataFilter1"
               @change="selectstaff1">
               <el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
@@ -354,8 +354,8 @@
 							maxlength="20" size="small" type="number" />
 					</el-form-item> -->
 					<!--发货人-->
-					<el-form-item label="发货人">
-            <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable clearable
+					<el-form-item label="发货负责人">
+            <el-select v-model="dataList.agent" placeholder="请选择发货负责人" filterable clearable
               @change="selectstaff">
               <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -240,7 +240,7 @@
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）">
-            <el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）" maxlength="120"
+            <el-input :disabled='dataList1.inOutType=="收购入库"||dataList1.inOutType=="移库入库"' @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）" maxlength="120"
               size="small" class="huom" />
           </el-form-item>
           <!-- 品级 -->

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -261,11 +261,11 @@
 						<el-input  v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small"  />
 					</el-form-item> -->
-          <!--发货人-->
-          <el-form-item label="发货人">
+          <!--发货负责人-->
+          <el-form-item label="发货负责人">
             <el-select
               v-model="dataList.agent"
-              placeholder="请选择发货人"
+              placeholder="请选择发货负责人"
               filterable
               disabled
               @change="selectstaff"
@@ -519,10 +519,10 @@
 							maxlength="20" size="small"  />
 					</el-form-item> -->
           <!-- 经办人-->
-          <el-form-item label="收货人">
+          <el-form-item label="收货负责人">
             <el-select
               v-model="dataList1.agent"
-              placeholder="请选择收货人"
+              placeholder="请选择收货负责人"
               filterable
               disabled
               @change="selectstaff1"
@@ -729,11 +729,11 @@
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small"  />
 					</el-form-item> -->
-          <!--发货人-->
-          <el-form-item label="出库发货人">
+          <!--发货负责人-->
+          <el-form-item label="出库发货负责人">
             <el-select
               v-model="dataList.agent"
-              placeholder="请选择发货人"
+              placeholder="请选择发货负责人"
               filterable
               disabled
               @change="selectstaff"
@@ -884,16 +884,16 @@ export default {
     this.dataList.weight = 0
     this.dataList1.weight = 0
     this.getList()
-    if(localStorage.getItem("taskTypeKey")){
-				this.dataList.taskTypeKey=localStorage.getItem("taskTypeKey")
-        this.dataList1.taskTypeKey=localStorage.getItem("taskTypeKey")
+    if(localStorage.getItem('taskTypeKey')){
+				this.dataList.taskTypeKey=localStorage.getItem('taskTypeKey')
+        this.dataList1.taskTypeKey=localStorage.getItem('taskTypeKey')
 				if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
-					this.dataList.warehouseName=localStorage.getItem("warehouse")
-					this.dataList.contractNo=localStorage.getItem("contractNo")
+					this.dataList.warehouseName=localStorage.getItem('warehouse')
+					this.dataList.contractNo=localStorage.getItem('contractNo')
 				}
 				else if(this.dataList.taskTypeKey==2||this.dataList.taskTypeKey==4){
-					this.dataList1.warehouseName=localStorage.getItem("warehouse")
-					this.dataList1.contractNo=localStorage.getItem("contractNo")
+					this.dataList1.warehouseName=localStorage.getItem('warehouse')
+					this.dataList1.contractNo=localStorage.getItem('contractNo')
 				}
 		}
     var num = 0
@@ -912,9 +912,9 @@ export default {
     supplygoods() {
       if (this.dataList.taskTypeKey == 1 || this.dataList.taskTypeKey == 3) {
         if (this.dataList.warehouseName) {
-          localStorage.setItem("warehouse",this.dataList.warehouseName);
-					localStorage.setItem("contractNo",this.dataList.contractNo);
-          localStorage.setItem("taskTypeKey",this.dataList.taskTypeKey);
+          localStorage.setItem('warehouse',this.dataList.warehouseName);
+					localStorage.setItem('contractNo',this.dataList.contractNo);
+          localStorage.setItem('taskTypeKey',this.dataList.taskTypeKey);
           this.$router.push({
             name: 'supplyofgoodsedit',
             query: {
@@ -932,9 +932,9 @@ export default {
         this.dataList1.taskTypeKey == 4
       ) {
         if (this.dataList1.moveTaskNo || this.dataList1.contractNo) {
-          localStorage.setItem("warehouse",this.dataList1.warehouseName);
-					localStorage.setItem("contractNo",this.dataList1.contractNo);
-          localStorage.setItem("taskTypeKey",this.dataList1.taskTypeKey);
+          localStorage.setItem('warehouse',this.dataList1.warehouseName);
+					localStorage.setItem('contractNo',this.dataList1.contractNo);
+          localStorage.setItem('taskTypeKey',this.dataList1.taskTypeKey);
           this.$router.push({
             name: 'outsupplyofgoodsedit',
             query: {
@@ -1123,9 +1123,9 @@ export default {
     },
     //提交按钮
     submit() {
-      localStorage.removeItem("warehouse")
-			localStorage.removeItem("contractNo");
-      localStorage.removeItem("taskTypeKey");
+      localStorage.removeItem('warehouse')
+			localStorage.removeItem('contractNo');
+      localStorage.removeItem('taskTypeKey');
       this.dataList.inOutFlag = 1
       this.dataList1.inOutFlag = 2
       var supplygoods = JSON.parse(localStorage.getItem('supplygoods'))

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -102,7 +102,7 @@
         <template slot-scope="scope">
           <template v-if="scope.row.receivingStatus != '已完货'">
             <div class="record" @click="trainSee(scope.row)">查看</div>
-            <div class="adjustment" @click="feedback(scope.row)">反馈</div>
+            <div v-if="scope.row.tranType!='移库'" class="adjustment" @click="feedback(scope.row)">反馈</div>
           </template>
           <template v-else>
             <div class="record1" @click="trainSee(scope.row)">查看</div>

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -300,13 +300,21 @@
                 </template>
               </ws-form-item>
               <!--箱号-->
-              <ws-form-item label="箱号:" span="1" prop="caseNo">
+              <ws-form-item label="箱号-1:" span="1" prop="caseNo">
                 <span>{{ item.caseNo }}</span>
               </ws-form-item>
               <!--封号-->
-              <ws-form-item label="封号:" span="1" prop="titleNo">
+              <ws-form-item label="封号-1:" span="1" prop="titleNo">
                 <span>{{ item.titleNo }}</span>
               </ws-form-item>
+              <!--箱号-->
+              <ws-form-item label="箱号-2:" span="1" prop="caseNoOther">
+                <span>{{ item.caseNoOther }}</span>
+              </ws-form-item>
+              <!--封号-->
+              <ws-form-item label="封号-2:" span="1" prop="titleNoOther">
+                <span>{{ item.titleNoOther }}</span>
+              </ws-form-item>
               <!--单价 -->
               <ws-form-item label="单价（元/吨）:" span="1" v-if="deptBudgetList.priceType!=null&&deptBudgetList.priceType=='随行就市'" prop="contractPrice">
                 <ws-input

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -158,13 +158,21 @@
               </template>
             </ws-form-item>
             <!--箱号-->
-            <ws-form-item label="箱号:" span="1" prop="caseNo">
+            <ws-form-item label="箱号-1:" span="1" prop="caseNo">
               <span>{{ item.caseNo }}</span>
             </ws-form-item>
             <!--封号-->
-            <ws-form-item label="封号:" span="1" prop="titleNo">
+            <ws-form-item label="封号-1:" span="1" prop="titleNo">
               <span>{{ item.titleNo }}</span>
             </ws-form-item>
+            <!--箱号-->
+            <ws-form-item label="箱号-2:" span="1" prop="caseNoOther">
+                <span>{{ item.caseNoOther }}</span>
+              </ws-form-item>
+              <!--封号-->
+              <ws-form-item label="封号-2:" span="1" prop="titleNoOther">
+                <span>{{ item.titleNoOther }}</span>
+              </ws-form-item>
             <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
               {{ item.signStatus }}</div>
             <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -101,7 +101,7 @@
         <template slot-scope="scope">
           <template v-if="scope.row.feedbackStatus != '已完货'">
             <div class="record" @click="trainSee(scope.row)">查看</div>
-            <div class="adjustment" @click="feedback(scope.row)">反馈</div>
+            <div v-if="scope.row.tranType!='移库'&&scope.row.tranType!='销售出库'" class="adjustment" @click="feedback(scope.row)">反馈</div>
           </template>
           <template v-else>
             <div class="record1" @click="trainSee(scope.row)">查看</div>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -177,8 +177,16 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="车牌号：" span="1" prop="carNo" label-width="125px">
-                  
-                  <el-input :disabled="readonly" v-model="item.carNo" placeholder="" maxlength="120" size="small" />
+                  <el-select :disabled="item.id" v-model="item.carNo" placeholder="请选择车牌号"
+                    filterable clearable @clear="clear" class="row-item" @change="
+                               (val) => {
+                                 carNochange(val, item.tranCarIndex)
+                               }
+                             ">
+                    <el-option v-for="(items, index) in carNoList" :key="index" :label="items.carNumber"
+                      :value="items.carNumber" />
+                  </el-select>
+                  <!-- <el-input :disabled="readonly" v-model="item.carNo" placeholder="" maxlength="120" size="small" /> -->
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -282,7 +290,9 @@
     dispatchCat,
     delhaulagestage,
     setUpTranPrice,
-    setUpTranPriceCar
+    setUpTranPriceCar,
+    getcarNumber,
+    getdriverinfo
   } from '@/model/transport/index'
   // import { dayjs, fmoney, EventBus } from 'base-core-lib'
   import {
@@ -317,9 +327,11 @@
         startDate: null,
         endDate: null,
         carList: [],
+        carNoList:[],
         // 提交类型
         readonly: true,
         tranPriceApprove: {},
+        carList1:[],
         size: 10,
         compId: localStorage.getItem('ws-pf_compId'),
         date: {
@@ -649,6 +661,8 @@
       },
       //审核
       examine(status) {
+        
+        
         this.$prompt('运输单价审核', {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
@@ -687,6 +701,21 @@
         });
       },
       priceSubmit(status) {
+        console.log(status,this.deptBudgetList.tranPriceIng,this.deptBudgetList.tranPriceIngCar)
+        if(status==1&&!this.deptBudgetList.tranPriceIng){
+          this.$message({
+            message: '请输入运输单价元/吨！',
+            type: 'warning',
+          })
+          return
+        }
+        if(status==2&&!this.deptBudgetList.tranPriceIngCar){
+          this.$message({
+            message: '请输入运输单价元/车！',
+            type: 'warning',
+          })
+          return
+        }
         this.$confirm(`运输单价将发送给决策人审核，确定提交？`, {
             cancelButtonText: '取消',
             confirmButtonText: '确定',
@@ -850,6 +879,14 @@
           .toPromise()
           .then((response) => {
             this.carList = response
+            this.carList1 = response
+          })
+          getcarNumber({
+            compId: this.compId
+          })
+          .toPromise()
+          .then((response) => {
+            this.carNoList = response
           })
       },
       carchange(val, index) {
@@ -884,6 +921,38 @@
           }
         }
       },
+      clear(){
+        this.carList=this.carList1
+      },
+      carNochange(val,index){
+        for (var i = 0; i < this.carNoList.length; i++) {
+          if (this.carNoList[i].carNumber == val) {
+            console.log(this.carNoList[i])
+            if (this.carNoList[i].carLoad != null) {
+                  this.deptBudgetList.tranCarInfoList[index].loadWeight =
+                  this.carNoList[i].carLoad
+                } else {
+                  this.deptBudgetList.tranCarInfoList[index].loadWeight = 0
+                }
+                this.deptBudgetList.tranCarInfoList[index].carModel =
+                this.carNoList[i].carModel
+                this.deptBudgetList.tranCarInfoList[index].carLength =
+                this.carNoList[i].carLength
+                this.deptBudgetList.tranCarInfoList[index].carLengthKey =
+                this.carNoList[i].carLengthKey
+                this.deptBudgetList.tranCarInfoList[index].carModelKey =
+                this.carNoList[i].carModelKey
+            getdriverinfo({
+              carNumber: this.carNoList[i].carNumber
+              })
+              .toPromise()
+              .then((response) => {
+                this.carList=response
+                
+              })
+          }
+        }
+      },
       phonechange(val, index) {
         for (var i = 0; i < this.carList.length; i++) {
           if (this.carList[i].driverPhone == val) {

src/views/warehousenew/warehousingOrder.vue

@@ -130,18 +130,18 @@
           </template>
         </el-table-column>
         <el-table-column prop="avgCost"  width="90" class="table_td" label="平均成本"></el-table-column>
-        <el-table-column prop="requestFunds"  width="130" class="table_td tablerequestFunds" label="请款">
+        <el-table-column prop="requestFunds"  width="150" class="table_td tablerequestFunds" label="请款">
           <template scope="scope">
             <span v-if="!scope.row.select">{{ scope.row.requestFunds }}</span>
-            <el-input v-else v-model='scope.row.requestFunds'></el-input>
+            <el-input  @focus="qingkuan(scope.row,item.id)" v-else v-model='scope.row.requestFunds'></el-input>
           </template>
         </el-table-column>
-         <el-table-column prop="remark"  width="80" class="table_td" label="请款备注">
+         <el-table-column prop="remark"  width="150" class="table_td" label="请款备注">
           <template scope="scope">
             <div v-if="!scope.row.select" @click.stop="lookRemark(scope.row)">
               <span class="text_css">查看</span>
             </div>
-            <el-input v-else v-model='scope.row.remark'></el-input>
+            <el-input @focus="inputremark(scope.row,item.id)" v-else v-model='scope.row.remark'></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="approveStatus" label="请款状态" width="90">
@@ -166,10 +166,12 @@
               <el-input disabled v-model="form.name"></el-input>
             </el-form-item>
             <el-form-item label="附件">
-              <el-upload ref='uploadfiles' :file-list='dataList' :action="global.uploadPath" list-type="picture-card"
+              <!-- <el-upload ref='uploadfiles' :file-list='dataList' :action="global.uploadPath" list-type="picture-card"
             :on-success="handlefujian" :on-remove="handleRemove" class="photo2"  accept="image/jpg,image/jpeg,image/png">
               <i class="el-icon-plus"></i>
-              </el-upload>
+              </el-upload> -->
+              <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" 
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
             </el-form-item>
             </el-form> 
           </div>
@@ -371,6 +373,28 @@
           <el-button type="primary" @click="fieldrationssubmit">提交</el-button>
         </span>
       </el-dialog>
+      <el-dialog
+      :title="'输入'+titletype"
+      :visible.sync="dialogVisiblecontent"
+      width="30%"
+      :before-close="handleClose5">
+      <div> 
+        <el-input
+        type="textarea"
+        :rows="5"
+        maxlength="500"
+        placeholder="请输入内容"
+        v-model="textarea">
+      </el-input>
+      <div style="text-align:center;margin-top:10px;">
+<ws-button type="primary" @click="handlequeren()" v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.add`
+              ">确认
+            </ws-button>
+      </div>
+        
+      </div>
+    </el-dialog>
       <!-- <el-dialog
       title="提示"
       :visible.sync="dialogVisible"
@@ -400,13 +424,18 @@
         </span>
     </el-dialog>
     <el-dialog width='50%' :visible.sync="accessoryTFs" title="附件" top="20vh">
-      <div v-for="(item,index) in appendixIdss" :key="'fujian'+index" >
+      <div v-if="appendixIdss.length>0&&appendixIdss[0].indexOf('http')!=-1">
+<div v-for="(item,index) in appendixIdss" :key="'fujian'+index" >
        <el-image 
         style="width: 100px; height: 100px"
         :src="item" 
         :preview-src-list="appendixIdss">
       </el-image>
       </div>
+      </div>
+      
+      <ws-upload v-if="appendixIdss.length>0&&appendixIdss[0].indexOf('http')==-1" ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </el-dialog>
     <el-dialog width='30%' :visible.sync="dialogVisible1" title="费用" top="20vh">
       <div v-for="(item,index) in costlist" :key="index" class="audit">
@@ -482,6 +511,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         dataList:[],
         payeeinfo:{},
         options:[],
+        textarea:'',
+        dialogVisiblecontent:false,
         // 船舶类型
         monetaryKey: null,
         form:{
@@ -574,7 +605,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         id:'',
         customerInfo:{},
         appendixIdss:[],
-        paymentScreenshot:[],
+        paymentScreenshot:'',
         endDate:'',
         startDate:'',
         warehouseName: '',
@@ -592,12 +623,13 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             return time.getTime() > Date.now()
           },
         },
+        currectfocusdata:{},
         customershow:false,
         interestratevalue:'',
         accessoryTFs: false,
         remarkList: false,
         dialogTitle:'',
-
+        titletype:'',
         remark:''
       }
     },
@@ -611,6 +643,34 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
       this.showType = this.isShow
     },
     methods: {
+      handleClose5(){
+        this.dialogVisiblecontent=false
+      },
+      qingkuan(item){
+        this.titletype='请款金额'
+        this.currectfocusdata=item
+        this.textarea=this.currectfocusdata.requestFunds
+        this.dialogVisiblecontent=true
+      },
+      inputremark(item){
+        this.titletype='备注内容'
+        this.currectfocusdata=item
+        this.textarea=this.currectfocusdata.remark
+        this.dialogVisiblecontent=true
+      },
+      handlequeren(){
+        if(this.titletype=='请款金额'){
+          this.dialogVisiblecontent=false
+          this.currectfocusdata.requestFunds=this.textarea
+          console.log(this.currectfocusdata,textarea)
+          this.$forceUpdate()
+        }else{
+          this.dialogVisiblecontent=false
+          this.currectfocusdata.remark=this.textarea
+          this.$forceUpdate()
+        }
+        
+      },
       interestratesubmit(){
         setenabledinfo({id:this.interestratevalue.id,value:this.interestratevalue.value}).toPromise()
               .then((response) => {
@@ -654,16 +714,20 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
       fujian(row) {
         this.id = row.id
         this.accessoryTFs = true
-        if(row.addressUrl.split(',')){
-          var arr=row.addressUrl.split(',')
-          this.dataList=[]
-          for(var i=0;i<arr.length;i++){
-            this.dataList.push({url:arr[i]})
+        console.log(row.addressUrl.indexOf('http'))
+        if(row.addressUrl.indexOf('http')!=-1){
+          if(row.addressUrl.split(',')){
+            var arr=row.addressUrl.split(',')
+            this.dataList=[]
+            for(var i=0;i<arr.length;i++){
+              this.dataList.push({url:arr[i]})
+            }
+            this.appendixIdss=arr
+            this.paymentScreenshot=arr
           }
-          this.appendixIdss=arr
-          this.paymentScreenshot=arr
+        }else{
+          this.appendixIdss=row.addressUrl
         }
-        
         console.log(this.appendixIdss)
       },
       lookRemark(row) {
@@ -1031,10 +1095,16 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           return false
         }
       },
-      handlefujian(file) {
-        // console.log(file)
-        this.paymentScreenshot.push(file.data.url)
-        // this.dialogVisible = true
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.paymentScreenshot = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
       },
       handleRemove(file) {
         // console.log(file)
@@ -1102,7 +1172,9 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         var that=this
         console.log(this.multipleSelection1,this.multipleSelection1[this.currectdata.id])
         var arr2=this.multipleSelection1[this.currectdata.id]
-          if(this.paymentScreenshot.length==0){
+        console.log(this.paymentScreenshot)
+        var len=this.paymentScreenshot?this.paymentScreenshot.split(','):[]
+          if(len.length==0){
             this.$message({
               message: '请上传付款截图',
               type: 'warning'
@@ -1111,14 +1183,15 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           }
           for (let i = 0; i < arr2.length; i++) {
             if(arr2[i].addressUrlArray){
-              arr2[i].addressUrlArray=arr2[i].addressUrlArray.concat(this.paymentScreenshot)
+              arr2[i].addressUrlArray=arr2[i].addressUrlArray.concat(len)
             }
             else{
-              arr2[i].addressUrlArray=this.paymentScreenshot
+              arr2[i].addressUrlArray=len
             }
             arr2[i].addressUrl=arr2[i].addressUrlArray.toString()
             
           }
+          console.log(arr2)
           paymoney({flag:0,warehousingOrderList:arr2}).toPromise()
           .then((response) => {
             this.$message({
@@ -1126,8 +1199,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
               type: 'success'
             });
             this.aduitshow=false
-            this.paymentScreenshot=[]
-            this.$refs.uploadfiles.clearFiles()
+            this.paymentScreenshot=''
+            this.$refs.upload.clearFiles()
             this.getList()
           }).catch(() => {
            this.$message({