gjy 3 years ago
parent
commit
ad2067f03b
27 changed files with 2359 additions and 2436 deletions
  1. 2 2
      .env.production
  2. 7 0
      src/App.vue
  3. 7 7
      src/views/houseSelfCollect/acquisitionManagementAdd.vue
  4. 3 3
      src/views/houseSelfCollect/customerManagementAdd.vue
  5. 9 11
      src/views/houseSelfCollect/inspectInfo.vue
  6. 1 1
      src/views/houseSelfCollect/paymentManagement.vue
  7. 36 35
      src/views/houseSelfCollect/settlement.vue
  8. 14 2
      src/views/houseSelfCollect/weighingManagement.vue
  9. 30 20
      src/views/houseSelfCollect/weightCheck.vue
  10. 3 3
      src/views/outboundManagement/collectionManagement.vue
  11. 6 6
      src/views/outboundManagement/component/route.js
  12. 1 1
      src/views/outboundManagement/qualityInspection.vue
  13. 2 2
      src/views/outboundManagement/qualityInspectionManagement.vue
  14. 2 0
      src/views/outboundManagement/weighing.vue
  15. 4 4
      src/views/outboundManagement/weighingManagement.vue
  16. 2 2
      src/views/statisticalReport/component/routers/route.js
  17. 8 5
      src/views/statisticalReport/stockPurchaseReceiptReportList.vue
  18. 11 10
      src/views/statisticalReport/stockSaleOutReportList.vue
  19. 2 30
      src/views/taskManagement/tranManagementWarehouseInOutTask.vue
  20. 3 0
      src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
  21. 269 284
      src/views/tranManagement/tranManagementFireFeedback.vue
  22. 296 318
      src/views/tranManagement/tranManagementShippingFeedback.vue
  23. 709 729
      src/views/tranManagement/tranManagementShippingFeedbackLook.vue
  24. 1 0
      src/views/tranManagement/tranManagementVehicleDispatching.vue
  25. 1 1
      src/views/warehouse/warehouseManagementEdit.vue
  26. 3 0
      src/views/warehouse/warehouseManagementPut.vue
  27. 927 960
      src/views/warehouse/warehouseManagementRecord.vue

+ 2 - 2
.env.production

@@ -4,8 +4,8 @@
 
 NODE_ENV = 'production'
 # base api
-#VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
-VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
+VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
+#VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
 
 # 微服务相关接口配置
 ## 任务消息

+ 7 - 0
src/App.vue

@@ -90,4 +90,11 @@ export default {
     background-color: #5878e8;
     border-color: #5878e8;
 }
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+      -webkit-appearance: none !important;
+    }
+input[type='number'] {
+      -moz-appearance: textfield !important;
+    }
 </style>

+ 7 - 7
src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -23,34 +23,34 @@
           </div>
           <div class="grid-content">
             <el-form-item label="基准水分(%)">
-              <el-input v-model="baseInfoForm.waterBase" @input="changeBaseWater" :disabled="!isEdit"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.waterBase" @input="changeBaseWater" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
           <div class="grid-content">
             <el-form-item label="扣重比">
-              <el-input v-model="baseInfoForm.deductWeight" :disabled="!isEdit"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.deductWeight" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
           <div class="grid-content">
             <el-form-item label="干粮收购价格(元/公斤)"  label-width="180px">
-              <el-input v-model="baseInfoForm.dryGrainPrice" :disabled="!isEdit"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.dryGrainPrice" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
         </div>
         <div class="row2">
           <div class="grid-content">
             <el-form-item label="干粮水分(%)">
-              <el-input v-model="baseInfoForm.waterMin" @input="changeMinWater" :disabled="!isEdit" id="aaa"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.waterMin" @input="changeMinWater" :disabled="!isEdit" id="aaa"></el-input>
             </el-form-item>
           </div>
           <div class="grid-content">
             <el-form-item label="水分上限(%)">
-              <el-input v-model="baseInfoForm.waterMax" @input="changeMaxWater" :disabled="!isEdit"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.waterMax" @input="changeMaxWater" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
           <div class="grid-content">
             <el-form-item label="销售上限(吨/年)">
-              <el-input v-model="baseInfoForm.saleLimit" :disabled="!isEdit"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.saleLimit" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
         </div>
@@ -64,7 +64,7 @@
           <div class="top">
             <div class="left">
               <div class="text">基准单价(元/公斤)</div>
-              <el-input v-model="item.basicUnitPrice" :disabled="!isEdit"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model="item.basicUnitPrice" :disabled="!isEdit"></el-input>
             </div>
             <el-button @click="delSetPrice(item,index)" :disabled="!isEdit">删除</el-button>
           </div>

+ 3 - 3
src/views/houseSelfCollect/customerManagementAdd.vue

@@ -61,7 +61,7 @@
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="银行卡号" span="1" prop="bankCard">
-            <ws-input v-model="customerList.bankCard" placeholder="请输入银行卡号" maxlength="19" size="small"
+            <ws-input type="number" @mousewheel.native.prevent v-model="customerList.bankCard" placeholder="请输入银行卡号" maxlength="19" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="开户行" span="1" prop="bankDeposit">
@@ -85,7 +85,7 @@
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="手机号" span="1" prop="customerPhone">
-            <ws-input v-model="customerList.customerPhone" placeholder="请输入手机号" maxlength="11" size="small"
+            <ws-input type="number" @mousewheel.native.prevent v-model="customerList.customerPhone" placeholder="请输入手机号" maxlength="11" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="联系地址" span="1" prop="compAddress">
@@ -95,7 +95,7 @@
           <div v-if="this.switchType == 1 || this.switchType == 3" class = "jiaoYan">
               <el-button type="primary" class="veriCode" @click="toSend()" v-if="!sendDisabled">获取验证码</el-button>
             <el-button type="warning" class="veriCode" v-if="sendDisabled">{{sendText}}</el-button>
-            <ws-input v-model="verifyCode" placeholder="请输入验证码" maxlength="100" size="small" :disabled="disabled" />
+            <ws-input type="number" @mousewheel.native.prevent v-model="verifyCode" placeholder="请输入验证码" maxlength="100" size="small" :disabled="disabled" />
           </div>
         </ws-info-table>
         <div class="but">

+ 9 - 11
src/views/houseSelfCollect/inspectInfo.vue

@@ -49,7 +49,7 @@
               </ws-select>
             </ws-form-item>
             <ws-form-item label="扣重比" span="1" prop="buckleWeightRatio">
-              <ws-input v-model="inspect.buckleWeightRatio" placeholder="请输入扣重比" maxlength="100" size="small"
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.buckleWeightRatio" placeholder="请输入扣重比" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="类型" span="1" prop="type">
@@ -62,10 +62,10 @@
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="净重单价(元/公斤)" span="1" prop="tidalGrainPrice" v-if="inspect.type == '潮粮'">
-              <ws-input v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="10" size="small" disabled />
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="10" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="干粮单价(元/公斤)" span="1" prop="dryGrainPrice" v-if="inspect.type == '干粮'">
-              <ws-input v-model="inspect.dryGrainPrice" placeholder="请输入干粮单价" maxlength="10" size="small"  :disabled="disabled" />
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.dryGrainPrice" placeholder="请输入干粮单价" maxlength="10" size="small"  :disabled="disabled" />
             </ws-form-item>
           </ws-info-table>
 
@@ -79,27 +79,27 @@
               </ws-select>
             </ws-form-item>
             <ws-form-item label="杂质(%)" span="1" prop="impurity">
-              <ws-input v-model="inspect.impurity" placeholder="请输入杂质占比" maxlength="100" size="small"
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.impurity" placeholder="请输入杂质占比" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="水分(%)" span="1" prop="waterContent">
-              <ws-input v-model="inspect.waterContent" placeholder="请输入水分占比" maxlength="100" size="small"
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.waterContent" placeholder="请输入水分占比" maxlength="100" size="small"
                 @change="waterContentChange('water')" :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
-              <ws-input v-model="inspect.mildewGrain" placeholder="请输入霉变粒占比" maxlength="100" size="small"
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.mildewGrain" placeholder="请输入霉变粒占比" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
-              <ws-input v-model="inspect.bulkDensity" placeholder="请输入容重" maxlength="100" size="small"
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.bulkDensity" placeholder="请输入容重" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
-              <ws-input v-model="inspect.jiaorenli" placeholder="请输入热损伤占比" maxlength="100" size="small"
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.jiaorenli" placeholder="请输入热损伤占比" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="不完善粒(%)" span="1" prop="imperfectGrain">
-              <ws-input v-model="inspect.imperfectGrain" placeholder="请输入不完善粒占比" maxlength="100" size="small"
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.imperfectGrain" placeholder="请输入不完善粒占比" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
           </ws-info-table>
@@ -233,7 +233,6 @@
         return String(year) + String(mouth) + String(datetime)
       },
       calculation() {
-        console.log(this.getdate())
         let number = '000' + this.count
         number = number.substring(number.length - 4, number.length)
         this.inspect.qualityNo = 'SGRK' + this.getdate() + this.cangNo + number //SGRK+8位时间+3位仓库编号+4位序列号
@@ -581,7 +580,6 @@
                     .toPromise()
                     .then((response) => {
                       this.inspect = response
-                      console.log(this.inspect,'cdsklh')
                     })
                   this.isShowPrint = true
                 })

+ 1 - 1
src/views/houseSelfCollect/paymentManagement.vue

@@ -140,7 +140,7 @@
           <ws-info-table>
             <ws-form-item label="未付金额(元)" prop="amountNotPayable">{{ payments.amountNotPayable }}</ws-form-item>
             <ws-form-item label="本次付款金额(元)" prop="money">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
                 v-model="payments.money"
                 placeholder="请输入本次付款金额(元)"
                 maxlength="100"

+ 36 - 35
src/views/houseSelfCollect/settlement.vue

@@ -69,10 +69,10 @@
                 <ws-input v-model="paymentList.qualityInspectionManagement.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small" disabled />
             </ws-form-item>
              <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价(元/公斤)" span="1" prop="waterContent">
-                <ws-input v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
+                <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
             </ws-form-item>
              <ws-form-item v-if='paymentList.type=="干粮"' label="净重(公斤)" span="1" prop="waterContent">
-                <ws-input v-model="paymentList.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled />
+                <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled />
             </ws-form-item>
           </ws-info-table>
           <div class="titles">质检数据</div>
@@ -81,7 +81,7 @@
               <ws-input v-model="paymentList.qualityInspectionManagement.grade" placeholder="请输入等级" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="杂质(%)" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               v-model="paymentList.qualityInspectionManagement.impurity"
                 placeholder="请输入杂质占比"
                 maxlength="100"
@@ -90,7 +90,7 @@
               />
             </ws-form-item>
             <ws-form-item label="水分(%)" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               v-model="paymentList.qualityInspectionManagement.waterContent"
                 placeholder="请输入水分占比"
                 maxlength="100"
@@ -99,7 +99,7 @@
               />
             </ws-form-item>
             <ws-form-item label="霉变粒(%)" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               v-model="paymentList.qualityInspectionManagement.mildewGrain"
                 placeholder="请输入霉变粒占比"
                 maxlength="100"
@@ -108,10 +108,10 @@
               />
             </ws-form-item>
             <ws-form-item label="容重(克/升)" span="1" prop="waterContent">
-              <ws-input v-model="paymentList.qualityInspectionManagement.bulkDensity" placeholder="请输入容重" maxlength="100" size="small" disabled />
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.bulkDensity" placeholder="请输入容重" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="热损伤(%)" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
                v-model="paymentList.qualityInspectionManagement.jiaorenli"
                 placeholder="请输入热损伤占比"
                 maxlength="100"
@@ -120,7 +120,7 @@
               />
             </ws-form-item>
             <ws-form-item label="不完善粒(%)" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               v-model="paymentList.qualityInspectionManagement.imperfectGrain"
                 placeholder="请输入不完善粒占比"
                 maxlength="100"
@@ -133,7 +133,7 @@
           <div v-if='paymentList.type=="潮粮"' class="titles">单价核算</div>
           <ws-info-table v-if='paymentList.type=="潮粮"'>
             <ws-form-item label="潮粮水分(%)" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               v-model="paymentList.qualityInspectionManagement.waterContent"
                 placeholder="请输入潮粮水分"
                 maxlength="100"
@@ -142,7 +142,7 @@
               />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="扣重比" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               @input='buckleWeightRatiochange'
               v-model="paymentList.buckleWeightRatio"
                 placeholder="请输入扣重比"
@@ -152,7 +152,7 @@
               />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="干粮水分(%)" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               v-model="paymentList.qualityInspectionManagement.waterMin"
                 placeholder="请输入干粮水分"
                 maxlength="100"
@@ -161,29 +161,29 @@
               />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="扣重" span="1" prop="waterContent">
-              <ws-input v-model="paymentList.qualityInspectionManagement.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="掉水(%)" span="1" prop="waterContent">
-              <ws-input v-model="paymentList.qualityInspectionManagement.waterContent-paymentList.qualityInspectionManagement.waterMin" placeholder="请输入掉水" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.waterContent-paymentList.qualityInspectionManagement.waterMin" placeholder="请输入掉水" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="基数" span="1" prop="waterContent">
-              <ws-input v-model="paymentList.base" placeholder="请输入基数" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.base" placeholder="请输入基数" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="毛重(公斤)" span="1" prop="waterContent">
-              <ws-input v-model="paymentList.weighingManagement.grossWeight" placeholder="请输入毛重" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.weighingManagement.grossWeight" placeholder="请输入毛重" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="纯重(公斤)" span="1" prop="waterContent">
-              <ws-input v-model="paymentList.pureWeight" placeholder="请输入纯重" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.pureWeight" placeholder="请输入纯重" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="皮重(公斤)" span="1" prop="waterContent">
-              <ws-input v-model="paymentList.weighingManagement.tare" placeholder="请输入皮重" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.weighingManagement.tare" placeholder="请输入皮重" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"'
               label="净重单价(元/公斤)"
               span="1"
               prop="waterContent"
             >
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
                v-model="paymentList.qualityInspectionManagement.tidalGrainPrice"
                 placeholder="请输入净重单价"
                 maxlength="100"
@@ -192,10 +192,10 @@
               />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="扣杂(公斤)" span="1" prop="waterContent">
-              <ws-input v-model="paymentList.weighingManagement.buckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.weighingManagement.buckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item  label="扣单价(元/公斤)" span="1" prop="unitDeduction">
-              <ws-input v-model="paymentList.unitDeduction" @input="grainMoney" placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled"/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.unitDeduction" @input="grainMoney" placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled"/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"'
               label="纯重单价(元/公斤)"
@@ -203,7 +203,7 @@
               prop="waterContent"
             >
               <!-- v-model="paymentList.solidGrainPrice" -->
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               v-model="paymentList.solidGrainPrice"
                 placeholder="请输入纯重单价"
                 maxlength="100"
@@ -212,7 +212,7 @@
               />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="净重(公斤)" span="1" prop="waterContent">
-              <ws-input v-model="paymentList.weighingManagement.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.weighingManagement.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled/>
             </ws-form-item>
           </ws-info-table>
 
@@ -224,7 +224,7 @@
               prop="waterContent"
               class="formItem"
             >
-              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="干粮"' 
               label="粮款 = 净重 x  (干粮单价 - 扣单价)  ="
@@ -232,10 +232,10 @@
               prop="waterContent"
               class="formItem"
             >
-              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item label="称重扣款" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               @input='grainMoney'
               @focus="inputFocus($event)"
               v-model="paymentList.weighingDeduction"
@@ -246,7 +246,7 @@
               />
             </ws-form-item>
             <ws-form-item label="称重补助" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               @input='grainMoney'
               @focus="inputFocus($event)"
                v-model="paymentList.weighingSubsidy"
@@ -258,7 +258,7 @@
             </ws-form-item>
             
             <ws-form-item label="运费扣款" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               @input='grainMoney'
               @focus="inputFocus($event)"
                v-model="paymentList.freightDeduction"
@@ -269,7 +269,7 @@
               />
             </ws-form-item>
             <ws-form-item label="运费补助" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               @input='grainMoney'
               @focus="inputFocus($event)"
               v-model="paymentList.freightSubsidy"
@@ -280,7 +280,7 @@
               />
             </ws-form-item>
             <ws-form-item label="卸车扣款" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               @input='grainMoney'
               @focus="inputFocus($event)"
               v-model="paymentList.unloadDeduction"
@@ -291,7 +291,7 @@
               />
             </ws-form-item>
             <ws-form-item label="卸车补助" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               @input='grainMoney'
               @focus="inputFocus($event)"
               v-model="paymentList.unloadSubsidy"
@@ -302,7 +302,7 @@
               />
             </ws-form-item>
             <ws-form-item label="质量扣款" span="1" prop="qualityDeduction">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               @input='grainMoney'
               @focus="inputFocus($event)"
               v-model="paymentList.qualityDeduction"
@@ -314,7 +314,7 @@
             </ws-form-item>
 
             <ws-form-item label="其他补助" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               @input='grainMoney'
               @focus="inputFocus($event)"
               v-model="paymentList.otherSubsidy"
@@ -326,7 +326,7 @@
             </ws-form-item>
             
             <ws-form-item label="其他扣款" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               @input='grainMoney'
               @focus="inputFocus($event)"
               v-model="paymentList.otherDeduction"
@@ -342,7 +342,7 @@
               prop="waterContent"
               class="formItem"
             >
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               v-model="paymentList.calculationPayable"
                 placeholder="请输入计算应付"
                 maxlength="100"
@@ -351,7 +351,7 @@
               />
             </ws-form-item>
             <ws-form-item label="实际付款" span="1" prop="waterContent">
-              <ws-input
+              <ws-input type="number" @mousewheel.native.prevent
               @change='actualPayment'
               v-model="paymentList.actualPayment"
                 placeholder="请输入实际付款"
@@ -727,6 +727,7 @@ export default {
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
              this.printData= response
+             console.log(this.printData,"结算打印")
          })
          this.isShowPrint = true
         },

+ 14 - 2
src/views/houseSelfCollect/weighingManagement.vue

@@ -159,6 +159,8 @@ export default {
       warehouseList: [],
       warehouseId: '',
       cangid: '',
+      monitorUrl1: '',
+      monitorUrl2: '',
       isShowPrint:false,//打印弹出
       dialogData:{
         qualityInspectionManagement:{},
@@ -201,7 +203,9 @@ export default {
           this.purchasePriceList = this.warehouseList[i].warehouseList
           this.allowEdit = this.warehouseList[i].allowEdit
           this.WAREHOUSE[2].payname = this.warehouseList[i].value
-          this.common.name  =  this.warehouseList[0].value
+          this.common.name  =  this.warehouseList[i].value
+          this.monitorUrl1 =  this.warehouseList[i].monitorUrl1
+          this.monitorUrl2 =  this.warehouseList[i].monitorUrl2
           sessionStorage.setItem('ck',e)
         }
       }
@@ -225,6 +229,8 @@ export default {
           netWeight: row.netWeight,
           relationId: row.relationId,
           warehouseId: this.warehouseId,
+          monitorUrl1: this.monitorUrl1,
+          monitorUrl2: this.monitorUrl2,
           purchasePriceList: this.purchasePriceList,
           allowEdit:this.allowEdit
         },
@@ -255,7 +261,9 @@ export default {
               value: response[i].warehouseName,
               warehouseId: response[i].id,
               warehouseList:response[i].purchasePriceList,
-              allowEdit:response[i].allowEdit
+              allowEdit:response[i].allowEdit,
+              monitorUrl1:response[i].monitorUrl1,
+              monitorUrl2:response[i].monitorUrl2
             })
             if (this.cangid&&this.cangid == response[i].id) {
               this.warehouseName = response[i].warehouseName
@@ -263,6 +271,8 @@ export default {
               this.common.name = response[i].warehouseName
               this.warehouseId =  response[i].id
               this.warehouseNo =  response[i].commonWarehouseNo
+              this.monitorUrl1 =  response[i].monitorUrl1
+              this.monitorUrl2 =  response[i].monitorUrl2
               this.purchasePriceList =  response[i].purchasePriceList
             }
           }
@@ -273,6 +283,8 @@ export default {
             this.purchasePriceList =  this.warehouseList[0].purchasePriceList
             this.WAREHOUSE[1].payname = this.warehouseList[0].value
             this.common.name  =  this.warehouseList[0].value
+            this.monitorUrl1 =  this.warehouseList[0].monitorUrl1
+            this.monitorUrl2 =  this.warehouseList[0].monitorUrl2
           }
            sessionStorage.setItem('ck',this.common.name)
          this.getList()

+ 30 - 20
src/views/houseSelfCollect/weightCheck.vue

@@ -20,19 +20,27 @@
         </div>
         <h2 class="bg-left titleup">实时监控</h2>
         <div class="bottom">
-          <div class="video1">
-            <!-- <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" v-if="!video1Src">
-            <div v-if="!video1Src">监控视频未连接</div>
-            <video v-if="video1Src" controls="controls" :src="video1Src"  autoplay="autoplay" class="video-content"
-              mediatype="video"></video> -->
-              <iframe src="http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000001&aspect=fullscreen" width="440" height="360" allowfullscreen allow="autoplay; fullscreen; microphone;"></iframe>
+          <div v-if="!monitorUrl1" class="video1">
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" >
+            <div >监控视频未连接</div>
+              
           </div>
-          <div class="vide2">
-            <!-- <img src="../../../public/img/quesheng@2x.png" alt="" class="img2" v-if="!video2Src">
-            <div v-if="!video2Src">监控视频未连接</div>
-            <video src="" v-if="video2Src" class="video-content"></video> -->
-            <iframe src="http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000002&aspect=fullscreen" width="440" height="360" allowfullscreen allow="autoplay; fullscreen; microphone;"></iframe>
-          
+          <div v-else class="video1">
+           <iframe :src="monitorUrl1" width="440" height="360" allowfullscreen ="true"
+           webkitallowfullscreen="true"
+           mozallowfullscreen="true"
+           allow="autoplay; fullscreen; microphone;"></iframe>
+          </div>
+          <div v-if="!monitorUrl2" class="video1">
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" >
+            <div >监控视频未连接</div>
+              
+          </div>
+          <div v-else class="video2">
+           <iframe :src="monitorUrl2" width="440" height="360" allowfullscreen="true"
+           webkitallowfullscreen="true"
+           mozallowfullscreen="true"
+            allow="autoplay; fullscreen; microphone;"></iframe>
           </div>
         </div>
       </div>
@@ -66,25 +74,25 @@
                 <ws-input v-model="weighingList.goodsName" placeholder="请输入货名" maxlength="100" size="small" disabled />
               </ws-form-item>
               <ws-form-item label="毛重(公斤)" span="1" prop="grossWeight">
-                <ws-input v-if="this.index == 0" v-model="weighingList.grossWeight" @input="calculation"
+                <ws-input type="number" @mousewheel.native.prevent v-if="this.index == 0" v-model="weighingList.grossWeight" @input="calculation"
                   placeholder="未获取到毛重" maxlength="100" size="small" :disabled="disabled" />
-                <ws-input v-else v-model="weighingList.grossWeight" @input="calculation" placeholder="未获取到毛重"
+                <ws-input type="number" @mousewheel.native.prevent v-else v-model="weighingList.grossWeight" @input="calculation" placeholder="未获取到毛重"
                   maxlength="100" size="small" disabled />
               </ws-form-item>
               <el-button type="primary" :class="index ==0 ? '' : 'butCss'" @click="openPort">重新获取</el-button>
               <ws-form-item label="皮重(公斤)" span="1" prop="tare" v-if="information == '皮重'">
-                <ws-input v-model="weighingList.tare" @input="calculation" placeholder="未获取到皮重" maxlength="100"
+                <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare" @input="calculation" placeholder="未获取到皮重" maxlength="100"
                   size="small" :disabled="disabled" />
               </ws-form-item>
               <el-button type="primary" v-if="index != 0" @click="openPort">重新获取</el-button>
               <div class="formItem">
                 <ws-form-item label="扣杂(公斤)" span="1" prop="buckleWeightRatio" v-if="information == '皮重'">
-                  <ws-input v-model="weighingList.buckleMiscellaneous" @input="calculation" placeholder="请输入扣杂"
+                  <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous" @input="calculation" placeholder="请输入扣杂"
                     maxlength="100" size="small" />
                 </ws-form-item>
 
                 <ws-form-item label="净重(公斤)" span="1" prop="netWeight" v-if="information == '皮重'">
-                  <ws-input v-model="weighingList.netWeight" placeholder="请输入净重" maxlength="100" size="small"
+                  <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight" placeholder="请输入净重" maxlength="100" size="small"
                     disabled />
                 </ws-form-item>
               </div>
@@ -168,8 +176,6 @@
         pList: [],
         mList: [],
         index: 0,
-        video1Src: 'http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000001',
-        video2Src: 'http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000002',
         currentPage: 1,
         pageSize: 10,
         carList: [],
@@ -195,7 +201,9 @@
         isShowPrint: false,
         tableData: {},
         reader: null,
-        param: 9600
+        param: 9600,
+        monitorUrl1: '',
+        monitorUrl2: '',
       }
     },
     activated() {
@@ -210,6 +218,8 @@
       this.weighingList.goodsName = this.$route.query.goodsName
       this.weighingList.id = this.$route.query.id
       this.relationId = this.$route.query.relationId
+      this.monitorUrl1 = this.$route.query.monitorUrl1
+      this.monitorUrl2 = this.$route.query.monitorUrl2
       this.warehouseId = this.$route.query.warehouseId
       if (!this.$route.query.grossWeight) {
         this.$route.query.grossWeight = 0

+ 3 - 3
src/views/outboundManagement/collectionManagement.vue

@@ -15,8 +15,8 @@
             :type="searchType == '' ? 'primary' : ''"
             @click="handlestatus('')"
         >全部</ws-button>
-        <ws-button type="primary" @click="adopt">备注</ws-button>
-        <ws-button type="primary" @click="collect">收款</ws-button>
+        <ws-button type="primary" @click="adopt" v-hasPermission=" `outbound.collectionOut.view`">备注</ws-button>
+        <ws-button type="primary" @click="collect" v-hasPermission=" `outbound.collectionOut.new`">收款</ws-button>
       </template>
       <template slot="right">
         <el-col
@@ -170,7 +170,7 @@
         label="操作"
         width="200"
       ><template scope="scope">
-        <el-button @click="collectment(2,scope.row)">查看</el-button>
+        <el-button @click="collectment(2,scope.row)" v-hasPermission="`outbound.collectionOut.weight`">查看</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 6 - 6
src/views/outboundManagement/component/route.js

@@ -21,7 +21,7 @@ const outboundManagementRouter = {
             meta: {
                 title:'weighingManagement',
                 shortcutEntrance:'outboundManagement',
-                module:'procurement.procurementOrder.delete',
+                module:'outbound.acquisitionWeightOut.view',
                 permissicon: [],
                 keepAlive: true
             }
@@ -35,7 +35,7 @@ const outboundManagementRouter = {
             meta: {
               title: 'weighing',
               shortcutEntrance: 'weighing',
-              module: 'procurement.procurementOrder.delete',
+              module: 'outbound.acquisitionWeightOut.view',
               permissicon: [],
               keepAlive: true
             },
@@ -50,7 +50,7 @@ const outboundManagementRouter = {
             meta: {
                 title:'qualityInspectionManagement',
                 shortcutEntrance:'outboundManagement',
-                module:'procurement.procurementOrder.delete',
+                module:'outbound.acquisitionQualityOut.view',
                 permissicon: [],
                 keepAlive: true
             }
@@ -65,7 +65,7 @@ const outboundManagementRouter = {
               title: 'qualityInspection',
               shortcutEntrance: 'qualityInspection',
               
-              module: 'procurement.procurementOrder.delete',
+              module: 'outbound.acquisitionQualityOut.edit',
               permissicon: [],
               keepAlive: true
             },
@@ -81,7 +81,7 @@ const outboundManagementRouter = {
             meta: {
                 title:'collectionManagement',
                 shortcutEntrance:'outboundManagement',
-                module:'procurement.procurementOrder.delete',
+                module:'outbound.collectionOut.weight',
                 permissicon: [],
                 keepAlive: true
             }
@@ -95,7 +95,7 @@ const outboundManagementRouter = {
             meta: {
               title: 'collectionment',
               shortcutEntrance: 'collectionment',
-              module: 'procurement.procurementOrder.delete',
+              module: 'outbound.collectionOut.weight',
               permissicon: [],
               keepAlive: true
             },

+ 1 - 1
src/views/outboundManagement/qualityInspection.vue

@@ -115,7 +115,7 @@
                 :disabled="disabled"
               />
             </ws-form-item>
-            <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
+            <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
               <ws-input
                 v-model="inspect.bulkDensity"
                 placeholder="请输入容重"

+ 2 - 2
src/views/outboundManagement/qualityInspectionManagement.vue

@@ -65,8 +65,8 @@
       <el-table-column prop="status" label="状态"></el-table-column>
       <el-table-column width="300" label="操作">
         <template slot-scope="scope">
-          <span v-if="scope.row.status == '已质检'"><el-button @click="qualityInspection(scope.row, 2)">查看</el-button></span>
-          <span v-if="scope.row.status == '已称毛重' || scope.row.status == '' || scope.row.status == null"><el-button @click="qualityInspection(scope.row, 1)">质检</el-button></span>
+          <span v-if="scope.row.status == '已质检'" v-hasPermission=" `outbound.acquisitionQualityOut.view`"><el-button @click="qualityInspection(scope.row, 2)">查看</el-button></span>
+          <span v-if="scope.row.status == '已称毛重' || scope.row.status == '' || scope.row.status == null" v-hasPermission=" `outbound.acquisitionQualityOut.edit`"><el-button @click="qualityInspection(scope.row, 1)">质检</el-button></span>
         </template>
       </el-table-column>
     </el-table>

+ 2 - 0
src/views/outboundManagement/weighing.vue

@@ -57,6 +57,8 @@
 								disabled /> -->
 								<ws-input @input="calculation" v-model="weighingList.tare" placeholder="未获取到皮重" 
 								maxlength="100" size="small" :disabled="disabled2"/>
+								<!-- <ws-input @input="calculation" v-model="weighingList.tare" placeholder="未获取到皮重" 
+								maxlength="100" size="small"/> -->
 						</ws-form-item>
 						<el-button type="primary" v-if="this.types == 2 || this.types == null" @click="openPort">重新获取</el-button>
 						<!-- <div class="formItem"> -->

+ 4 - 4
src/views/outboundManagement/weighingManagement.vue

@@ -3,7 +3,7 @@
 	<div>
 		<BaseHeaderLayout :leftSpan="12">
 			<template slot="left">
-				<ws-button type="primary" @click="weighing(3)">添加</ws-button>
+				<ws-button type="primary" @click="weighing(3)" v-hasPermission=" `outbound.acquisitionWeightOut.new`">添加</ws-button>
 			</template>
 			<!-- <template slot="left"> </template> -->
 			<template slot="right">
@@ -58,9 +58,9 @@
 			<el-table-column prop="status" label="状态"></el-table-column>
 			<el-table-column width="300" prop="contractNo1" label="操作">
 				<template slot-scope="scope">
-					<el-button @click="weighing(scope.row, 1)" v-if="scope.row.status != '已质检'">毛重</el-button>
-					<el-button @click="weighing(scope.row, 2)" v-if="scope.row.status == '已称皮重'">皮重</el-button>
-					<el-button @click="del(scope.row)" v-if="scope.row.status == '已称皮重'">删除</el-button>
+					<el-button @click="weighing(scope.row, 1)" v-if="scope.row.status != '已质检'" v-hasPermission="`outbound.acquisitionWeightOut.mao`">毛重</el-button>
+					<el-button @click="weighing(scope.row, 2)" v-if="scope.row.status == '已称皮重'" v-hasPermission="`outbound.acquisitionWeightOut.weight`"> 皮重</el-button>
+					<el-button @click="del(scope.row)" v-if="scope.row.status == '已称皮重'" v-hasPermission="`outbound.acquisitionWeightOut.view`">删除</el-button>
 				</template>
 			</el-table-column>
 		</el-table>

+ 2 - 2
src/views/statisticalReport/component/routers/route.js

@@ -96,7 +96,7 @@ const statisticalReportRouter = {
       meta: {
         title: 'stockPurchaseReceiptReportList',
         shortcutEntrance: 'statisticalReport',
-        module: 'report.saleOutReport',
+        module: 'report.goodsProcurementInReport',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -111,7 +111,7 @@ const statisticalReportRouter = {
       meta: {
         title: 'stockSaleOutReportList',
         shortcutEntrance: 'statisticalReport',
-        module: 'report.saleOutReport',
+        module: 'report.goodsSaleOutReport',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

+ 8 - 5
src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -26,31 +26,31 @@
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.view`"
+            v-hasPermission="`report.goodsProcurementInReport.view`"
             @click="handleAudit()"
             >通过</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.view`"
+            v-hasPermission="`report.goodsProcurementInReport.view`"
             @click="handlereject()"
             >驳回</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.payment`"
+            v-hasPermission="`report.goodsProcurementInReport.payment`"
             @click="handlepayment"
             >付款</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.edit`"
+            v-hasPermission="`report.goodsProcurementInReport.edit`"
             @click="addRemarks()"
             >备注</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.carry`"
+            v-hasPermission="`report.goodsProcurementInReport.carry`"
             @click="dis()"
             >定金</ws-button
           >
@@ -358,8 +358,11 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <span v-if="roleFlag == 1 ">
         <el-button @click="dialogFormVisible11 = false">取 消</el-button>
         <el-button type="primary" @click="remarksSubmit()">保存</el-button>
+        </span>
+        <span v-else><el-button @click="dialogFormVisible11 = false">关 闭</el-button></span>
       </div>
     </el-dialog>
     <!--定金-->

+ 11 - 10
src/views/statisticalReport/stockSaleOutReportList.vue

@@ -4,11 +4,11 @@
 		<el-scrollbar style="height: 100%">
 			<el-row>
 				<el-col style="padding-left: 15px" :span="16">
-					<ws-button type="primary" v-hasPermission="`report.saleOutReport.view`" @click="adopt()">备注
+					<ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.view`" @click="adopt()">备注
 					</ws-button>
-					<ws-button type="primary" v-hasPermission="`report.saleOutReport.view`" @click="depositbutton()">定金
+					<ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.view`" @click="depositbutton()">定金
 					</ws-button>
-					<ws-button type="primary" v-hasPermission="`report.saleOutReport.payment`" @click="handlecollect()">收款
+					<ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.payment`" @click="handlecollect()">收款
 					</ws-button>
 				</el-col>
 				<el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="8">
@@ -606,16 +606,17 @@
 							this.uncollectedAmount += response.records[i].amountNotReceivable
 							this.outboundVolume += response.records[i].settlementWeight
 							// this.addressUrlArray1.push(response.records[i].collectionScreenshot.split('$'))
-							num = response.records[i].collectionScreenshot.split('$')
-							for (let j = 0; j < num.length; j++) {
-								if (num[j] != '') {
-									if (this.addressUrlArray1.indexOf(num[j]) == -1) {
-										this.addressUrlArray1.push(num[j])
-									}
+							if(response.records[i].collectionScreenshot!=null){
+							    num = response.records[i].collectionScreenshot.split('$')
+								for (let j = 0; j < num.length; j++) {
+									if (num[j] != '') {
+										if (this.addressUrlArray1.indexOf(num[j]) == -1) {
+											this.addressUrlArray1.push(num[j])
+										}
 
+									}
 								}
 							}
-
 						}
 						this.deptBudgetTotal = response.total
 						this.saleList = response

+ 2 - 30
src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -132,14 +132,7 @@
         ></el-table-column>
         <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
-            <el-popover
-              placement="left"
-              :width="285"
-              trigger="click"
-              visible-arrow="false"
-              @show="history(scope.row)"
-            >
-              <template>
+             <template>
                 <span slot="reference">
                   <span
                     v-if="scope.row.taskStatus == '待审核'"
@@ -156,27 +149,6 @@
                   {{ scope.row.taskStatus }}
                 </span>
               </template>
-              <div>
-                <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-                <div v-for="(item, index) in historyList" class="flex">
-                  <div class="vertical-text vertical-text-left">
-                    {{ item.updateDate }}
-                  </div>
-                  <div>
-                    <div class="vertical-circle"></div>
-                    <div
-                      v-if="index != historyList.length - 1"
-                      class="vertical-line"
-                    ></div>
-                  </div>
-                  <div class="vertical-text">
-                    {{ item.operateUser }}
-                    <br />
-                    {{ item.dealMsg }}
-                  </div>
-                </div>
-              </div>
-            </el-popover>
             <img
               v-if="scope.row.taskStatus == '执行中'"
               width="17"
@@ -410,7 +382,7 @@ export default {
         },
       })
     },
-    audit(item) {debugger
+    audit(item) {
       this.$router.push({
         path: 'tranManagementWarehouseInOuttaskaudit',
         query: {

+ 3 - 0
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1618,6 +1618,9 @@ export default {
           return
         }
       }
+      // this.dataList.goodsNameKey =
+      // this.dataList.positionId = 
+      // this.dataList.baseId = 
       this.dataList.inOutFlag = 1
       this.dataList1.inOutFlag = 2
       if (this.dataList.taskTypeKey == 1) {

+ 269 - 284
src/views/tranManagement/tranManagementFireFeedback.vue

@@ -6,88 +6,70 @@
         <h2 class="bg-left title">火运装车反馈</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="revert()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
+          <img
             width="6"
             height="10"
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+            alt
+          />返回
+        </el-button>
       </el-col>
     </el-row>
-    <ws-form
-      class="position"
-      ref="deptBudgetList"
-      :rules="rules"
-      :model="deptBudgetList"
-    >
+    <ws-form class="position" ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
       <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
-        <ws-form-item label="任务编号" span="1" prop="processNo">
-          {{ deptBudgetList.processNo }}
-        </ws-form-item>
+        <ws-form-item label="任务编号" span="1" prop="processNo">{{ deptBudgetList.processNo }}</ws-form-item>
         <!--货名-->
-        <ws-form-item label="货名" span="1" prop="goodsName">
-          {{ deptBudgetList.goodsName }}
-        </ws-form-item>
+        <ws-form-item label="货名" span="1" prop="goodsName">{{ deptBudgetList.goodsName }}</ws-form-item>
         <!--重量(吨)-->
-        <ws-form-item label="重量(吨)" span="1" prop="weight">
-          {{ deptBudgetList.weight }}
-        </ws-form-item>
+        <ws-form-item label="重量(吨)" span="1" prop="weight">{{ deptBudgetList.weight }}</ws-form-item>
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
           {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
           }}{{ deptBudgetList.sendArea }}
         </ws-form-item>
         <!--发货人-->
-        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
-          {{ deptBudgetList.sender }}
-        </ws-form-item>
+        <ws-form-item
+          label="发货人"
+          span="1"
+          prop="sender"
+          class="readonly"
+        >{{ deptBudgetList.sender }}</ws-form-item>
         <!--发货人电话-->
         <ws-form-item
           label="发货人电话"
           span="1"
           prop="senderPhone"
           class="readonly"
-        >
-          {{ deptBudgetList.senderPhone }}
-        </ws-form-item>
+        >{{ deptBudgetList.senderPhone }}</ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
           }}{{ deptBudgetList.receiveArea }}
         </ws-form-item>
         <!--收货人-->
-        <ws-form-item label="收货人" span="1" prop="receiver">
-          {{ deptBudgetList.receiver }}
-        </ws-form-item>
+        <ws-form-item label="收货人" span="1" prop="receiver">{{ deptBudgetList.receiver }}</ws-form-item>
         <!--收货人电话-->
-        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-          {{ deptBudgetList.receiverPhone }}
-        </ws-form-item>
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">{{ deptBudgetList.receiverPhone }}</ws-form-item>
         <!--发货日期-->
-        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
-          {{ deptBudgetList.deliveryDateStart }}
-        </ws-form-item>
+        <ws-form-item
+          label="发货日期"
+          span="1"
+          prop="deliveryDateStart"
+        >{{ deptBudgetList.deliveryDateStart }}</ws-form-item>
         <!--最晚到货日期-->
-        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-          {{ deptBudgetList.deliveryDateEnd }}
-        </ws-form-item>
+        <ws-form-item
+          label="最晚到货日期"
+          span="1"
+          prop="deliveryDateEnd"
+        >{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
-        </ws-form-item>
+        <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
         <!-- 运输方式 -->
-        <ws-form-item label="运输方式" span="1" prop="tranType">
-          {{ deptBudgetList.tranType }}
-        </ws-form-item>
+        <ws-form-item label="运输方式" span="1" prop="tranType">{{ deptBudgetList.tranType }}</ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车次</div>
       <div class="lianluoyuan">
@@ -123,14 +105,16 @@
       <div class="small-title" style="font-size: 16px">装车详情</div>
       <!-- 导入 -->
       <div style="font-size: 16px; width: 100%;  text-align: right">
-        <el-upload style="margin-left: 8px;"
+        <el-upload
+          style="margin-left: 8px;"
           class="upload-demo inline-block margin-right-10"
-          action=""
+          action
           :on-change="handleChange"
           :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-          :auto-upload="false">
-          <el-button  type="primary">导入</el-button>
+          :auto-upload="false"
+        >
+          <el-button type="primary">导入</el-button>
         </el-upload>
       </div>
       <div class="liaison">
@@ -178,32 +162,31 @@
                   "
                   class="avatar-uploader"
                   accept=".jpg, .jpeg, .png, .gif"
-                  ><img
+                >
+                  <img
                     width="18"
                     height="20"
                     style="vertical-align: text-top; position: relative"
                     src="../../../public/img/fujian.png"
-                    alt=""
+                    alt
                   />
                 </el-upload>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg != null
+                    deptBudgetList.tranCarInfoList.length>0 && deptBudgetList.tranCarInfoList[0].loadPoundImg
                   "
-                  >1</span
-                >
+                >1</span>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                     deptBudgetList.tranCarInfoList.length>0 && !deptBudgetList.tranCarInfoList[0].loadPoundImg
                   "
-                  >未上传</span
-                >
+                >未上传</span>
               </template>
             </ws-form-item>
             <!--装车日期-->
             <el-form-item label="装车日期:" span="1" prop="loadingDate">
               <ws-date-picker
-                 v-if="item.status == '已装车' || item.status == '已送达'"
+                v-if="item.status == '已装车' || item.status == '已送达'"
                 :disabled="readonly"
                 v-model="item.loadingDate"
                 type="date"
@@ -222,11 +205,7 @@
             </el-form-item>
 
             <!-- 提交 -->
-            <span
-              class="servicein"
-              v-show="item.status == '已装车' || item.status == '已送达'"
-              >已装车</span
-            >
+            <span class="servicein" v-show="item.status == '已装车' || item.status == '已送达'">已装车</span>
             <span
               style="text-align: right; padding: 10px"
               class="center"
@@ -242,8 +221,7 @@
                   type="primary"
                   size="small"
                   @click="submit(deptBudgetList)"
-                  >提交</el-button
-                >
+                >提交</el-button>
               </div>
             </span>
             <!-- <div
@@ -261,7 +239,7 @@
               class="signStatus1"
             >
               {{ item.signStatus }}
-            </div> -->
+            </div>-->
             <span
               v-show="item.temporaryDriverFlag != 0"
               width="22"
@@ -269,36 +247,29 @@
               class="del"
               @click="del(index)"
               src="../../../public/img/del.png"
-              alt=""
-              >×</span
-            >
+              alt
+            >×</span>
           </ws-info-table>
         </div>
       </div>
       <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨):{{ total }}/{{ deptBudgetList.weight }}
-         <!--阶段状态-->
-         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
-          未完货
-        </span>
-        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+        <!--阶段状态-->
+        <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">未完货</span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">
+          {{
           deptBudgetList.feedbackStatus
-        }}</span>
+          }}
+        </span>
       </div>
       <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img width="22" height="22" src="../../../public/img/add.png" alt="" />
         <div class="spans">添加临时用车</div></el-button
-      > -->
+      >-->
     </ws-form>
     <!-- 完货 -->
     <div style="text-align: right; padding: 10px" class="wanhuo">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="finished(deptBudgetList)"
-        >完货</el-button
-      >
+      <el-button class="bg-bottom" type="primary" size="small" @click="finished(deptBudgetList)">完货</el-button>
     </div>
   </div>
 </template>
@@ -311,7 +282,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    mapDrag,
+    mapDrag
   },
   watch: {
     vesselId(val) {
@@ -319,12 +290,12 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
       deptBudgetList: {
-        totalStorage: 0,
+        totalStorage: 0
       },
       options_: regionData,
       heightData: '600px',
@@ -345,15 +316,15 @@ export default {
           {
             required: true,
             message: '请输入仓库名称',
-            trigger: 'blur',
+            trigger: 'blur'
           },
           {
             min: 2,
             max: 20,
             message: '仓库名长度不符合要求,请输入2-20字符之内',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       tranType: 2,
       size: 10,
@@ -368,25 +339,25 @@ export default {
           compName: '',
           bankDeposit: '',
           addressUrlArray: [],
-          bankCard: '',
-        },
+          bankCard: ''
+        }
       ],
       freightspace: [
         {
           boxNo: '',
           loadNetWeight: '',
           loadPoundImg: '',
-          loadingDate: '',
-        },
+          loadingDate: ''
+        }
         // {loadPoundImg:{}},
       ],
       name: '',
       staffList: [],
       options: [],
       carModel: [],
-      fileTemp:{},
+      fileTemp: {},
       tranCarInfoList: {
-        loadPoundImg: '',
+        loadPoundImg: ''
       },
       //  tranCarList: {
       //   driver: '',
@@ -398,7 +369,7 @@ export default {
       //上传
       accessoryTFs: false,
       fileList: [],
-      appendixIdsAdd: '',
+      appendixIdsAdd: ''
     }
   },
   activated() {
@@ -406,15 +377,14 @@ export default {
     this.getList()
   },
   computed: {
-    
-    totalStorage: function () {
+    totalStorage: function() {
       var maxStorage = 0
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
       return maxStorage
     },
-    total: function () {
+    total: function() {
       if (this.deptBudgetList.tranCarInfoList != null) {
         var maxStorage = 0
         for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
@@ -426,95 +396,97 @@ export default {
       } else {
         return 0
       }
-    },
+    }
   },
   methods: {
     handleChange(file, fileList) {
-            this.fileTemp = file.raw
-                let fileName = file.raw.name
-                let fileType = fileName.substring(fileName.lastIndexOf('.') + 1);
-                // 判断上传文件格式
-                if (this.fileTemp) {
-                    if ((fileType == 'xlsx') || (fileType == 'xls')) {
-                        this.importf(this.fileTemp)
-                    } else {
-                        this.$message({
-                            type: 'warning',
-                            message: '附件格式错误,请删除后重新上传!'
-                        })
-                    }
-                } else {
-                    this.$message({
-                        type: 'warning',
-                        message: '请上传附件!'
-                    })
-                }
-
+      this.fileTemp = file.raw
+      let fileName = file.raw.name
+      let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+      // 判断上传文件格式
+      if (this.fileTemp) {
+        if (fileType == 'xlsx' || fileType == 'xls') {
+          this.importf(this.fileTemp)
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '附件格式错误,请删除后重新上传!'
+          })
+        }
+      } else {
+        this.$message({
+          type: 'warning',
+          message: '请上传附件!'
+        })
+      }
     },
- importf(obj) {
-                this.dialogVisible = true;
-                let _this = this;
-                let inputDOM = this.$refs.inputer;   // 通过DOM取文件数据
-                this.file = event.currentTarget.files[0];
-                var rABS = false; //是否将文件读取为二进制字符串
-                var f = this.file;
-                var reader = new FileReader();
-                //if (!FileReader.prototype.readAsBinaryString) {
-                FileReader.prototype.readAsBinaryString = function (f) {
-                    var binary = "";
-                    var rABS = false; //是否将文件读取为二进制字符串
-                    var pt = this;
-                    var wb; //读取完成的数据
-                    var outdata;
-                    var reader = new FileReader();
-                    reader.onload = function (e) {
-                        var bytes = new Uint8Array(reader.result);
-                        var length = bytes.byteLength;
-                        for (var i = 0; i < length; i++) {
-                            binary += String.fromCharCode(bytes[i]);
-                        }
-                        var XLSX = require('xlsx');
-                        if (rABS) {
-                            wb = XLSX.read(btoa(fixdata(binary)), { //手动转化
-                                type: 'base64'
-                            });
-                        } else {
-                            wb = XLSX.read(binary, {
-                                type: 'binary'
-                            });
-                        }
-                        // outdata就是你想要的东西 excel导入的数据
-                        outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
-                        // excel 数据再处理
-                        let arr = []
-                        outdata.map(v => {
-                            // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
-                            let jsonString = JSON.stringify(v).replace(/\//g, '').replace(/\s/ig,'');
-                            console.log(jsonString);
-                            v = JSON.parse(jsonString);
-                            let obj = {}
-                            //xxx代表列名
-                            obj.boxNo = v.车厢号
-                            obj.loadNetWeight = v.装车净重
-                            obj.loadingDate = toString(v.装车日期)
-                            obj.status= v.状态
-                            obj.unloadPoundImg = v.磅单
-                            console.log(obj)
-                            _this.freightspace.push(obj)
-                        })
-                        // _this.freightspace.concat(arr)
-                        console.log(arr,_this.freightspace)
-                    }
-                    reader.readAsArrayBuffer(f);
-                }
-                if (rABS) {
-                    reader.readAsArrayBuffer(f);
-                } else {
-                    reader.readAsBinaryString(f);
-                }
-                console.log(reader)
-            },
-    marker: function (item) {
+    importf(obj) {
+      this.dialogVisible = true
+      let _this = this
+      let inputDOM = this.$refs.inputer // 通过DOM取文件数据
+      this.file = event.currentTarget.files[0]
+      var rABS = false //是否将文件读取为二进制字符串
+      var f = this.file
+      var reader = new FileReader()
+      //if (!FileReader.prototype.readAsBinaryString) {
+      FileReader.prototype.readAsBinaryString = function(f) {
+        var binary = ''
+        var rABS = false //是否将文件读取为二进制字符串
+        var pt = this
+        var wb //读取完成的数据
+        var outdata
+        var reader = new FileReader()
+        reader.onload = function(e) {
+          var bytes = new Uint8Array(reader.result)
+          var length = bytes.byteLength
+          for (var i = 0; i < length; i++) {
+            binary += String.fromCharCode(bytes[i])
+          }
+          var XLSX = require('xlsx')
+          if (rABS) {
+            wb = XLSX.read(btoa(fixdata(binary)), {
+              //手动转化
+              type: 'base64'
+            })
+          } else {
+            wb = XLSX.read(binary, {
+              type: 'binary'
+            })
+          }
+          // outdata就是你想要的东西 excel导入的数据
+          outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
+          // excel 数据再处理
+          let arr = []
+          outdata.map(v => {
+            // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+            let jsonString = JSON.stringify(v)
+              .replace(/\//g, '')
+              .replace(/\s/gi, '')
+            console.log(jsonString)
+            v = JSON.parse(jsonString)
+            let obj = {}
+            //xxx代表列名
+            obj.boxNo = v.车厢号
+            obj.loadNetWeight = v.装车净重
+            obj.loadingDate = toString(v.装车日期)
+            obj.status = v.状态
+            obj.unloadPoundImg = v.磅单
+            console.log(obj)
+            _this.freightspace.push(obj)
+          })
+          // _this.freightspace.concat(arr)
+          console.log(arr, _this.freightspace)
+        }
+        reader.readAsArrayBuffer(f)
+      }
+      if (rABS) {
+        reader.readAsArrayBuffer(f)
+      } else {
+        reader.readAsBinaryString(f)
+      }
+      console.log(reader)
+    },
+    marker: function(item) {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
     },
@@ -527,7 +499,7 @@ export default {
         driver: '',
         driverPhone: '',
         carNo: '',
-        loadNetWeight: '',
+        loadNetWeight: ''
       })
     },
     del(index) {
@@ -543,22 +515,22 @@ export default {
       this.$confirm(`完货操作后,装车信息不可修改,是否确定完货?`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.deptBudgetList.validate(valid => {
             if (valid) {
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
               state(tranProcessInfo)
                 .toPromise()
-                .then((response) => {
+                .then(response => {
                   this.$message.success('完货成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
                   this.$router.push({
-                    path: 'tranManagementTransporHairRespond',
+                    path: 'tranManagementTransporHairRespond'
                   })
                 })
             } else {
@@ -570,121 +542,134 @@ export default {
           return false
         })
     },
-    submit() {
-      debugger
-      for (var i = 0; i < this.freightspace.length; i++) {
-        if (this.freightspace[i].temporaryDriverFlag != 0) {
-          if (!this.freightspace[i].driver) {
-            this.$message({
-              message: '司机姓名不能为空!',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.freightspace[i].driverPhone) {
-            this.$message({
-              message: '司机电话不能为空!',
-              type: 'warning',
-            })
-            return
+    validateFunc() {
+      this.$refs.deptBudgetList.validate(valid => {
+        if (valid) {
+          // this.deptBudgetList.totalStorage = this.totalStorage
+          this.tranCarInfoList = this.freightspace
+          this.tranCarInfoList.driver = this.deptBudgetList.driver
+          this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+          this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
+          this.tranCarInfoList.carNo = this.deptBudgetList.carNo
+          this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
+          this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
+          this.tranCarInfoList.tranType = this.tranType
+          this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
+          // this.tranCarInfoList.boxNo = this.arr.toString()
+          for (var i = 0; i < this.tranCarInfoList.length; i++) {
+            this.tranCarInfoList[i].id = this.freightspace[i].id
+            if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
+              this.tranCarInfoList[i].temporaryDriverFlag = 1
+              this.tranCarInfoList[i].tranType = this.tranType
+            }
           }
-          if (!this.freightspace[i].carNo) {
-            this.$message({
-              message: '车牌号不能为空!',
-              type: 'warning',
+          var tranProcessInfo = {}
+          tranProcessInfo.id = this.deptBudgetList.id
+          tranProcessInfo.infoId = this.deptBudgetList.infoId
+          tranProcessInfo.processNo = this.deptBudgetList.processNo
+          tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
+          tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+          // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
+          feedback(tranProcessInfo)
+            .toPromise()
+            .then(response => {
+              this.$message.success('提交成功')
+              this.deptBudgetList = {}
+              this.freightspace = {}
+              this.selectedOptions = ''
+              this.$router.push({
+                path: 'tranManagementTransporHairRespond'
+              })
             })
-            return
-          }
-          debugger
+        } else {
+          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
+    submit() {
+      for (var i = 0; i < this.freightspace.length; i++) {
+          // if (!this.freightspace[i].driver) {
+          //   this.$message({
+          //     message: '司机姓名不能为空!',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
+          // if (!this.freightspace[i].driverPhone) {
+          //   this.$message({
+          //     message: '司机电话不能为空!',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
+          // if (!this.freightspace[i].carNo) {
+          //   this.$message({
+          //     message: '车牌号不能为空!',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.freightspace[i].loadNetWeight) {
             this.$message({
               message: '装车净重不能为空!',
-              type: 'warning',
+              type: 'warning'
             })
             return
           }
-            if (this.freightspace[i].loadNetWeight < 0 || this.freightspace[i].loadNetWeight > 10000) {
+          if (
+            this.freightspace[i].loadNetWeight < 0 ||
+            this.freightspace[i].loadNetWeight > 10000
+          ) {
             this.$message({
               message: '装车净重输入错误!',
-              type: 'warning',
+              type: 'warning'
             })
             return
           }
-           if (!this.freightspace[i].loadingDate) {
+          if (!this.freightspace[i].loadingDate) {
             this.$message({
               message: '装车日期不能为空!',
-              type: 'warning',
+              type: 'warning'
             })
             return
           }
-        }
+        
+      }
+      if (sessionStorage.getItem('sh-msg')) {
+        this.validateFunc()
+      } else {
+        this.$alert(
+          '<div><strong>提交成功后提醒司机及时签订运输合同,确定提交装车信息?</strong><div style="display:flex;align-items: center;"><input id="noMsg" type="checkbox" onclick="window.noMessege(1)"><span style="margin-left:10px">不在提示</span><div></div>',
+          '',
+          {
+            dangerouslyUseHTMLString: true,
+            distinguishCancelAndClose: true,
+            showCancelButton: true,
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }
+        )
+          .then(() => {
+            this.validateFunc()
+          })
+          .catch(() => {
+            return false
+          })
       }
-      // this.$confirm(`提交成功后提醒司机及时签订运输合同,确定提交装车信息?`, {
-      //   confirmButtonText: '确定',
-      //   cancelButtonText: '取消',
-      //   type: 'warning',
-      // })
-      //   .then(() => {
-      //     this.$refs.deptBudgetList.validate((valid) => {
-      //       if (valid) {
-      //         // this.deptBudgetList.totalStorage = this.totalStorage
-      //         this.tranCarInfoList = this.freightspace
-      //         this.tranCarInfoList.driver = this.deptBudgetList.driver
-      //         this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-      //         this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
-      //         this.tranCarInfoList.carNo = this.deptBudgetList.carNo
-      //         this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
-      //         this.tranCarInfoList.loadNetWeight =
-      //           this.deptBudgetList.loadNetWeight
-      //         this.tranCarInfoList.tranType = this.tranType
-      //         this.tranCarInfoList.loadPoundImg =
-      //           this.deptBudgetList.loadPoundImg
-      //         // this.tranCarInfoList.boxNo = this.arr.toString()
-      //         for (var i = 0; i < this.tranCarInfoList.length; i++) {
-      //           this.tranCarInfoList[i].id = this.freightspace[i].id
-      //           if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
-      //             this.tranCarInfoList[i].temporaryDriverFlag = 1
-      //             this.tranCarInfoList[i].tranType = this.tranType
-      //           }
-      //         }
-      //         var tranProcessInfo = {}
-      //         tranProcessInfo.id = this.deptBudgetList.id
-      //         tranProcessInfo.infoId = this.deptBudgetList.infoId
-      //         tranProcessInfo.processNo = this.deptBudgetList.processNo
-      //         tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
-      //         tranProcessInfo.tranCarInfoList = this.tranCarInfoList
-      //         // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
-      //         feedback(tranProcessInfo)
-      //           .toPromise()
-      //           .then((response) => {
-      //             this.$message.success('提交成功')
-      //             this.deptBudgetList = {}
-      //             this.freightspace = {}
-      //             this.selectedOptions = ''
-      //             this.$router.push({
-      //               path: 'tranManagementTransporHairRespond',
-      //             })
-      //           })
-      //       } else {
-      //         // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-      //         return false
-      //       }
-      //     })
-      //   })
-      //   .catch(() => {
-      //     return false
-      //   })
     },
     getList() {
       seeCat({ id: this.deptBudgetList.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.deptBudgetList = response
           //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          if(response.tranCarInfoList[0].driver){
+            this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          }
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart) 
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart)
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.carModel = response.tranCarInfoList[0].carModel
@@ -698,8 +683,8 @@ export default {
     },
     uploadSuccessHandle1(e, index) {
       this.freightspace[index].loadPoundImg = e.url
-    },
-  },
+    }
+  }
 }
 </script>
 
@@ -1157,7 +1142,7 @@ export default {
   margin-top: 11px;
   margin-left: 53px;
 }
-/deep/.el-input--suffix .el-input__inner{
+/deep/.el-input--suffix .el-input__inner {
   padding-right: 0px !important;
 }
 //送达/未送达

+ 296 - 318
src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -6,99 +6,77 @@
         <h2 class="bg-left title">船运装船反馈</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="returnsales()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+          <img
             width="6"
             height="10"
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+            alt
+          />返回
+        </el-button>
       </el-col>
     </el-row>
-    <ws-form
-      class="position"
-      ref="deptBudgetList"
-      :rules="rules"
-      :model="deptBudgetList"
-    >
+    <ws-form class="position" ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
       <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
-        <ws-form-item label="任务编号" span="1" prop="processNo">
-          {{ deptBudgetList.processNo }}
-        </ws-form-item>
+        <ws-form-item label="任务编号" span="1" prop="processNo">{{ deptBudgetList.processNo }}</ws-form-item>
         <!--货名-->
-        <ws-form-item label="货名" span="1" prop="goodsName">
-          {{ deptBudgetList.goodsName }}
-        </ws-form-item>
+        <ws-form-item label="货名" span="1" prop="goodsName">{{ deptBudgetList.goodsName }}</ws-form-item>
         <!--重量(吨)-->
-        <ws-form-item label="重量(吨)" span="1" prop="weight">
-          {{ deptBudgetList.weight }}
-        </ws-form-item>
+        <ws-form-item label="重量(吨)" span="1" prop="weight">{{ deptBudgetList.weight }}</ws-form-item>
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
           {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
           }}{{ deptBudgetList.sendArea }}
         </ws-form-item>
         <!--发货人-->
-        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
-          {{ deptBudgetList.sender }}
-        </ws-form-item>
+        <ws-form-item
+          label="发货人"
+          span="1"
+          prop="sender"
+          class="readonly"
+        >{{ deptBudgetList.sender }}</ws-form-item>
         <!--发货人电话-->
         <ws-form-item
           label="发货人电话"
           span="1"
           prop="senderPhone"
           class="readonly"
-        >
-          {{ deptBudgetList.senderPhone }}
-        </ws-form-item>
+        >{{ deptBudgetList.senderPhone }}</ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
           }}{{ deptBudgetList.receiveArea }}
         </ws-form-item>
         <!--收货人-->
-        <ws-form-item label="收货人" span="1" prop="receiver">
-          {{ deptBudgetList.receiver }}
-        </ws-form-item>
+        <ws-form-item label="收货人" span="1" prop="receiver">{{ deptBudgetList.receiver }}</ws-form-item>
         <!--收货人电话-->
-        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-          {{ deptBudgetList.receiverPhone }}
-        </ws-form-item>
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">{{ deptBudgetList.receiverPhone }}</ws-form-item>
         <!--发货日期-->
-        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
-          {{ deptBudgetList.deliveryDateStart }}
-        </ws-form-item>
+        <ws-form-item
+          label="发货日期"
+          span="1"
+          prop="deliveryDateStart"
+        >{{ deptBudgetList.deliveryDateStart }}</ws-form-item>
         <!--最晚到货日期-->
-        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-          {{ deptBudgetList.deliveryDateEnd }}
-        </ws-form-item>
+        <ws-form-item
+          label="最晚到货日期"
+          span="1"
+          prop="deliveryDateEnd"
+        >{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
-        </ws-form-item>
+        <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
         <!-- 运输方式 -->
-        <ws-form-item label="运输方式" span="1" prop="tranType">
-          {{ deptBudgetList.tranType }}
-        </ws-form-item>
+        <ws-form-item label="运输方式" span="1" prop="tranType">{{ deptBudgetList.tranType }}</ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及航次</div>
       <ws-info-table>
         <!-- 姓名 -->
-        <ws-form-item label="姓名" span="1" prop="driver">
-          {{ deptBudgetList.driver }}
-        </ws-form-item>
+        <ws-form-item label="姓名" span="1" prop="driver">{{ deptBudgetList.driver }}</ws-form-item>
         <!-- 电话 -->
-        <ws-form-item label="电话" span="1" prop="driverPhone">
-          {{ deptBudgetList.driverPhone }}
-        </ws-form-item>
+        <ws-form-item label="电话" span="1" prop="driverPhone">{{ deptBudgetList.driverPhone }}</ws-form-item>
         <!--发船日期-->
         <ws-form-item label="发船日期" span="1" prop="sendDateStart">
           <ws-date-picker
@@ -109,44 +87,38 @@
           />
         </ws-form-item>
         <!-- 预计到港日期 -->
-        <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd">
-          {{ deptBudgetList.receiveDateEnd }}
-        </ws-form-item>
+        <ws-form-item
+          label="预计到港日期"
+          span="1"
+          prop="receiveDateEnd"
+        >{{ deptBudgetList.receiveDateEnd }}</ws-form-item>
         <!-- 船名 -->
-        <ws-form-item label="船名" span="1" prop="shipName">
-          {{ deptBudgetList.shipName }}
-        </ws-form-item>
+        <ws-form-item label="船名" span="1" prop="shipName">{{ deptBudgetList.shipName }}</ws-form-item>
         <!-- 航次 -->
-        <ws-form-item label="航次" span="1" prop="shipNo">
-          {{ deptBudgetList.shipNo }}
-        </ws-form-item>
+        <ws-form-item label="航次" span="1" prop="shipNo">{{ deptBudgetList.shipNo }}</ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="shipType">
-          {{ deptBudgetList.shipType }}
-        </ws-form-item>
+        <ws-form-item label="类型" span="1" prop="shipType">{{ deptBudgetList.shipType }}</ws-form-item>
         <!-- 数量 -->
         <ws-form-item
           label="数量"
           span="1"
           prop="boxNumber"
           v-if="deptBudgetList.shipType == '集装箱'"
-        >
-          {{ deptBudgetList.boxNumber }}
-        </ws-form-item>
+        >{{ deptBudgetList.boxNumber }}</ws-form-item>
       </ws-info-table>
-      <div class="small-title" style="font-size: 16px; width: 50%; float: left">
-        装船详情
-      </div>
+      <div class="small-title" style="font-size: 16px; width: 50%; float: left">装船详情</div>
       <!-- 导入 -->
       <div style="font-size: 16px; width: 50%; float: left; text-align: right">
-        <el-upload style="margin-left: 8px;"
+        <el-upload
+          style="margin-left: 8px;"
           class="upload-demo inline-block margin-right-10"
-          action=""
+          action
           :on-change="handleChange"
           :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-          :auto-upload="false">
-          <el-button  type="primary">导入</el-button>
+          :auto-upload="false"
+        >
+          <el-button type="primary">导入</el-button>
         </el-upload>
       </div>
       <div class="liaison">
@@ -159,81 +131,57 @@
           <ws-info-table>
             <div class="catNos" v-if="item.shipType == '集装箱'">
               集装箱-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装车'">
-                  未装船
-                </span>
-                <span class="service" v-show="item.status == '已装车'">
-                   已装船
-                </span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{                 
-                  item.status               
-                }}</span>
+              <span class="noservice" v-show="item.status == '未装车'">未装船</span>
+              <span class="service" v-show="item.status == '已装车'">已装船</span>
+              <span class="serviced" v-show="item.status == '已送达'">
+                {{
+                item.status
+                }}
+              </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
               仓位号-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装车'">
-                  未装船
-                </span>
-                <span class="service" v-show="item.status == '已装车'">
-                   已装船
-                </span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{                 
-                  item.status               
-                }}</span>
+              <span class="noservice" v-show="item.status == '未装车'">未装船</span>
+              <span class="service" v-show="item.status == '已装车'">已装船</span>
+              <span class="serviced" v-show="item.status == '已送达'">
+                {{
+                item.status
+                }}
+              </span>
             </div>
             <!--箱号-->
-            <el-form-item
-              label="箱号"
-              prop="caseNo"
-              v-if="item.shipType == '集装箱'"
-            >
+            <el-form-item label="箱号" prop="caseNo" v-if="item.shipType == '集装箱'">
               <el-input
                 v-if="item.status == '已装车' || item.status == '已送达'"
                 :disabled="readonly"
                 v-model="item.caseNo"
                 placeholder="请输入箱号"
               ></el-input>
-              <el-input
-                v-else
-                v-model="item.caseNo"
-                placeholder="请输入箱号"
-              ></el-input>
+              <el-input v-else v-model="item.caseNo" placeholder="请输入箱号"></el-input>
             </el-form-item>
             <!--封号-->
-            <el-form-item
-              label="封号"
-              prop="titleNo"
-              v-if="item.shipType == '集装箱'"
-            >
+            <el-form-item label="封号" prop="titleNo" v-if="item.shipType == '集装箱'">
               <el-input
                 v-if="item.status == '已装车' || item.status == '已送达'"
                 :disabled="readonly"
                 v-model="item.titleNo"
                 placeholder="请输入封号"
               ></el-input>
-              <el-input
-                v-else
-                v-model="item.titleNo"
-                placeholder="请输入封号"
-              ></el-input>
+              <el-input v-else v-model="item.titleNo" placeholder="请输入封号"></el-input>
             </el-form-item>
             <!-- 仓位号 -->
             <ws-form-item
               span="1"
               prop="binNumber"
               v-if="item.shipType == '散船'"
-            >
-              {{ item.binNumber }}
-            </ws-form-item>
+            >{{ item.binNumber }}</ws-form-item>
             <!-- 计划重量 -->
             <ws-form-item
               label="计划重量(吨)"
               span="1"
               prop="positionWeight"
               v-if="item.shipType == '散船'"
-            >
-              {{ item.positionWeight }}
-            </ws-form-item>
+            >{{ item.positionWeight }}</ws-form-item>
             <!--装船净重-->
             <ws-form-item label="装船净重:" span="1" prop="loadNetWeight">
               <ws-input
@@ -253,12 +201,7 @@
               />
             </ws-form-item>
             <!--装船日期-->
-            <el-form-item
-              label="装船日期:"
-              span="1"
-              prop="loadingDate"
-              label-width="100px"
-            >
+            <el-form-item label="装船日期:" span="1" prop="loadingDate" label-width="100px">
               <ws-date-picker
                 v-if="item.status == '已装车' || item.status == '已送达'"
                 :disabled="readonly"
@@ -284,80 +227,81 @@
                 type="primary"
                 size="small"
                 @click="submit(deptBudgetList)"
-                >提交</el-button
-              >
+              >提交</el-button>
             </div>
-            <div v-show=" item.signStatus == '未签合同'" class="signStatus">
-                  {{ item.signStatus }}
-                </div>
-                <div v-show=" item.signStatus == '已签合同'" class="signStatus1">
-                  {{ item.signStatus }}
-                </div>
+            <div v-show=" item.signStatus == '未签合同'" class="signStatus">{{ item.signStatus }}</div>
+            <div v-show=" item.signStatus == '已签合同'" class="signStatus1">{{ item.signStatus }}</div>
           </ws-info-table>
         </div>
       </div>
-      <div style="text-align: right; color: #8890b1; font-size: 16px">
-        合计(吨):{{ total }}/{{ deptBudgetList.weight }}
-        <!--阶段状态-->
-        <span
-          class="noservice"
-          v-show="deptBudgetList.feedbackStatus == '执行中'"
-        >
-          未完货
-        </span>
-        <span
-          class="service"
-          v-show="deptBudgetList.feedbackStatus == '已完货'"
-          >{{ deptBudgetList.feedbackStatus }}</span
-        >
+      <div class="yd-bottom">
+        <ws-form-item label="运单:" span="1" prop="loadPoundImg" class="yd-bottom-left">
+          <!-- slot-scope="scope" -->
+          <template>
+            <el-upload
+              action="https://www.zthymaoyi.com/upload/admin"
+              :show-file-list="false"
+              :on-success=" (res) => { uploadSuccessHandle1(res)}"
+              class="avatar-uploader"
+              accept=".jpg, .jpeg, .png, .gif"
+              multiple
+            >
+              <img
+                width="18"
+                height="20"
+                style="vertical-align: text-top; position: relative"
+                src="../../../public/img/fujian.png"
+                alt
+              />
+            </el-upload>
+            <div class="tupian">
+              <span
+                v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImg != null "
+              >{{pictureTotal}}</span>
+              <span
+                v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImg == null "
+              >未上传</span>
+            </div>
+          </template>
+        </ws-form-item>
+
+        <div style="text-align: right; color: #8890b1; font-size: 16px">
+          合计(吨):{{ total }}/{{ deptBudgetList.weight }}
+          <!--阶段状态-->
+          <span class="noservice" v-show="deptBudgetList.feedbackStatus == '执行中'">未完货</span>
+          <span
+            class="service"
+            v-show="deptBudgetList.feedbackStatus == '已完货'"
+          >{{ deptBudgetList.feedbackStatus }}</span>
+        </div>
       </div>
+
       <!--运单-->
       <!-- <div
           style="width: 100%"
           class="flex position"
           v-for="(item, index) in this.freightspace"
           :key="index"
-        > -->
-      <ws-form-item label="运单:" span="1" prop="loadPoundImg">
-        <!-- slot-scope="scope" -->
-        <template>
-          <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
-            :show-file-list="false"
-            :on-success=" (res) => { uploadSuccessHandle1(res)}"
-            class="avatar-uploader"
-            accept=".jpg, .jpeg, .png, .gif"
-            ><img
-              width="18"
-              height="20"
-              style="vertical-align: text-top; position: relative"
-              src="../../../public/img/fujian.png"
-              alt=""
-            />           
-          </el-upload>
-          <div class="tupian">
-          <span v-if="deptBudgetList.tranCarInfoList[0].loadPoundImg != null " >1</span>
-          <span v-if="deptBudgetList.tranCarInfoList[0].loadPoundImg == null ">未上传</span>
-          </div>
-        </template>       
-      </ws-form-item>
+      >-->
+
       <!-- </div> -->
     </ws-form>
     <!-- 完货 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="finished(deptBudgetList)"
-        >完货</el-button
-      >
+      <el-button class="bg-bottom" type="primary" size="small" @click="finished(deptBudgetList)">完货</el-button>
     </div>
   </div>
 </template>
 <script>
-import { regionData} from 'element-china-area-data'
-import { seeCat, packList, feedback, state,importApplFileUrl } from '@/model/transport/index'
+import { regionData } from 'element-china-area-data'
+import Pagination from '@/components/Pagination'
+import {
+  seeCat,
+  packList,
+  feedback,
+  state,
+  importApplFileUrl
+} from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -365,7 +309,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    mapDrag,
+    mapDrag
   },
   watch: {
     vesselId(val) {
@@ -373,16 +317,17 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
+      pictureTotal:0,
       deptBudgetList: {
         totalStorage: 0,
-        sendDateStart:''
+        sendDateStart: ''
       },
       tranCarInfoList: {
-        loadPoundImg: '',
+        loadPoundImg: ''
       },
       options_: regionData,
       heightData: '600px',
@@ -403,21 +348,21 @@ export default {
           {
             required: true,
             message: '请输入仓库名称',
-            trigger: 'blur',
+            trigger: 'blur'
           },
           {
             min: 2,
             max: 20,
             message: '仓库名长度不符合要求,请输入2-20字符之内',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       tranType: 1,
       size: 10,
       value1: '',
       unitList: [],
-      fileTemp:'',
+      fileTemp: '',
       freightspace: [
         {
           caseNo: '',
@@ -425,8 +370,8 @@ export default {
           binNumber: '',
           positionWeight: '',
           loadNetWeight: '',
-          loadingDate: '',
-        },
+          loadingDate: ''
+        }
         // {loadPoundImg:{}},
       ],
       name: '',
@@ -434,7 +379,7 @@ export default {
       options: [],
       carModel: [],
       tranCarInfoList: {
-        loadPoundImg: '',
+        loadPoundImg: ''
       },
       //上传
       accessoryTFs: false,
@@ -447,14 +392,14 @@ export default {
     this.getList()
   },
   computed: {
-    totalStorage: function () {
+    totalStorage: function() {
       var maxStorage = 0
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
       return maxStorage
     },
-    total: function () {
+    total: function() {
       if (this.deptBudgetList.tranCarInfoList != null) {
         var maxStorage = 0
         for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
@@ -466,13 +411,13 @@ export default {
       } else {
         return 0
       }
-    },
+    }
   },
   methods: {
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       if (val) {
-        this.options = this.staffList.filter((item) => {
+        this.options = this.staffList.filter(item => {
           if (
             !!~item.staffName.indexOf(val) ||
             !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
@@ -493,7 +438,7 @@ export default {
         }
       }
     },
-    marker: function (item) {
+    marker: function(item) {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
     },
@@ -528,95 +473,97 @@ export default {
     handleClose() {
       this.accessoryTFs = false
     },
-     handleChange(file, fileList) {
-            this.fileTemp = file.raw
-                let fileName = file.raw.name
-                let fileType = fileName.substring(fileName.lastIndexOf('.') + 1);
-                // 判断上传文件格式
-                if (this.fileTemp) {
-                    if ((fileType == 'xlsx') || (fileType == 'xls')) {
-                        this.importf(this.fileTemp)
-                    } else {
-                        this.$message({
-                            type: 'warning',
-                            message: '附件格式错误,请删除后重新上传!'
-                        })
-                    }
-                } else {
-                    this.$message({
-                        type: 'warning',
-                        message: '请上传附件!'
-                    })
-                }
-
+    handleChange(file, fileList) {
+      this.fileTemp = file.raw
+      let fileName = file.raw.name
+      let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+      // 判断上传文件格式
+      if (this.fileTemp) {
+        if (fileType == 'xlsx' || fileType == 'xls') {
+          this.importf(this.fileTemp)
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '附件格式错误,请删除后重新上传!'
+          })
+        }
+      } else {
+        this.$message({
+          type: 'warning',
+          message: '请上传附件!'
+        })
+      }
+    },
+    importf(obj) {
+      this.dialogVisible = true
+      let _this = this
+      let inputDOM = this.$refs.inputer // 通过DOM取文件数据
+      this.file = event.currentTarget.files[0]
+      var rABS = false //是否将文件读取为二进制字符串
+      var f = this.file
+      var reader = new FileReader()
+      //if (!FileReader.prototype.readAsBinaryString) {
+      FileReader.prototype.readAsBinaryString = function(f) {
+        var binary = ''
+        var rABS = false //是否将文件读取为二进制字符串
+        var pt = this
+        var wb //读取完成的数据
+        var outdata
+        var reader = new FileReader()
+        reader.onload = function(e) {
+          var bytes = new Uint8Array(reader.result)
+          var length = bytes.byteLength
+          for (var i = 0; i < length; i++) {
+            binary += String.fromCharCode(bytes[i])
+          }
+          var XLSX = require('xlsx')
+          if (rABS) {
+            wb = XLSX.read(btoa(fixdata(binary)), {
+              //手动转化
+              type: 'base64'
+            })
+          } else {
+            wb = XLSX.read(binary, {
+              type: 'binary'
+            })
+          }
+          // outdata就是你想要的东西 excel导入的数据
+          outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
+          // excel 数据再处理
+          let arr = []
+          outdata.map(v => {
+            // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+            let jsonString = JSON.stringify(v)
+              .replace(/\//g, '')
+              .replace(/\s/gi, '')
+            console.log(jsonString)
+            v = JSON.parse(jsonString)
+            let obj = {}
+            //xxx代表列名
+            obj.caseNo = v.箱号
+            obj.titleNo = v.封号
+            obj.binNumber = v.仓位号
+            obj.positionWeight = v.散船重量
+            obj.loadNetWeight = v.装船净重
+            obj.loadingDate = toString(v.装船日期)
+            obj.status = v.状态
+            obj.shipType = v.类型
+            console.log(obj)
+            _this.freightspace.push(obj)
+          })
+          // _this.freightspace.concat(arr)
+          console.log(arr, _this.freightspace)
+        }
+        reader.readAsArrayBuffer(f)
+      }
+      if (rABS) {
+        reader.readAsArrayBuffer(f)
+      } else {
+        reader.readAsBinaryString(f)
+      }
+      console.log(reader)
     },
- importf(obj) {
-                this.dialogVisible = true;
-                let _this = this;
-                let inputDOM = this.$refs.inputer;   // 通过DOM取文件数据
-                this.file = event.currentTarget.files[0];
-                var rABS = false; //是否将文件读取为二进制字符串
-                var f = this.file;
-                var reader = new FileReader();
-                //if (!FileReader.prototype.readAsBinaryString) {
-                FileReader.prototype.readAsBinaryString = function (f) {
-                    var binary = "";
-                    var rABS = false; //是否将文件读取为二进制字符串
-                    var pt = this;
-                    var wb; //读取完成的数据
-                    var outdata;
-                    var reader = new FileReader();
-                    reader.onload = function (e) {
-                        var bytes = new Uint8Array(reader.result);
-                        var length = bytes.byteLength;
-                        for (var i = 0; i < length; i++) {
-                            binary += String.fromCharCode(bytes[i]);
-                        }
-                        var XLSX = require('xlsx');
-                        if (rABS) {
-                            wb = XLSX.read(btoa(fixdata(binary)), { //手动转化
-                                type: 'base64'
-                            });
-                        } else {
-                            wb = XLSX.read(binary, {
-                                type: 'binary'
-                            });
-                        }
-                        // outdata就是你想要的东西 excel导入的数据
-                        outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
-                        // excel 数据再处理
-                        let arr = []
-                        outdata.map(v => {
-                            // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
-                            let jsonString = JSON.stringify(v).replace(/\//g, '').replace(/\s/ig,'');
-                            console.log(jsonString);
-                            v = JSON.parse(jsonString);
-                            let obj = {}
-                            //xxx代表列名
-                            obj.caseNo = v.箱号
-                            obj.titleNo= v.封号
-                            obj.binNumber = v.仓位号
-                            obj.positionWeight=v.散船重量
-                            obj.loadNetWeight = v.装船净重
-                            obj.loadingDate = toString(v.装船日期)
-                            obj.status= v.状态
-                            obj.shipType = v.类型
-                            console.log(obj)
-                            _this.freightspace.push(obj)
-                        })
-                        // _this.freightspace.concat(arr)
-                        console.log(arr,_this.freightspace)
-                    }
-                    reader.readAsArrayBuffer(f);
-                }
-                if (rABS) {
-                    reader.readAsArrayBuffer(f);
-                } else {
-                    reader.readAsBinaryString(f);
-                }
-                console.log(reader)
-            },
-    uploadSectionFile (param) {
+    uploadSectionFile(param) {
       var fileName = param.file.name.split('.')
       var fileSuffix = fileName[fileName.length - 1]
       if (
@@ -638,7 +585,6 @@ export default {
       importApplFileUrl(data)
         .toPromise()
         .then(success => {
-        
           console.log(success)
         })
     },
@@ -648,22 +594,22 @@ export default {
       this.$confirm(`完货操作后,装船信息不可修改,是否确定完货?`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.deptBudgetList.validate(valid => {
             if (valid) {
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
               state(tranProcessInfo)
                 .toPromise()
-                .then((response) => {
+                .then(response => {
                   this.$message.success('完货成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
                   this.$router.push({
-                    path: 'tranManagementTransporHairRespond',
+                    path: 'tranManagementTransporHairRespond'
                   })
                 })
             } else {
@@ -749,10 +695,10 @@ export default {
       this.$confirm(`提交成功后装船信息不可修改,是否确定提交?`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.deptBudgetList.validate(valid => {
             if (valid) {
               // this.deptBudgetList.totalStorage = this.totalStorage
               this.tranCarInfoList = this.freightspace
@@ -769,13 +715,13 @@ export default {
               // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
               feedback(tranProcessInfo)
                 .toPromise()
-                .then((response) => {
+                .then(response => {
                   this.$message.success('提交成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
                   this.$router.push({
-                    path: 'tranManagementTransporHairRespond',
+                    path: 'tranManagementTransporHairRespond'
                   })
                 })
             } else {
@@ -794,20 +740,28 @@ export default {
     getList() {
       seeCat({ id: this.deptBudgetList.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.deptBudgetList = response
-          this.deptBudgetList.driver = response.tranCarInfoList[0].driver
-          this.deptBudgetList.driverPhone =
-            response.tranCarInfoList[0].driverPhone
-          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart) 
-          this.deptBudgetList.receiveDateEnd =
-            response.tranCarInfoList[0].receiveDateEnd
-          this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName
-          this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
-          this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
-          this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
-          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          this.freightspace = response.tranCarInfoList
+          if (response.tranCarInfoList.length > 0) {
+            this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+            this.deptBudgetList.driverPhone =
+              response.tranCarInfoList[0].driverPhone
+            this.$set(
+              this.deptBudgetList,
+              'sendDateStart',
+              response.tranCarInfoList[0].sendDateStart
+            )
+            this.deptBudgetList.receiveDateEnd =
+              response.tranCarInfoList[0].receiveDateEnd
+            this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName
+            this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
+            this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
+            this.deptBudgetList.boxNumber =
+              response.tranCarInfoList[0].boxNumber
+            //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+            this.freightspace = response.tranCarInfoList
+          }
+
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
@@ -817,14 +771,14 @@ export default {
       //司机姓名下拉
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.options = response
           this.staffList = response
         }),
         //车型
         packList({ constId: 'TRAN5' })
           .toPromise()
-          .then((response) => {
+          .then(response => {
             this.carModel = response
           })
     },
@@ -869,9 +823,14 @@ export default {
       }
     },
     uploadSuccessHandle1(e) {
-      this.deptBudgetList.tranCarInfoList[0].loadPoundImg = e.url
-    },
-  },
+      this.pictureTotal++;
+      if (this.deptBudgetList.tranCarInfoList[0].loadPoundImg) {
+        this.deptBudgetList.tranCarInfoList[0].loadPoundImg += ',' + e.url
+      } else {
+        this.deptBudgetList.tranCarInfoList[0].loadPoundImg = e.url
+      }
+    }
+  }
 }
 </script>
 
@@ -958,6 +917,7 @@ export default {
   padding: 0 25px;
   border-left: 1px solid transparent;
   background: #fff;
+  display: flex;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 100px;
@@ -1047,7 +1007,7 @@ export default {
 .center1 {
   width: 100px;
   margin: 0 auto;
-  margin-top: -2%
+  margin-top: -2%;
 }
 .el-form-item {
   width: 50%;
@@ -1265,16 +1225,34 @@ export default {
 .noservice {
   background: #c4cada;
   color: #ffffff;
+  padding: 5px 7px;
+  border-radius: 4px;
 }
 .service {
   background: #e5f1f7;
   color: #50cad4;
 }
-.tupian{
-  margin-left: 14%;
-  margin-top: -7%;
+.tupian {
+  // margin-left: 14%;
+  // margin-top: -7%;
 }
-/deep/.el-input--suffix .el-input__inner{
+/deep/.el-input--suffix .el-input__inner {
   padding-right: 0px;
 }
+.liaison {
+  margin-bottom: 20px;
+}
+.yd-bottom {
+  display: flex;
+  justify-content: space-between;
+}
+.yd-bottom-left {
+  display: flex;
+}
+.avatar-uploader {
+  margin-right: 10px;
+}
+/deep/.yd-bottom-left .el-form-item__content {
+  display: flex;
+}
 </style>

+ 709 - 729
src/views/tranManagement/tranManagementShippingFeedbackLook.vue

@@ -6,57 +6,28 @@
         <h2 class="bg-left title">查看船运装船信息</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="returnsales()"
-          ><img
-            width="6"
-            height="10"
-            style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+          <img width="6" height="10" style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png" alt />返回
+        </el-button>
       </el-col>
     </el-row>
-    <ws-form
-      class="position"
-      ref="deptBudgetList"
-      :rules="rules"
-      :model="deptBudgetList"
-    >
+    <ws-form class="position" ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
       <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
-        <ws-form-item label="任务编号" span="1" prop="processNo">
-          {{ deptBudgetList.processNo }}
-        </ws-form-item>
+        <ws-form-item label="任务编号" span="1" prop="processNo">{{ deptBudgetList.processNo }}</ws-form-item>
         <!--货名-->
-        <ws-form-item label="货名" span="1" prop="goodsName">
-          {{ deptBudgetList.goodsName }}
-        </ws-form-item>
+        <ws-form-item label="货名" span="1" prop="goodsName">{{ deptBudgetList.goodsName }}</ws-form-item>
         <!--重量(吨)-->
-        <ws-form-item label="重量(吨)" span="1" prop="weight">
-          {{ deptBudgetList.weight }}
-        </ws-form-item>
+        <ws-form-item label="重量(吨)" span="1" prop="weight">{{ deptBudgetList.weight }}</ws-form-item>
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
-          {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity}}{{ deptBudgetList.sendArea }}
-        </ws-form-item>
+          {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity}}{{ deptBudgetList.sendArea }}</ws-form-item>
         <!--发货人-->
-        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
-          {{ deptBudgetList.sender }}
-        </ws-form-item>
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">{{ deptBudgetList.sender }}</ws-form-item>
         <!--发货人电话-->
-        <ws-form-item
-          label="发货人电话"
-          span="1"
-          prop="senderPhone"
-          class="readonly"
-        >
-          {{ deptBudgetList.senderPhone }}
+        <ws-form-item label="发货人电话" span="1" prop="senderPhone" class="readonly">{{ deptBudgetList.senderPhone }}
         </ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
@@ -64,810 +35,819 @@
           }}{{ deptBudgetList.receiveArea }}
         </ws-form-item>
         <!--收货人-->
-        <ws-form-item label="收货人" span="1" prop="receiver">
-          {{ deptBudgetList.receiver }}
-        </ws-form-item>
+        <ws-form-item label="收货人" span="1" prop="receiver">{{ deptBudgetList.receiver }}</ws-form-item>
         <!--收货人电话-->
-        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-          {{ deptBudgetList.receiverPhone }}
-        </ws-form-item>
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">{{ deptBudgetList.receiverPhone }}</ws-form-item>
         <!--发货日期-->
-        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
-          {{ deptBudgetList.deliveryDateStart }}
+        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">{{ deptBudgetList.deliveryDateStart }}
         </ws-form-item>
         <!--最晚到货日期-->
-        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-          {{ deptBudgetList.deliveryDateEnd }}
-        </ws-form-item>
+        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
-        </ws-form-item>
+        <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
         <!-- 运输方式 -->
-        <ws-form-item label="运输方式" span="1" prop="tranType">
-          {{ deptBudgetList.tranType }}
-        </ws-form-item>
+        <ws-form-item label="运输方式" span="1" prop="tranType">{{ deptBudgetList.tranType }}</ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及航次</div>
       <ws-info-table>
         <!-- 姓名 -->
-        <ws-form-item label="姓名" span="1" prop="driver">
-          {{ deptBudgetList.driver }}
-        </ws-form-item>
+        <ws-form-item label="姓名" span="1" prop="driver">{{ deptBudgetList.driver }}</ws-form-item>
         <!-- 电话 -->
-        <ws-form-item label="电话" span="1" prop="driverPhone">
-          {{ deptBudgetList.driverPhone }}
-        </ws-form-item>
+        <ws-form-item label="电话" span="1" prop="driverPhone">{{ deptBudgetList.driverPhone }}</ws-form-item>
         <!--发船日期-->
-          <ws-form-item label="发船日期" span="1" prop="sendDateStart">
-            {{ deptBudgetList.sendDateStart }}
-          </ws-form-item>
+        <ws-form-item label="发船日期" span="1" prop="sendDateStart">{{ deptBudgetList.sendDateStart }}</ws-form-item>
         <!-- 预计到港日期 -->
-        <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd">
-          {{ deptBudgetList.receiveDateEnd }}
-        </ws-form-item>
+        <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd">{{ deptBudgetList.receiveDateEnd }}</ws-form-item>
         <!-- 船名 -->
-        <ws-form-item label="船名" span="1" prop="shipName">
-          {{ deptBudgetList.shipName }}
-        </ws-form-item>
+        <ws-form-item label="船名" span="1" prop="shipName">{{ deptBudgetList.shipName }}</ws-form-item>
         <!-- 航次 -->
-        <ws-form-item label="航次" span="1" prop="shipNo">
-          {{ deptBudgetList.shipNo }}
-        </ws-form-item>
+        <ws-form-item label="航次" span="1" prop="shipNo">{{ deptBudgetList.shipNo }}</ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="shipType">
-          {{ deptBudgetList.shipType }}
-        </ws-form-item>
+        <ws-form-item label="类型" span="1" prop="shipType">{{ deptBudgetList.shipType }}</ws-form-item>
         <!-- 数量 -->
         <ws-form-item label="数量" span="1" prop="tranType" v-if="deptBudgetList.shipType == '集装箱'">
-          {{ deptBudgetList.tranType }}
-        </ws-form-item>
-      </ws-info-table>     
+          {{ deptBudgetList.tranType }}</ws-form-item>
+      </ws-info-table>
       <div class="small-title" style="font-size: 16px">装船详情</div>
       <div class="liaison">
-        <div
-          style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in this.freightspace"
-          :key="index"
-        >
+        <div style="width: 100%" class="flex position" v-for="(item, index) in this.freightspace" :key="index">
           <ws-info-table>
-           <div class="catNos" v-if="item.shipType == '集装箱'">
+            <div class="catNos" v-if="item.shipType == '集装箱'">
               集装箱-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装车'">
-                  未装船
-                </span>
-                <span class="service" v-show="item.status == '已装车'">
-                   已装船
-                </span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{                 
-                  item.status               
-                }}</span>
+              <span class="noservice" v-show="item.status == '未装车'">未装船</span>
+              <span class="service" v-show="item.status == '已装车'">已装船</span>
+              <span class="serviced" v-show="item.status == '已送达'">
+                {{
+                item.status
+                }}
+              </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
               仓位号-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装车'">
-                  未装船
-                </span>
-                <span class="service" v-show="item.status == '已装车'">
-                   已装船
-                </span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{                 
-                  item.status               
-                }}</span>
+              <span class="noservice" v-show="item.status == '未装车'">未装船</span>
+              <span class="service" v-show="item.status == '已装车'">已装船</span>
+              <span class="serviced" v-show="item.status == '已送达'">
+                {{
+                item.status
+                }}
+              </span>
             </div>
             <!--箱号-->
             <ws-form-item label="箱号:" span="1" prop="caseNo" v-if="item.shipType == '集装箱'">
-             <span>{{ item.caseNo }}</span>
+              <span>{{ item.caseNo }}</span>
             </ws-form-item>
             <!--封号-->
             <ws-form-item label="封号:" span="1" prop="titleNo" v-if="item.shipType == '集装箱'">
-             <span>{{ item.titleNo }}</span>
+              <span>{{ item.titleNo }}</span>
             </ws-form-item>
             <!-- 仓位号 -->
-            <ws-form-item  span="1" prop="binNumber" v-if="item.shipType == '散船'">
-               {{ item.binNumber }}
-            </ws-form-item> 
+            <ws-form-item span="1" prop="binNumber" v-if="item.shipType == '散船'">{{ item.binNumber }}</ws-form-item>
             <!-- 计划重量 -->
             <ws-form-item label="计划重量(吨)" span="1" prop="positionWeight" v-if="item.shipType == '散船'">
-               {{ item.positionWeight }}
-            </ws-form-item> 
+              {{ item.positionWeight }}</ws-form-item>
             <!--装船净重-->
-            <ws-form-item label="装船净重(吨)" span="1" prop="loadNetWeight">
-              {{ item.loadNetWeight }}
-            </ws-form-item>
+            <ws-form-item label="装船净重(吨)" span="1" prop="loadNetWeight">{{ item.loadNetWeight }}</ws-form-item>
             <!--装船日期-->
-          <ws-form-item label="装船日期" span="1" prop="loadingDate">
-            {{ item.loadingDate }}
-          </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">
-                  {{ item.signStatus }}
-                </div>
-            <span
-              v-show="item.temporaryDriverFlag != 0"
-              width="22"
-              height="22"
-              class="del"
-              @click="del(index)"
-              src="../../../public/img/del.png"
-              alt=""
-              >×</span
-            >
+            <ws-form-item label="装船日期" span="1" prop="loadingDate">{{ item.loadingDate }}</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">
+              {{ item.signStatus }}</div>
+            <span v-show="item.temporaryDriverFlag != 0" width="22" height="22" class="del" @click="del(index)"
+              src="../../../public/img/del.png" alt>×</span>
           </ws-info-table>
         </div>
       </div>
       <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨):{{ total }}/{{ deptBudgetList.weight }}
         <!--阶段状态-->
-         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
-          未完货
-        </span>
-        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+        <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">未完货</span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">
+          {{
           deptBudgetList.feedbackStatus
-        }}</span>
+          }}
+        </span>
       </div>
       <!--运单-->
-            <ws-form-item label="运单:" span="1" prop="loadPoundImg">
-             <template>
-                <img
-                  width="18"
-                  height="20"
-                  style="
+      <ws-form-item label="运单:" span="1" prop="loadPoundImg">
+        <template>
+          <img width="18" height="20" style="
                     vertical-align: text-top;
                     position: relative;
                     top: -1px;
-                  "
-                  src="../../../public/img/fujian.png"
-                  @click="fujian()"
-                  alt=""
-                />
-                <span
-                  v-if="
-                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr
-                      .length > 0
-                  "
-                  >{{
-                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length
-                  }}</span
-                >
-                 <span
-                  v-if="
-                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr
-                      .length == 0
-                  "
-                  >无</span>
-              </template>
-            </ws-form-item>  
+                  " src="../../../public/img/fujian.png" @click="fujian()" alt />
+          <span v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length > 0">
+            {{ deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length}}
+          </span>
+          <span v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length == 0
+                  ">无</span>
+        </template>
+      </ws-form-item>
     </ws-form>
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="returnsales()"
-        >关闭</el-button
-      >
+      <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">关闭</el-button>
     </div>
     <!-- 附件弹框 -->
-    <WinseaContentModal
-      v-model="accessoryTFs"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose"
-    >
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
       <p>查看附件</p>
-      <div
-        style="display: inline-block; margin: 5px"
-        v-for="item in appendixIdss"
-      >
-        <img width="100" height="100" :src="item" alt="" />
+      <div style="display: inline-block; margin: 5px" v-for="item in appendixIdss">
+        <img width="100" height="100" :src="item" alt />
       </div>
     </WinseaContentModal>
-    <WinseaContentModal
-      v-model="accesscard"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose1"
-    >
+    <WinseaContentModal v-model="accesscard" :title="$t('system.noticeCircular.information')" @on-cancel="handleClose1">
       <p>查看附件</p>
-      <img width="100" height="100" :src="accessurl" alt="" />
+      <img width="100" height="100" :src="accessurl" alt />
     </WinseaContentModal>
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback } from '@/model/transport/index'
-import WsUpload from '@/components/WsUpload'
-import mapDrag from '@/components/mapdrag/mapdrag'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    mapDrag,
-  },
-  watch: {
-    vesselId(val) {
-      this.getVesselData()
-    },
-    isShow(val) {
-      this.showType = val
+  import {
+    regionData,
+    CodeToText,
+    TextToCode
+  } from 'element-china-area-data'
+  import {
+    seeCat,
+    packList,
+    feedback
+  } from '@/model/transport/index'
+  import WsUpload from '@/components/WsUpload'
+  import mapDrag from '@/components/mapdrag/mapdrag'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      mapDrag
     },
-  },
-  data() {
-    return {
-      deptBudgetList: {
-        totalStorage: 0,
-      },
-      options_: regionData,
-      heightData: '600px',
-      zoom: 7,
-      selectedOptions: [],
-      center: [116.244694, 39.517344],
-      window: '',
-      radio: 1,
-      personCharge: [],
-      district: null,
-      driverList: [],
-      listDate: { country: '中国', level: 'country', city: '' },
-      citylist: [],
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      rules: {
-        warehouseName: [
-          {
-            required: true,
-            message: '请输入仓库名称',
-            trigger: 'blur',
-          },
-          {
-            min: 2,
-            max: 20,
-            message: '仓库名长度不符合要求,请输入2-20字符之内',
-            trigger: 'blur',
-          },
-        ],
+    watch: {
+      vesselId(val) {
+        this.getVesselData()
       },
-      tranType: 1,
-      size: 10,
-      value1: '',
-      unitList: [],
-      freightspace: [
-        {
+      isShow(val) {
+        this.showType = val
+      }
+    },
+    data() {
+      return {
+        deptBudgetList: {
+          totalStorage: 0
+        },
+        options_: regionData,
+        heightData: '600px',
+        zoom: 7,
+        selectedOptions: [],
+        center: [116.244694, 39.517344],
+        window: '',
+        radio: 1,
+        personCharge: [],
+        district: null,
+        driverList: [],
+        listDate: {
+          country: '中国',
+          level: 'country',
+          city: ''
+        },
+        citylist: [],
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        rules: {
+          warehouseName: [{
+              required: true,
+              message: '请输入仓库名称',
+              trigger: 'blur'
+            },
+            {
+              min: 2,
+              max: 20,
+              message: '仓库名长度不符合要求,请输入2-20字符之内',
+              trigger: 'blur'
+            }
+          ]
+        },
+        tranType: 1,
+        size: 10,
+        value1: '',
+        unitList: [],
+        freightspace: [{
           driver: '',
           driverPhone: '',
           carNo: '',
-          loadNetWeight: '',
-        },
-      ],
-      name: '',
-      staffList: [],
-      options: [],
-      // carModel: [],
-      tranCarInfoList: {},
-      //上传
-      accessoryTFs: false,
-      accesscard: false,
-      accessurl: '',
-      fileList: [],
-      // appendixIdsAdd: '',
-      //附件
-      appendixIdss: [],
-    }
-  },
-  mounted() {
-    this.deptBudgetList.id = this.$route.query.id
-    this.getList()
-  },
-
-  computed: {
-    totalStorage: function () {
-      var maxStorage = 0
-      for (var i = 0; i < this.freightspace.length; i++) {
-        maxStorage += Number(this.freightspace[i].maxStorage)
+          loadNetWeight: ''
+        }],
+        name: '',
+        staffList: [],
+        options: [],
+        // carModel: [],
+        tranCarInfoList: {},
+        //上传
+        accessoryTFs: false,
+        accesscard: false,
+        accessurl: '',
+        fileList: [],
+        // appendixIdsAdd: '',
+        //附件
+        appendixIdss: []
       }
-      return maxStorage
     },
-    total: function () {
-      if (this.deptBudgetList.tranCarInfoList != null) {
+    mounted() {
+      this.deptBudgetList.id = this.$route.query.id
+      this.getList()
+    },
+
+    computed: {
+      totalStorage: function() {
         var maxStorage = 0
-        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-          maxStorage += Number(
-            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
-          )
+        for (var i = 0; i < this.freightspace.length; i++) {
+          maxStorage += Number(this.freightspace[i].maxStorage)
         }
         return maxStorage
-      } else {
-        return 0
+      },
+      total: function() {
+        if (this.deptBudgetList.tranCarInfoList != null) {
+          var maxStorage = 0
+          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+            maxStorage += Number(
+              this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+            )
+          }
+          return maxStorage
+        } else {
+          return 0
+        }
       }
     },
-  },
-  methods: {
-    marker: function (item) {
-      this.deptBudgetList.warehousePositioning =
-        item.lnglat.lat + ',' + item.lnglat.lng
-    },
-    selectedAddress(e) {
-      this.deptBudgetList.warehousePositioning =
-        e.center.lat + ',' + e.center.lng
-    },
-    confirmPositioncity() {
-      this.listDate.level = 'city'
-      this.listDate.country = this.name
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleClose() {
-      this.dialogViewSpareMoney = false
-    },
-    handleClose1() {
-      this.accesscard = false
-    },
-    handleChange(value) {
-      this.selectedOptions = value
-    },
-    returnsales() {
-      this.deptBudgetList = {}
-      this.freightspace = {}
-      this.selectedOptions = ''
-      this.$router.push({ path: 'tranManagementTransporHairRespond' })
-    },
-    // confirmPosition() {
-    //   this.draggable = false
-    // },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    resetForm(deptBudgetList) {
-      this.$refs[deptBudgetList].resetFields()
-    },
-    getList() {
-      seeCat({ id: this.deptBudgetList.id })
-        .toPromise()
-        .then((response) => {
-          this.deptBudgetList = response
-          this.deptBudgetList.driver= response.tranCarInfoList[0].driver
-          this.deptBudgetList.driverPhone = response.tranCarInfoList[0].driverPhone
-          this.deptBudgetList.sendDateStart= response.tranCarInfoList[0].sendDateStart
-          this.deptBudgetList.receiveDateEnd= response.tranCarInfoList[0].receiveDateEnd
-          this.deptBudgetList.shipName= response.tranCarInfoList[0].shipName
-          this.deptBudgetList.shipNo= response.tranCarInfoList[0].shipNo
-          this.deptBudgetList.shipType= response.tranCarInfoList[0].shipType
-          this.deptBudgetList.boxNumber= response.tranCarInfoList[0].boxNumber
-          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          this.freightspace = response.tranCarInfoList
-          for (var i = 0; i < this.freightspace.length; i++) {
-            if (!this.freightspace[i].loadNetWeight) {
-              this.freightspace[i].loadNetWeight = 0
+    methods: {
+      marker: function(item) {
+        this.deptBudgetList.warehousePositioning =
+          item.lnglat.lat + ',' + item.lnglat.lng
+      },
+      selectedAddress(e) {
+        this.deptBudgetList.warehousePositioning =
+          e.center.lat + ',' + e.center.lng
+      },
+      confirmPositioncity() {
+        this.listDate.level = 'city'
+        this.listDate.country = this.name
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleClose() {
+        this.dialogViewSpareMoney = false
+      },
+      handleClose1() {
+        this.accesscard = false
+      },
+      handleChange(value) {
+        this.selectedOptions = value
+      },
+      returnsales() {
+        this.deptBudgetList = {}
+        this.freightspace = {}
+        this.selectedOptions = ''
+        this.$router.push({
+          path: 'tranManagementTransporHairRespond'
+        })
+      },
+      // confirmPosition() {
+      //   this.draggable = false
+      // },
+      // 上传附件
+      uploadSuccess(data, files, url) {
+        console.log(data, files, url)
+      },
+      handleClose() {
+        this.accessoryTFs = false
+      },
+      resetForm(deptBudgetList) {
+        this.$refs[deptBudgetList].resetFields()
+      },
+      getList() {
+        seeCat({
+            id: this.deptBudgetList.id
+          })
+          .toPromise()
+          .then(response => {
+            this.deptBudgetList = response
+            if (response.tranCarInfoList.length > 0) {
+              this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+              this.deptBudgetList.driverPhone =
+                response.tranCarInfoList[0].driverPhone
+              this.deptBudgetList.sendDateStart =
+                response.tranCarInfoList[0].sendDateStart
+              this.deptBudgetList.receiveDateEnd =
+                response.tranCarInfoList[0].receiveDateEnd
+              this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName
+              this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
+              this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
+              this.deptBudgetList.boxNumber =
+                response.tranCarInfoList[0].boxNumber
             }
-            if (this.deptBudgetList.tranCarInfoList[i].loadPoundImg != null) {
-              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr =
-                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
-              this.fileList[i] =
-                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
-            } else {
-              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr = []
+
+            //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+            this.freightspace = response.tranCarInfoList
+            for (var i = 0; i < this.freightspace.length; i++) {
+              if (!this.freightspace[i].loadNetWeight) {
+                this.freightspace[i].loadNetWeight = 0
+              }
+              if (this.deptBudgetList.tranCarInfoList[i].loadPoundImg != null) {
+                this.deptBudgetList.tranCarInfoList[
+                  i
+                ].loadPoundImgArr = this.deptBudgetList.tranCarInfoList[
+                  i
+                ].loadPoundImg.split(',')
+                this.fileList[i] = this.deptBudgetList.tranCarInfoList[
+                  i
+                ].loadPoundImg.split(',')
+              } else {
+                this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr = []
+              }
             }
+          })
+      },
+      selectChapterTwo(e) {
+        for (var i = 0; i < this.ChapterTwoList.length; i++) {
+          if (this.ChapterTwoList[i].constValue == e) {
+            this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
           }
-        })
-    },
-    selectChapterTwo(e) {
-      for (var i = 0; i < this.ChapterTwoList.length; i++) {
-        if (this.ChapterTwoList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
         }
-      }
-    },
-    selectunitList(e) {
-      for (var i = 0; i < this.unitList.length; i++) {
-        if (this.unitList[i].constValue == e) {
-          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+      },
+      selectunitList(e) {
+        for (var i = 0; i < this.unitList.length; i++) {
+          if (this.unitList[i].constValue == e) {
+            this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+          }
         }
-      }
-    },
-    selectgrade(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+      },
+      selectgrade(e) {
+        for (var i = 0; i < this.gradeList.length; i++) {
+          if (this.gradeList[i].constValue == e) {
+            this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+          }
         }
-      }
-    },
-    selectgoodsName(e) {
-      for (var i = 0; i < this.goodnameList.length; i++) {
-        if (this.goodnameList[i].constValue == e) {
-          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+      },
+      selectgoodsName(e) {
+        for (var i = 0; i < this.goodnameList.length; i++) {
+          if (this.goodnameList[i].constValue == e) {
+            this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+          }
         }
-      }
-    },
-    selectpackingMethod(e) {
-      for (var i = 0; i < this.packtypeList.length; i++) {
-        if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+      },
+      selectpackingMethod(e) {
+        for (var i = 0; i < this.packtypeList.length; i++) {
+          if (this.packtypeList[i].constValue == e) {
+            this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+          }
         }
+      },
+      //上传
+      fujian(e) {
+        if (
+          this.deptBudgetList.tranCarInfoList[0].loadPoundImg === null ||
+          this.deptBudgetList.tranCarInfoList[0].loadPoundImg === ''
+        ) {
+          this.$message({
+            message: '暂无附件!',
+            type: 'warning'
+          })
+          return
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = this.deptBudgetList.tranCarInfoList[0].loadPoundImgArr
       }
-    },
-    //上传
-    fujian(e) {
-      if (
-        this.deptBudgetList.tranCarInfoList[0].loadPoundImg === null ||
-        this.deptBudgetList.tranCarInfoList[0].loadPoundImg === ''
-      ) {
-        this.$message({
-          message: '暂无附件!',
-          type: 'warning',
-        })
-        return
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss =
-        this.deptBudgetList.tranCarInfoList[0].loadPoundImgArr
-    },
-  },
-}
+    }
+  }
 </script>
 
 <style lang="scss" scoped>
-/deep/.totalStorage .el-input__inner {
-  color: #afb5cb;
-  background: #f5f7fa;
-}
-.small-title {
-  position: relative;
-  padding: 10px;
-  font-weight: 600;
-}
-.small-title::before {
-  position: absolute;
-  content: '';
-  display: block;
-  background: #5473e8;
-  width: 4px;
-  height: 14px;
-  left: 0px;
-  top: 13px;
-}
-.position {
-  position: relative;
-}
-.amap-page-container {
-  width: 300px;
-  height: 300px;
-}
-.el-form {
-  padding: 0 15%;
-}
-/deep/.ws-info-table .el-form-item {
-  border-right: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-}
-.readonly {
-  position: relative;
-}
-.readonly:after {
-  content: '*';
-  color: #ff2727;
-  position: absolute;
-  right: 8px;
-  z-index: 10;
-  top: 21%;
-  font-size: 20px;
-}
-.title {
-  position: relative;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-col {
-  background: #f6f7fc;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  padding: 0 25px;
-  border-left: 1px solid transparent;
-  background: #fff;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 100px;
-  text-align: center;
-  background: #fff;
-}
-.button-container {
-  display: flex;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #fff;
-  width: 100%;
-  height: 50px;
-  padding: 0 10px;
-  & > div {
-    margin-left: 10px;
+  /deep/.totalStorage .el-input__inner {
+    color: #afb5cb;
+    background: #f5f7fa;
+  }
+
+  .small-title {
+    position: relative;
+    padding: 10px;
+    font-weight: 600;
+  }
+
+  .small-title::before {
+    position: absolute;
+    content: '';
+    display: block;
+    background: #5473e8;
+    width: 4px;
+    height: 14px;
+    left: 0px;
+    top: 13px;
+  }
+
+  .position {
+    position: relative;
+  }
+
+  .amap-page-container {
+    width: 300px;
+    height: 300px;
+  }
+
+  .el-form {
+    padding: 0 15%;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border-right: 1px solid transparent;
+    border-bottom: 1px solid transparent;
+  }
+
+  .readonly {
+    position: relative;
+  }
+
+  .readonly:after {
+    content: '*';
+    color: #ff2727;
+    position: absolute;
+    right: 8px;
+    z-index: 10;
+    top: 21%;
+    font-size: 20px;
+  }
+
+  .title {
+    position: relative;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-col {
+    background: #f6f7fc;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    padding: 0 25px;
+    border-left: 1px solid transparent;
+    background: #fff;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 100px;
+    text-align: center;
+    background: #fff;
+  }
+
+  .button-container {
     display: flex;
     flex-wrap: nowrap;
-    flex-direction: row;
-    & > span {
-      line-height: 50px;
-    }
-  }
+    justify-content: space-between;
+    align-items: center;
+    background-color: #fff;
+    width: 100%;
+    height: 50px;
+    padding: 0 10px;
+
+    &>div {
+      margin-left: 10px;
+      display: flex;
+      flex-wrap: nowrap;
+      flex-direction: row;
 
-  /deep/.auditFlow-box {
-    position: unset;
-    margin-left: 10px;
-    &/deep/.auditFlow-icon {
-      width: auto;
-      padding-right: 30px;
+      &>span {
+        line-height: 50px;
+      }
     }
-    &/deep/.auditFlow-main {
-      position: absolute;
+
+    /deep/.auditFlow-box {
+      position: unset;
+      margin-left: 10px;
+
+      &/deep/.auditFlow-icon {
+        width: auto;
+        padding-right: 30px;
+      }
+
+      &/deep/.auditFlow-main {
+        position: absolute;
+      }
     }
   }
-}
-.box-app {
-  display: inline-block;
-  float: left;
-  margin-left: 30px;
-  line-height: 50px;
-}
-/deep/.el-dialog {
-  .el-form-item {
-    margin-bottom: 0 !important;
-    .el-input--medium {
-      textarea {
-        min-height: 100px !important;
+
+  .box-app {
+    display: inline-block;
+    float: left;
+    margin-left: 30px;
+    line-height: 50px;
+  }
+
+  /deep/.el-dialog {
+    .el-form-item {
+      margin-bottom: 0 !important;
+
+      .el-input--medium {
+        textarea {
+          min-height: 100px !important;
+        }
       }
     }
   }
-}
-.collapse-bottom {
-  margin-bottom: 20px;
-}
-.input-main .textarea .el-textarea__inner {
-  width: 100%;
-  z-index: 1;
-}
-.bg-left {
-  padding-left: 30px;
-}
-.bg-right {
-  padding-right: 10px;
-  text-align: right;
-}
-.bg-bottom {
-  margin: 15px 0px;
-}
-.wenzi {
-  width: 900px;
-  margin: 0 auto;
-}
-.wenzi h3 {
-  display: inline-block;
-  left: 10px;
-}
-.wenzi p {
-  display: inline-block;
-}
-.center {
-  margin-right: 50px;
-}
-.el-form-item {
-  width: 50%;
-}
-.el-form-item__label {
-  text-align: center;
-}
-.ce {
-  width: 900px;
-  margin: 0 auto;
-}
-/*.crt-main .textarea /deep/ .el-form-item__label {*/
-/*  height: 82px;*/
-/*}*/
-// 控制select为只读的时候显示样式
 
-.hide-sel {
-  .el-input__inner {
-    border: 0px;
+  .collapse-bottom {
+    margin-bottom: 20px;
   }
-  .el-icon-arrow-up {
-    display: none;
+
+  .input-main .textarea .el-textarea__inner {
+    width: 100%;
+    z-index: 1;
   }
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
+
+  .bg-left {
+    padding-left: 30px;
   }
-  .el-date-editor {
-    i {
-      display: none;
-    }
+
+  .bg-right {
+    padding-right: 10px;
+    text-align: right;
   }
-  .is-disabled {
-    .el-input__inner:hover {
-      background-color: #fff !important;
-      border: 0;
-    }
-    color: #606266;
+
+  .bg-bottom {
+    margin: 15px 0px;
+  }
+
+  .wenzi {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  .wenzi h3 {
+    display: inline-block;
+    left: 10px;
+  }
+
+  .wenzi p {
+    display: inline-block;
+  }
+
+  .center {
+    margin-right: 50px;
+  }
+
+  .el-form-item {
+    width: 50%;
+  }
+
+  .el-form-item__label {
+    text-align: center;
+  }
+
+  .ce {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  /*.crt-main .textarea /deep/ .el-form-item__label {*/
+  /*  height: 82px;*/
+  /*}*/
+  // 控制select为只读的时候显示样式
+
+  .hide-sel {
     .el-input__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
+      border: 0px;
+    }
+
+    .el-icon-arrow-up {
+      display: none;
     }
+
     .el-textarea__inner {
       background-color: #fff !important;
       border: 0;
+    }
+
+    .el-date-editor {
+      i {
+        display: none;
+      }
+    }
+
+    .is-disabled {
+      .el-input__inner:hover {
+        background-color: #fff !important;
+        border: 0;
+      }
+
       color: #606266;
+
+      .el-input__inner {
+        background-color: #fff !important;
+        border: 0;
+        color: #606266;
+      }
+
+      .el-textarea__inner {
+        background-color: #fff !important;
+        border: 0;
+        color: #606266;
+      }
     }
   }
-}
 
-// 控制select为只读的时候显示样式
-/deep/.ws-class-table-col {
-  height: auto;
-  padding: 0px 2px;
-  /deep/.el-input__inner {
+  // 控制select为只读的时候显示样式
+  /deep/.ws-class-table-col {
+    height: auto;
     padding: 0px 2px;
+
+    /deep/.el-input__inner {
+      padding: 0px 2px;
+    }
   }
-}
-/deep/.is-disabled {
-  .el-input__prefix,
-  .el-input__suffix {
+
+  /deep/.is-disabled {
+    .el-input__prefix,
+    .el-input__suffix {
+      display: none;
+    }
+
+    .el-input__inner {
+      background-color: #fff;
+      border-color: #fff !important;
+      color: #000 !important;
+      font-size: 14px;
+      cursor: text;
+      padding: 0 !important;
+    }
+  }
+
+  .winseaview-view {
+    padding: 0 0 20px;
+  }
+
+  .container {
+    overflow: scroll;
+    height: 93vh;
+  }
+
+  .ws-info-table .el-form-item {
+    width: 33.3333%;
+  }
+
+  .readonly:after {
+    display: none;
+  }
+
+  .el-textarea__inner {
     display: none;
   }
-  .el-input__inner {
+
+  .el-form {
+    margin-top: 50px;
+  }
+
+  .readonly {
+    width: 16%;
+  }
+
+  //去边框
+  /deep/.el-form-item {
+    border-right: 0px;
+    border-bottom: 0px;
+  }
+
+  /deep/.ws-info-table {
+    border-left: 0px;
+    border-top: 0px;
+  }
+
+  .ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border: none;
+    height: 50px;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    font-family: PingFangSC-Regular, PingFang SC;
+    margin-bottom: 5px;
     background-color: #fff;
-    border-color: #fff !important;
-    color: #000 !important;
     font-size: 14px;
-    cursor: text;
-    padding: 0 !important;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
   }
-}
-.winseaview-view {
-  padding: 0 0 20px;
-}
-.container {
-  overflow: scroll;
-  height: 93vh;
-}
-.ws-info-table .el-form-item {
-  width: 33.3333%;
-}
-.readonly:after {
-  display: none;
-}
-.el-textarea__inner {
-  display: none;
-}
-.el-form {
-  margin-top: 50px;
-}
-.readonly {
-  width: 16%;
-}
 
-//去边框
-/deep/.el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-}
-/deep/.ws-info-table {
-  border-left: 0px;
-  border-top: 0px;
-}
-.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
-/deep/.ws-info-table .el-form-item {
-  border: none;
-  height: 50px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  background-color: #fff;
-  font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    background-color: #fff;
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+  }
 
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-}
-/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
-  border: 0px;
-  border-right: 1px solid #d8dce6;
-  border-radius: 0px;
-  padding: 0px;
-}
-//联络员及车次
-/deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
-}
-/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 50%;
-  background: #f6f7fc;
-}
-/deep/.liaison .flex {
-  display: contents;
-}
-/deep/.liaison .ws-info-table {
-  background: #f6f7fc;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  margin-top: 20px;
-}
-.catNos {
-  width: 100%;
-  height: 30px;
-  margin-top: 10px;
-  margin-left: 20px;
-  font-size: 14px;
-}
-.catNosCor {
-  color: #5473e8;
-}
-.signStatus {
-  height: 25px;
-  border-radius: 3px;
-  border: 1px solid #5473e8;
-  padding: 0 3px;
-  margin-left: 30px;
-  color: #ffffff;
-  background: #c4cada;
-  line-height: 24px;
-}
-.signStatus1 {
-  height: 25px;
-  background: #e6ebff;
-  border-radius: 3px;
-  border: 1px solid #5473e8;
-  padding: 0 3px;
-  margin-left: 30px;
-  color: #5473e8;
-  line-height: 24px;
-}
-.noservice {
-  background: #c4cada;
-  color: #ffffff;
-}
-.service {
-  background: #e5f1f7;
-  color: #50cad4;
-}
-.forlist{
-  background-color: #F5F7FA;
-  border-radius: 10px;
-  width: 100%;
-  padding-left: 15px;
-  height: 35px;
-  line-height: 35px;
-  color: #C0C4CC;
-  font-size: 14px;
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+  }
+
+  /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
+    border: 0px;
+    border-right: 1px solid #d8dce6;
+    border-radius: 0px;
+    padding: 0px;
+  }
+  //联络员及车次
+  /deep/.liaison .ws-info-table .el-form-item {
+    width: 20%;
+  }
+
+  /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+    width: 50%;
+    background: #f6f7fc;
+  }
+
+  /deep/.liaison .flex {
+    display: contents;
+  }
+
+  /deep/.liaison .ws-info-table {
+    background: #f6f7fc;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    margin-top: 20px;
+  }
+
+  .catNos {
+    width: 100%;
+    height: 30px;
+    margin-top: 10px;
+    margin-left: 20px;
+    font-size: 14px;
+  }
+
+  .catNosCor {
+    color: #5473e8;
+  }
+
+  .signStatus {
+    height: 25px;
+    border-radius: 3px;
+    border: 1px solid #5473e8;
+    padding: 0 3px;
+    margin-left: 30px;
+    color: #ffffff;
+    background: #c4cada;
+    line-height: 24px;
+  }
+
+  .signStatus1 {
+    height: 25px;
+    background: #e6ebff;
+    border-radius: 3px;
+    border: 1px solid #5473e8;
+    padding: 0 3px;
+    margin-left: 30px;
+    color: #5473e8;
+    line-height: 24px;
+  }
+
+  .noservice {
+    background: #c4cada;
+    color: #ffffff;
+  }
+
+  .service {
+    background: #e5f1f7;
+    color: #50cad4;
+  }
+
+  .forlist {
+    background-color: #f5f7fa;
+    border-radius: 10px;
+    width: 100%;
+    padding-left: 15px;
+    height: 35px;
+    line-height: 35px;
+    color: #c0c4cc;
+    font-size: 14px;
+  }
+  .liaison{
+  margin-bottom: 20px;
 }
-</style>
+</style>

+ 1 - 0
src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -132,6 +132,7 @@
              <el-button
               v-if="deptBudgetList.priceStatus=='审核中'"
               type="primary"
+              v-hasPermission="`transportationTask.transportation.transportationInfo.exe`" 
               size="small"
               @click="examine()"
               >审核中</el-button

+ 1 - 1
src/views/warehouse/warehouseManagementEdit.vue

@@ -321,7 +321,7 @@ export default {
   },
   activated() {
     this.loaddata()
-    getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.baseId })
+    getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:'' })
       .toPromise()
       .then((response) => {
         this.options = response

+ 3 - 0
src/views/warehouse/warehouseManagementPut.vue

@@ -496,6 +496,7 @@ export default {
       deptBudgetList: {
         type:'干粮',
         freight:0,
+        cost:'',
         warehouseInOutDetail: {}
       },
       historyList: [],
@@ -1050,6 +1051,8 @@ export default {
           return
         }
       }
+      console.log(this.deptBudgetList,"入库对象")
+      return
       this.deptBudgetList.id = this.$route.query.id
       this.$confirm(`确定提交入库信息`, {
         cancelButtonText: '取消',

+ 927 - 960
src/views/warehouse/warehouseManagementRecord.vue

@@ -1,992 +1,959 @@
 <template>
-  <div class="container">
-    <el-row>
-      <el-col :span="18">
-        <h2 class="bg-left title">流转记录</h2>
-      </el-col>
-      <el-col :span="6" class="bg-right">
-        <el-button
-          class="bg-bottom adjustment"
-          type="primary"
-          size="small"
-          @click="iossrecord()"
-          v-show="this.warehouseType != 2"
-          >盘损记录</el-button
-        >
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="returnWarehouse()"
-          >返回</el-button
-        >
-      </el-col>
-    </el-row>
-    <div class="center">
-      <h2 style="padding-left: 20px">
-        <img
-          style="position: relative; top: 2px"
-          width="19"
-          height="19"
-          src="../../../public/img/cangku.png"
-          alt=""
-        />
-        <span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
-        <span class="ware" v-show="warehouseType==1">{{binNumber}}仓位(容量{{capacity}}吨)</span>
-        <span v-show="warehouseType==2">(临)</span>
-      </h2>
-      <p
-        style="
+	<div class="container">
+		<el-row>
+			<el-col :span="18">
+				<h2 class="bg-left title">流转记录</h2>
+			</el-col>
+			<el-col :span="6" class="bg-right">
+				<el-button class="bg-bottom adjustment" type="primary" size="small" @click="iossrecord()"
+					v-show="this.warehouseType != 2">盘损记录</el-button>
+				<el-button class="bg-bottom" type="primary" size="small" @click="returnWarehouse()">返回</el-button>
+			</el-col>
+		</el-row>
+		<div class="center">
+			<h2 style="padding-left: 20px">
+				<img style="position: relative; top: 2px" width="19" height="19" src="../../../public/img/cangku.png"
+					alt="" />
+				<span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
+				<span class="ware" v-show="warehouseType==1">{{binNumber}}仓位(容量{{capacity}}吨)</span>
+				<span v-show="warehouseType==2">(临)</span>
+			</h2>
+			<p style="
           margin-left: 42px;
           background: #f6f7fc;
           color: #afb5cb;
           width: 245px;
-        "
-      >
-        备注:{{remark }}
-      </p>
-
-      <ws-form ref="deptBudgetList" :model="deptBudgetList">
-        <div
-          class="record"
-          :class="{ active: status == 1 }"
-          @click="record('', 1)"
-        >
-          <img
-            v-if="status != 1"
-            width="14"
-            height="14"
-            src="../../../public/img/radio.png"
-            alt=""
-          />
-          <img
-            v-if="status == 1"
-            width="18"
-            height="18"
-            src="../../../public/img/radio-check.png"
-            alt=""
-          />全部记录
-        </div>
-        <div
-          class="record"
-          :class="{ active: status == 2 }"
-          @click="record(2, 2)"
-        >
-          <img
-            v-if="status != 2"
-            width="14"
-            height="14"
-            src="../../../public/img/radio.png"
-            alt=""
-          />
-          <img
-            v-if="status == 2"
-            width="18"
-            height="18"
-            src="../../../public/img/radio-check.png"
-            alt=""
-          />出库记录
-        </div>
-        <div
-          class="record"
-          :class="{ active: status == 3 }"
-          @click="record(3, 3)"
-        >
-          <img
-            v-if="status != 3"
-            width="14"
-            height="14"
-            src="../../../public/img/radio.png"
-            alt=""
-          />
-          <img
-            v-if="status == 3"
-            width="18"
-            height="18"
-            src="../../../public/img/radio-check.png"
-            alt=""
-          />入库记录
-        </div>
-        <el-table :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
-          <el-table-column type="expand">
-            <template #default="props">
-              <ws-form ref="deptBudgetList" :model="deptBudgetList">
-                <ws-info-table>
-                  <ws-form-item label="水分(%)" span="1" prop="waterContent">
-                    {{ props.row.waterContent }}
-                  </ws-form-item>
-                  <ws-form-item label="容重(g/l)" span="1" prop="bulkDensity">
-                    {{ props.row.bulkDensity }}
-                  </ws-form-item>
-                  <ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
-                    {{ props.row.jiaorenli }}
-                  </ws-form-item>
-                  <ws-form-item label="杂质(%)" span="1" prop="impurity">
-                    {{ props.row.impurity }}
-                  </ws-form-item>
-                  <ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
-                    {{ props.row.mildewGrain }}
-                  </ws-form-item>
-                  <ws-form-item
-                    label="不完善粒(%)"
-                    span="1"
-                    prop="imperfectGrain"
-                  >        
-                    {{ props.row.imperfectGrain }}
-                  </ws-form-item>
-                  <ws-form-item label="质检员" span="1" prop="qualityInspector">
-                    {{ props.row.qualityInspector }}
-                  </ws-form-item>
-                  <ws-form-item label="扣重比" span="1" prop="buckleWeightRatio">
-                    {{ props.row.buckleWeightRatio }}
-                  </ws-form-item>
-                  <ws-form-item label="干粮水分(%)" span="1" prop="solidGrainWater">
-                    {{ props.row.solidGrainWater }}
-                  </ws-form-item>
-                </ws-info-table>
-              </ws-form>
-            </template>
-          </el-table-column>
-          <el-table-column type="index" label="序号">
-            <template scope="scope">
-              <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-              <span v-else>{{ scope.$index + 1 }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="goodsName" label="货名"> </el-table-column>
-          <el-table-column
-            prop="grossWeight"
-            label="毛重(吨)"
-          ></el-table-column>
-          <el-table-column prop="tare" label="皮重(吨)"> </el-table-column>
-          <el-table-column prop="deductionWeight" label="扣重(吨)"> </el-table-column>
-          <el-table-column
-            prop="netWeight"
-            label="净重(吨)"
-          ></el-table-column>
-          <el-table-column prop="pureWeight" label="纯重(吨)"> </el-table-column>
-          <el-table-column prop="deductionAmount" label="扣款(元/吨)"> </el-table-column>
-          <el-table-column prop="grade" label="品级">
-            <template slot-scope="scope">
-              <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+        ">
+				备注:{{remark }}
+			</p>
+
+			<ws-form ref="deptBudgetList" :model="deptBudgetList">
+				<div class="record" :class="{ active: status == 1 }" @click="record('', 1)">
+					<img v-if="status != 1" width="14" height="14" src="../../../public/img/radio.png" alt="" />
+					<img v-if="status == 1" width="18" height="18" src="../../../public/img/radio-check.png"
+						alt="" />全部记录
+				</div>
+				<div class="record" :class="{ active: status == 2 }" @click="record(2, 2)">
+					<img v-if="status != 2" width="14" height="14" src="../../../public/img/radio.png" alt="" />
+					<img v-if="status == 2" width="18" height="18" src="../../../public/img/radio-check.png"
+						alt="" />出库记录
+				</div>
+				<div class="record" :class="{ active: status == 3 }" @click="record(3, 3)">
+					<img v-if="status != 3" width="14" height="14" src="../../../public/img/radio.png" alt="" />
+					<img v-if="status == 3" width="18" height="18" src="../../../public/img/radio-check.png"
+						alt="" />入库记录
+				</div>
+				<el-table :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
+					<el-table-column type="expand">
+						<template #default="props">
+							<ws-form ref="deptBudgetList" :model="deptBudgetList">
+								<ws-info-table>
+									<ws-form-item label="水分(%)<=" span="1" prop="waterContent">
+										{{ props.row.waterContent }}
+									</ws-form-item>
+									<ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
+										{{ props.row.bulkDensity }}
+									</ws-form-item>
+									<ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
+										{{ props.row.jiaorenli }}
+									</ws-form-item>
+									<ws-form-item label="杂质(%)<=" span="1" prop="impurity">
+										{{ props.row.impurity }}
+									</ws-form-item>
+									<ws-form-item label="霉变粒(%)<=" span="1" prop="mildewGrain">
+										{{ props.row.mildewGrain }}
+									</ws-form-item>
+									<ws-form-item label="不完善粒(%)<=" span="1" prop="imperfectGrain">
+										{{ props.row.imperfectGrain }}
+									</ws-form-item>
+									<ws-form-item label="质检员" span="1" prop="qualityInspector">
+										{{ props.row.qualityInspector }}
+									</ws-form-item>
+									<ws-form-item label="扣重比" span="1" prop="buckleWeightRatio">
+										{{ props.row.buckleWeightRatio }}
+									</ws-form-item>
+									<ws-form-item label="干粮水分(%)" span="1" prop="solidGrainWater">
+										{{ props.row.solidGrainWater }}
+									</ws-form-item>
+								</ws-info-table>
+							</ws-form>
+						</template>
+					</el-table-column>
+					<el-table-column type="index" label="序号">
+						<template scope="scope">
+							<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+							<span v-else>{{ scope.$index + 1 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="goodsName" label="货名" width="60px"> </el-table-column>
+					<el-table-column prop="type" label="类型" width="60px"> </el-table-column>
+					<el-table-column prop="grossWeight" label="毛重(吨)" ></el-table-column>
+					<el-table-column prop="tare" label="皮重(吨)"> </el-table-column>
+					<el-table-column prop="deductionWeight" label="扣重(吨)"> </el-table-column>
+					<el-table-column prop="netWeight" label="净重(吨)"></el-table-column>
+					<el-table-column prop="pureWeight" label="纯重(吨)"> </el-table-column>
+					<el-table-column prop="deductionAmount" label="扣款(元/吨)"> </el-table-column>
+					<el-table-column prop="grade" label="品级" width="80px">
+						<template slot-scope="scope">
+							<span v-if="scope.row.grade == '一等品'" class="top-grade">{{
                 scope.row.grade
               }}</span>
-              <span v-if="scope.row.grade == '二等品'" class="second-class">{{
+							<span v-if="scope.row.grade == '二等品'" class="second-class">{{
                 scope.row.grade
               }}</span>
-              <span v-if="scope.row.grade == '三等品'" class="third-class">{{
+							<span v-if="scope.row.grade == '三等品'" class="third-class">{{
                 scope.row.grade
               }}</span>
-              <span v-if="scope.row.grade == '等外'" class="substandard">{{
+							<span v-if="scope.row.grade == '等外'" class="substandard">{{
                 scope.row.grade
               }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="inOutDate" label="出入库日期">
-            <template slot-scope="scope">
-              <span style="color: #8890b1">{{ scope.row.inOutDate }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="inOutType" label="类型"> </el-table-column>
-          <el-table-column prop="contractNo" label="合同编号">
-            <template slot-scope="scope">
-              <span style="color: #8890b1">{{ scope.row.contractNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="carNo" label="车牌号">
-            <template slot-scope="scope">
-              <span style="color: #8890b1">{{ scope.row.carNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="agent" label="经办人">
-          </el-table-column>
-          <el-table-column prop="buyer" label="操作人">
-             </el-table-column>
-          <el-table-column prop="addressUrl" label="附件">
-            <template slot-scope="scope">
-              <img
-                width="18"
-                height="20"
-                style="vertical-align: text-top; position: relative; top: -1px"
-                src="../../../public/img/fujian.png"
-                @click="fujian(scope.row)"
-                alt=""
-              />
-              <!-- <span v-if="scope.row.addressUrlArray.length > 0">{{
+						</template>
+					</el-table-column>
+					<el-table-column prop="inOutDate" label="出入库日期">
+						<template slot-scope="scope">
+							<span style="color: #8890b1">{{ scope.row.inOutDate }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="inOutType" label="类型"> </el-table-column>
+					<el-table-column prop="contractNo" label="合同编号">
+						<template slot-scope="scope">
+							<span style="color: #8890b1">{{ scope.row.contractNo }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="carNo" label="车牌号">
+						<template slot-scope="scope">
+							<span style="color: #8890b1">{{ scope.row.carNo }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="agent" label="经办人">
+					</el-table-column>
+					<el-table-column prop="backOffice" label="操作人" width="120px">
+					</el-table-column>
+					<el-table-column prop="addressUrl" label="附件" width="50px">
+						<template slot-scope="scope">
+							<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+							<!-- <span v-if="scope.row.addressUrlArray.length > 0">{{
                 scope.row.addressUrlArray.length
               }}</span> -->
-              <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
-            </template>
-          </el-table-column>
-          <el-table-column prop="createDate" label="录入时间">
-            <template slot-scope="scope">
-              <span style="color: #8890b1">{{ scope.row.createDate }}</span>
-            </template>
-          </el-table-column>
-          
-        </el-table>
-        <el-table :data="warehouseList.records" height="560" v-show="this.warehouseType== '2'">
-          <el-table-column type="expand">
-            <template #default="props">
-              <ws-form ref="deptBudgetList" :model="deptBudgetList">
-                <ws-info-table>
-                  <ws-form-item label="水分(%)" span="1" prop="waterContent">
-                    {{ props.row.waterContent }}
-                  </ws-form-item>
-                  <ws-form-item label="容重(g/l)" span="1" prop="bulkDensity">
-                    {{ props.row.bulkDensity }}
-                  </ws-form-item>
-                  <ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
-                    {{ props.row.jiaorenli }}
-                  </ws-form-item>
-                  <ws-form-item label="杂质(%)" span="1" prop="impurity">
-                    {{ props.row.impurity }}
-                  </ws-form-item>
-                  <ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
-                    {{ props.row.mildewGrain }}
-                  </ws-form-item>
-                  <ws-form-item
-                    label="不完善粒(%)"
-                    span="1"
-                    prop="imperfectGrain"
-                  >
-                    {{ props.row.imperfectGrain }}
-                  </ws-form-item>
-                  <ws-form-item label="质检员" span="1" prop="qualityInspector">
-                    {{ props.row.qualityInspector }}
-                  </ws-form-item>
-                </ws-info-table>
-              </ws-form>
-            </template>
-          </el-table-column>
-          <el-table-column type="index" label="序号">
-            <template scope="scope">
-              <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-              <span v-else>{{ scope.$index + 1 }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="goodsName" label="货名"> </el-table-column>
-          <el-table-column
-            prop="grossWeight"
-            label="毛重(吨)"
-          ></el-table-column>
-          <el-table-column prop="tare" label="皮重(吨)"> </el-table-column>
-          <el-table-column
-            prop="netWeight"
-            label="净重(吨)"
-          ></el-table-column>
-          <el-table-column prop="grade" label="品级">
-            <template slot-scope="scope">
-              <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+							<!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
+						</template>
+					</el-table-column>
+					<el-table-column prop="createDate" label="录入时间">
+						<template slot-scope="scope">
+							<span style="color: #8890b1">{{ scope.row.createDate }}</span>
+						</template>
+					</el-table-column>
+
+				</el-table>
+				<el-table :data="warehouseList.records" height="560" v-show="this.warehouseType== '2'">
+					<el-table-column type="expand">
+						<template #default="props">
+							<ws-form ref="deptBudgetList" :model="deptBudgetList">
+								<ws-info-table>
+									<ws-form-item label="水分(%)" span="1" prop="waterContent">
+										{{ props.row.waterContent }}
+									</ws-form-item>
+									<ws-form-item label="容重(g/l)" span="1" prop="bulkDensity">
+										{{ props.row.bulkDensity }}
+									</ws-form-item>
+									<ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
+										{{ props.row.jiaorenli }}
+									</ws-form-item>
+									<ws-form-item label="杂质(%)" span="1" prop="impurity">
+										{{ props.row.impurity }}
+									</ws-form-item>
+									<ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
+										{{ props.row.mildewGrain }}
+									</ws-form-item>
+									<ws-form-item label="不完善粒(%)" span="1" prop="imperfectGrain">
+										{{ props.row.imperfectGrain }}
+									</ws-form-item>
+									<ws-form-item label="质检员" span="1" prop="qualityInspector">
+										{{ props.row.qualityInspector }}
+									</ws-form-item>
+								</ws-info-table>
+							</ws-form>
+						</template>
+					</el-table-column>
+					<el-table-column type="index" label="序号">
+						<template scope="scope">
+							<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+							<span v-else>{{ scope.$index + 1 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="goodsName" label="货名"> </el-table-column>
+					<el-table-column prop="grossWeight" label="毛重(吨)"></el-table-column>
+					<el-table-column prop="tare" label="皮重(吨)"> </el-table-column>
+					<el-table-column prop="netWeight" label="净重(吨)"></el-table-column>
+					<el-table-column prop="grade" label="品级">
+						<template slot-scope="scope">
+							<span v-if="scope.row.grade == '一等品'" class="top-grade">{{
                 scope.row.grade
               }}</span>
-              <span v-if="scope.row.grade == '二等品'" class="second-class">{{
+							<span v-if="scope.row.grade == '二等品'" class="second-class">{{
                 scope.row.grade
               }}</span>
-              <span v-if="scope.row.grade == '三等品'" class="third-class">{{
+							<span v-if="scope.row.grade == '三等品'" class="third-class">{{
                 scope.row.grade
               }}</span>
-              <span v-if="scope.row.grade == '等外'" class="substandard">{{
+							<span v-if="scope.row.grade == '等外'" class="substandard">{{
                 scope.row.grade
               }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="inOutDate" label="出入库日期">
-            <template slot-scope="scope">
-              <span style="color: #8890b1">{{ scope.row.inOutDate }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="inOutType" label="类型"> </el-table-column>
-          <el-table-column prop="contractNo" label="合同编号">
-            <template slot-scope="scope">
-              <span style="color: #8890b1">{{ scope.row.contractNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="carNo" label="车牌号">
-            <template slot-scope="scope">
-              <span style="color: #8890b1">{{ scope.row.carNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="agent" label="经办人">
-          </el-table-column>
-          <el-table-column prop="backOffice" label="内勤"> </el-table-column>
-          <el-table-column prop="addressUrl" label="附件">
-            <template slot-scope="scope">
-              <img
-                width="18"
-                height="20"
-                style="vertical-align: text-top; position: relative; top: -1px"
-                src="../../../public/img/fujian.png"
-                @click="fujian(scope.row)"
-                alt=""
-              />
-              <!-- <span v-if="scope.row.addressUrlArray.length > 0">{{
+						</template>
+					</el-table-column>
+					<el-table-column prop="inOutDate" label="出入库日期">
+						<template slot-scope="scope">
+							<span style="color: #8890b1">{{ scope.row.inOutDate }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="inOutType" label="类型"> </el-table-column>
+					<el-table-column prop="contractNo" label="合同编号">
+						<template slot-scope="scope">
+							<span style="color: #8890b1">{{ scope.row.contractNo }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="carNo" label="车牌号">
+						<template slot-scope="scope">
+							<span style="color: #8890b1">{{ scope.row.carNo }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="agent" label="经办人">
+					</el-table-column>
+					<el-table-column prop="backOffice" label="内勤"> </el-table-column>
+					<el-table-column prop="addressUrl" label="附件">
+						<template slot-scope="scope">
+							<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+							<!-- <span v-if="scope.row.addressUrlArray.length > 0">{{
                 scope.row.addressUrlArray.length
               }}</span> -->
-              <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
-            </template>
-          </el-table-column>
-          <el-table-column prop="createDate" label="录入时间">
-            <template slot-scope="scope">
-              <span style="color: #8890b1">{{ scope.row.createDate }}</span>
-            </template>
-          </el-table-column>
-          
-        </el-table>
-        
-        <div style="text-align: center; padding: 10px">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-size="deptCircularPage.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="deptBudgetTotal"
-          >
-          </el-pagination>
-        </div>
-      </ws-form>
-    </div>
-    <WinseaContentModal
-      v-model="accessoryTFs"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose"
-    >
-      <p>查看附件</p>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
-    </WinseaContentModal>
-  </div>
-  
+							<!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
+						</template>
+					</el-table-column>
+					<el-table-column prop="createDate" label="录入时间">
+						<template slot-scope="scope">
+							<span style="color: #8890b1">{{ scope.row.createDate }}</span>
+						</template>
+					</el-table-column>
+
+				</el-table>
+
+				<div style="text-align: center; padding: 10px">
+					<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+						:current-page="currentPage" :page-size="deptCircularPage.pageSize"
+						layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+					</el-pagination>
+				</div>
+			</ws-form>
+		</div>
+		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+			@on-cancel="handleClose">
+			<p>查看附件</p>
+			<ws-upload ref="upload" table-name="maintain_work_order" oss-key="mainPlan" :comp-id="compId"
+				:appendix-ids="appendixIdsAdd" :vesselId="deptBudgetList.addressUrl" :size-limit="size"
+				@uploadSuccess="uploadSuccess" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+		</WinseaContentModal>
+	</div>
+
 </template>
 
 
 <script>
-import { addselectinfoList,recordss } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      appendixIdsAdd: '',
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      radiostatus: 1,
-      capacity: '',
-      searchKeyWord: '',
-      contractType: 2,
-      startDate: null,
-      endDate: null,
-      remark: '',
-      binNumber: '',
-      status: 1,
-      // 提交类型
-      submitType: true,
-      selectpackingMethod: {},
-      size: 10,
-      warehouseType:'1',
-     deptBudgetList1: {},
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      packtypeList: {},
-      pcFlag: 1,
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-      warehouseList: [],
-      deptBudgetList: {},
-      historyList: [],
-      searchType: '',
-      allurl: '../../../public/img/radio.png',
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
-      },
-      accessoryTFs: false,
-    }
-  },
- 
-  activated() {
-    this.deptBudgetList.baseId = this.$route.query.baseId
-    this.deptBudgetList.positionId = this.$route.query.positionId
-    this.deptBudgetList.warehouseName = this.$route.query.warehouseName
-    this.remark = this.$route.query.remark
-    this.binNumber = this.$route.query.binNumber
-    this.capacity = this.$route.query.capacity
-    this.warehouseType = this.$route.query.warehouseType
-    this.getList()
-
-    this.showType = this.isShow
-  },
-  methods: {
-  
-    //返回按钮
-    returnWarehouse() {
-      this.$router.push({ path: 'warehouseManagementList' })
-    },
-    //
-    iossrecord() {
-      this.$router.push({
-        path: 'warehouseManagementIossRecord',
-        query: {
-          baseId: this.deptBudgetList.baseId,
-          positionId: this.deptBudgetList.positionId,
-          warehouseName: this.deptBudgetList.warehouseName,
-          binNumber: this.binNumber,
-        },
-      })
-    },
-    dateFormat(fmt, date) {
-      let ret
-      const opt = {
-        'Y+': date.getFullYear().toString(), // 年
-        'm+': (date.getMonth() + 1).toString(), // 月
-        'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
-        // "M+": date.getMinutes().toString(),         // 分
-        // "S+": date.getSeconds().toString()          // 秒
-        // 有其他格式化字符需求可以继续添加,必须转化成字符串
-      }
-      for (let k in opt) {
-        ret = new RegExp('(' + k + ')').exec(fmt)
-        if (ret) {
-          fmt = fmt.replace(
-            ret[1],
-            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-          )
-        }
-      }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    record(status, status1) {
-      this.status = status1
-      this.searchType = status
-      this.getList()
-    },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
-    },
-    getList() {
-      if(this.warehouseType==1){
-        addselectinfoList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        baseId: this.deptBudgetList.baseId,
-        positionId: this.deptBudgetList.positionId,
-        warehouseName: this.deptBudgetList.warehouseName,
-        searchType: this.searchType,
-        currentPage: this.currentPage,
-        pcFlag: this.pcFlag,
-        pageSize: this.pageSize
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i <  response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.warehouseList = response
-        }) 
-      }else if(this.warehouseType==2){
-       recordss({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        baseId: this.deptBudgetList.baseId,
-        positionId: this.deptBudgetList.positionId,
-        warehouseName: this.deptBudgetList.warehouseName,
-        searchType: this.searchType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-         this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.warehouseList = response
-        }) 
-      }
-      
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
-    find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      this.currentPage = 1
-      this.getList()
-    },
-    // async exportlist() {
-    //   const { data } = await export1(
-    //     {
-    //       compId: sessionStorage.getItem('ws-pf_compId'),
-    //       contractType: this.contractType,
-    //       currentPage: this.currentPage,
-    //       pageSize: this.pageSize,
-    //       searchType: this.searchType,
-    //       searchKeyWord: this.searchKeyWord,
-    //       startDate: this.startDate,
-    //       endDate: this.endDate,
-    //     },
-    //     {},
-    //     { responseType: 'blob' }
-    //   ).toPromise()
-    //   downloadFile({
-    //     res: data,
-    //     fileName: `${
-    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
-    //     }_采购合同`,
-    //     type: 'xls',
-    //   })
-    // },
-    // deletecontract(){},
-    //删除
-
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
-  },
-}
+	import {
+		addselectinfoList,
+		recordss
+	} from '@/model/warehouse/index'
+	import {
+		downloadFile
+	} from '@/utils/batchDown'
+	import Pagination from '@/components/Pagination'
+	import WsUpload from '@/components/WsUpload'
+	import {
+		dayjs,
+		fmoney,
+		EventBus
+	} from 'base-core-lib'
+	export default {
+		name: 'viewSpareMoney',
+		components: {
+			WsUpload,
+			Pagination,
+		},
+		watch: {
+			vesselId(val) {
+				this.getList()
+			},
+			isShow(val) {
+				this.showType = val
+			},
+		},
+		data() {
+			return {
+				//弹出框
+				dialogViewSpareMoney: false,
+				dialogApproveFormVisible: false,
+				// 船舶类型
+				monetaryKey: null,
+				// 表格显示数据
+				tableDate: [],
+				appendixIdsAdd: '',
+				// 是否显示
+				showType: true,
+				// 年
+				year: '',
+				deptBudgetTotal: 0,
+				currentPage: 1,
+				pageSize: 10,
+				radiostatus: 1,
+				capacity: '',
+				searchKeyWord: '',
+				contractType: 2,
+				startDate: null,
+				endDate: null,
+				remark: '',
+				binNumber: '',
+				status: 1,
+				// 提交类型
+				submitType: true,
+				selectpackingMethod: {},
+				size: 10,
+				warehouseType: '1',
+				deptBudgetList1: {},
+				compId: sessionStorage.getItem('ws-pf_compId'),
+				deptCircularPage: {},
+				packtypeList: {},
+				pcFlag: 1,
+				date: {
+					year: dayjs().format('YYYY'),
+					month: dayjs().format('MM'),
+				},
+				warehouseList: [],
+				deptBudgetList: {},
+				historyList: [],
+				searchType: '',
+				allurl: '../../../public/img/radio.png',
+				pickerBeginDateBefore: {
+					disabledDate: (time) => {
+						return time.getTime() > Date.now()
+					},
+				},
+				accessoryTFs: false,
+			}
+		},
+
+		activated() {
+			this.deptBudgetList.baseId = this.$route.query.baseId
+			this.deptBudgetList.positionId = this.$route.query.positionId
+			this.deptBudgetList.warehouseName = this.$route.query.warehouseName
+			this.remark = this.$route.query.remark
+			this.binNumber = this.$route.query.binNumber
+			this.capacity = this.$route.query.capacity
+			this.warehouseType = this.$route.query.warehouseType
+			this.getList()
+
+			this.showType = this.isShow
+		},
+		methods: {
+
+			//返回按钮
+			returnWarehouse() {
+				this.$router.push({
+					path: 'warehouseManagementList'
+				})
+			},
+			//
+			iossrecord() {
+				this.$router.push({
+					path: 'warehouseManagementIossRecord',
+					query: {
+						baseId: this.deptBudgetList.baseId,
+						positionId: this.deptBudgetList.positionId,
+						warehouseName: this.deptBudgetList.warehouseName,
+						binNumber: this.binNumber,
+					},
+				})
+			},
+			dateFormat(fmt, date) {
+				let ret
+				const opt = {
+					'Y+': date.getFullYear().toString(), // 年
+					'm+': (date.getMonth() + 1).toString(), // 月
+					'd+': date.getDate().toString(), // 日
+					'H+': date.getHours().toString(), // 时
+					// "M+": date.getMinutes().toString(),         // 分
+					// "S+": date.getSeconds().toString()          // 秒
+					// 有其他格式化字符需求可以继续添加,必须转化成字符串
+				}
+				for (let k in opt) {
+					ret = new RegExp('(' + k + ')').exec(fmt)
+					if (ret) {
+						fmt = fmt.replace(
+							ret[1],
+							ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+						)
+					}
+				}
+				return fmt
+			},
+			handleClose() {
+				this.accessoryTFs = false
+			},
+			handleSizeChange(val) {
+				console.log(`每页 ${val} 条`)
+				this.pageSize = val
+				this.getList()
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val
+				console.log(`当前页: ${val}`)
+				this.getList()
+			},
+			record(status, status1) {
+				this.status = status1
+				this.searchType = status
+				this.getList()
+			},
+			// 上传附件
+			uploadSuccess(data, files, url) {
+				console.log(data, files, url)
+
+				// this.deptBudgetList.
+				// this.formData.append('files', files)
+				// this.feedbackObj.uploadNameAttachment = data.appendixName
+				// this.feedbackObj.pathUploadAttachment = data.appendixPath
+				// // this.newAppendixs = files
+				// this.onChangeFlag = true
+			},
+			getList() {
+				if (this.warehouseType == 1) {
+					addselectinfoList({
+							compId: sessionStorage.getItem('ws-pf_compId'),
+							baseId: this.deptBudgetList.baseId,
+							positionId: this.deptBudgetList.positionId,
+							warehouseName: this.deptBudgetList.warehouseName,
+							searchType: this.searchType,
+							currentPage: this.currentPage,
+							pcFlag: this.pcFlag,
+							pageSize: this.pageSize
+						})
+						.toPromise()
+						.then((response) => {
+							for (var i = 0; i < response.records.length; i++) {
+								if (response.records[i].addressUrl != null) {
+									response.records[i].addressUrlArray = response.records[
+										i
+									].addressUrl.split(',')
+								} else {
+									response.records[i].addressUrlArray = []
+								}
+							}
+							this.deptCircularPage.currentPage = response.current
+							this.deptCircularPage.pageSize = response.size
+							this.deptBudgetTotal = response.total
+							this.warehouseList = response
+						})
+				} else if (this.warehouseType == 2) {
+					recordss({
+							compId: sessionStorage.getItem('ws-pf_compId'),
+							baseId: this.deptBudgetList.baseId,
+							positionId: this.deptBudgetList.positionId,
+							warehouseName: this.deptBudgetList.warehouseName,
+							searchType: this.searchType,
+							currentPage: this.currentPage,
+							pageSize: this.pageSize,
+						})
+						.toPromise()
+						.then((response) => {
+							for (var i = 0; i < response.records.length; i++) {
+								if (response.records[i].addressUrl != null) {
+									response.records[i].addressUrlArray = response.records[
+										i
+									].addressUrl.split(',')
+								} else {
+									response.records[i].addressUrlArray = []
+								}
+							}
+							this.deptCircularPage.currentPage = response.current
+							this.deptCircularPage.pageSize = response.size
+							this.deptBudgetTotal = response.total
+							this.warehouseList = response
+						})
+				}
+
+			},
+			selecttaskType(e) {
+				for (var i = 0; i < this.taskTypeList.length; i++) {
+					if (this.taskTypeList[i].value == e) {
+						this.searchType = this.taskTypeList[i].type
+					}
+				}
+			},
+			fujian(row) {
+				if (
+					row.receiveAttachmentPath === null ||
+					row.receiveAttachmentPath === ''
+				) {
+					EventBus.$emit(
+						'warning',
+						this.$t('system.noticeCircular.NoInformation')
+					)
+				} else {
+					this.accessoryTFs = true
+				}
+				this.appendixIdss = row.receiveAttachmentPath
+			},
+			handleExamine(row) {
+				this.$router.push({
+					name: 'salesContractExamine',
+					query: {
+						id: row.id
+					},
+				})
+			},
+
+			// 关闭 dialog时 处理文件url 初始化upload组件
+			handleCloe() {
+				this.dialogViewSpareMoney = false
+			},
+			history(row) {
+				console.log(row)
+				billoperatehis({
+						id: row.id
+					})
+					.toPromise()
+					.then((response) => {
+						this.historyList = response
+					})
+			},
+			find() {
+				this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+				this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+				this.currentPage = 1
+				this.getList()
+			},
+			// async exportlist() {
+			//   const { data } = await export1(
+			//     {
+			//       compId: sessionStorage.getItem('ws-pf_compId'),
+			//       contractType: this.contractType,
+			//       currentPage: this.currentPage,
+			//       pageSize: this.pageSize,
+			//       searchType: this.searchType,
+			//       searchKeyWord: this.searchKeyWord,
+			//       startDate: this.startDate,
+			//       endDate: this.endDate,
+			//     },
+			//     {},
+			//     { responseType: 'blob' }
+			//   ).toPromise()
+			//   downloadFile({
+			//     res: data,
+			//     fileName: `${
+			//       this.date.year + (this.date.month ? `-${this.date.month}` : '')
+			//     }_采购合同`,
+			//     type: 'xls',
+			//   })
+			// },
+			// deletecontract(){},
+			//删除
+
+			approve() {},
+			listQuery() {},
+			total() {},
+			clearfiltQuery() {},
+			selectCrtDuty() {},
+		},
+	}
 </script>
 <style lang="scss" scoped>
-/deep/.totalStorage .el-input__inner {
-  color: #afb5cb;
-  background: #f5f7fa;
-}
-.small-title {
-  position: relative;
-  padding: 10px;
-  font-weight: 600;
-}
-.small-title::before {
-  position: absolute;
-  content: '';
-  display: block;
-  background: #5473e8;
-  width: 4px;
-  height: 14px;
-  left: 0px;
-  top: 13px;
-}
-.position {
-  position: relative;
-}
-.add,
-.del {
-  position: absolute;
-  right: -38px;
-  top: 9px;
-  cursor: pointer;
-}
-.del {
-  right: -70px;
-}
-.amap-page-container {
-  width: 300px;
-  height: 300px;
-}
-.ware {
-  font-size: 12px;
-  color: rgb(255, 255, 255);
-  background: rgb(175, 181, 203);
-  padding: 3px;
-  position: relative;
-  top: -1px;
-  border-radius: 3px;
-  text-align: center;
-}
-.title {
-  position: relative;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.ws-info-table {
-  border-left: 1px solid transparent;
-  border-top: 1px solid transparent;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.adjustment.el-button--primary {
-  background-color: #51cdd9;
-  border-color: #51cdd9;
-}
-.el-col {
-  background: #f6f7fc;
-}
-.record {
-  background: #fff;
-  color: #8890b1;
-  border-color: #fff;
-  display: inline-block;
-  margin-bottom: 10px;
-  cursor: pointer;
-  margin-left: 5px;
-  margin-right: 5px;
-}
-.record img {
-  position: relative;
-  top: 2px;
-}
-.record.active img {
-  position: relative;
-  top: 4px;
-}
-.record.active {
-  color: #262626;
-}
-.button-container {
-  display: flex;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #fff;
-  width: 100%;
-  height: 50px;
-  padding: 0 10px;
-  & > div {
-    margin-left: 10px;
-    display: flex;
-    flex-wrap: nowrap;
-    flex-direction: row;
-    & > span {
-      line-height: 50px;
-    }
-  }
-
-  /deep/.auditFlow-box {
-    position: unset;
-    margin-left: 10px;
-    &/deep/.auditFlow-icon {
-      width: auto;
-      padding-right: 30px;
-    }
-    &/deep/.auditFlow-main {
-      position: absolute;
-    }
-  }
-}
-.box-app {
-  display: inline-block;
-  float: left;
-  margin-left: 30px;
-  line-height: 50px;
-}
-/deep/.el-dialog {
-  .el-form-item {
-    margin-bottom: 0 !important;
-    .el-input--medium {
-      textarea {
-        min-height: 100px !important;
-      }
-    }
-  }
-}
-.top-grade {
-  background: linear-gradient(90deg, #5678e9, #7993f6);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.second-class {
-  background: linear-gradient(90deg, #50cdd9, #82e2ea);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.third-class {
-  background: linear-gradient(90deg, #ffa735, #ffbf70);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.substandard {
-  background: linear-gradient(90deg, #b2b4bb, #ced0d5);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.collapse-bottom {
-  margin-bottom: 20px;
-}
-.input-main .textarea .el-textarea__inner {
-  width: 100%;
-  z-index: 1;
-}
-.bg-left {
-  padding-left: 30px;
-}
-.bg-right {
-  padding-right: 10px;
-  text-align: right;
-}
-.bg-bottom {
-  margin: 15px 0px;
-}
-.wenzi {
-  width: 900px;
-  margin: 0 auto;
-}
-.wenzi h3 {
-  display: inline-block;
-  left: 10px;
-}
-.wenzi p {
-  display: inline-block;
-}
-.center {
-  padding: 0 1%;
-}
-.el-form-item {
-  width: 50%;
-}
-.el-form-item__label {
-  text-align: center;
-}
-.ce {
-  width: 900px;
-  margin: 0 auto;
-}
-/*.crt-main .textarea /deep/ .el-form-item__label {*/
-/*  height: 82px;*/
-/*}*/
-// 控制select为只读的时候显示样式
-
-.hide-sel {
-  .el-input__inner {
-    border: 0px;
-  }
-  .el-icon-arrow-up {
-    display: none;
-  }
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
-  }
-  .el-date-editor {
-    i {
-      display: none;
-    }
-  }
-  .is-disabled {
-    .el-input__inner:hover {
-      background-color: #fff !important;
-      border: 0;
-    }
-    color: #606266;
-    .el-input__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-  }
-}
-
-// 控制select为只读的时候显示样式
-/deep/.ws-class-table-col {
-  height: auto;
-  padding: 0px 2px;
-  /deep/.el-input__inner {
-    padding: 0px 2px;
-  }
-}
-/deep/.is-disabled {
-  .el-input__prefix,
-  .el-input__suffix {
-    display: none;
-  }
-  .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
-    color: #000 !important;
-    font-size: 14px;
-    cursor: text;
-    padding: 0 !important;
-  }
-}
-.winseaview-view {
-  padding: 0 0 20px;
-}
-.container {
-  overflow: scroll;
-  height: 93vh;
-}
-.el-textarea__inner {
-  display: none;
-}
-.readonly {
-  width: 16%;
-}
-.ws-info-table .el-form-item {
-  width: 14.28%;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  background-color: #f6f7fc;
-  font-size: 12px;
-  height: 45px;
-}
-//去边框
-/deep/.el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-}
-/deep/.ws-info-table {
-  border-left: 0px;
-  border-top: 0px;
-}
-.ws-info-table .el-form-item .el-form-item__content {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
-}
-/deep/.ws-info-table .el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  border: 0px;
-}
+	/deep/.totalStorage .el-input__inner {
+		color: #afb5cb;
+		background: #f5f7fa;
+	}
+
+	.small-title {
+		position: relative;
+		padding: 10px;
+		font-weight: 600;
+	}
+
+	.small-title::before {
+		position: absolute;
+		content: '';
+		display: block;
+		background: #5473e8;
+		width: 4px;
+		height: 14px;
+		left: 0px;
+		top: 13px;
+	}
+
+	.position {
+		position: relative;
+	}
+
+	.add,
+	.del {
+		position: absolute;
+		right: -38px;
+		top: 9px;
+		cursor: pointer;
+	}
+
+	.del {
+		right: -70px;
+	}
+
+	.amap-page-container {
+		width: 300px;
+		height: 300px;
+	}
+
+	.ware {
+		font-size: 12px;
+		color: rgb(255, 255, 255);
+		background: rgb(175, 181, 203);
+		padding: 3px;
+		position: relative;
+		top: -1px;
+		border-radius: 3px;
+		text-align: center;
+	}
+
+	.title {
+		position: relative;
+	}
+
+	.title::before {
+		content: '';
+		display: inline-block;
+		width: 5px;
+		height: 30px;
+		background: #5473e8;
+		position: absolute;
+		left: 0;
+	}
+
+	.ws-info-table {
+		border-left: 1px solid transparent;
+		border-top: 1px solid transparent;
+	}
+
+	.el-button--primary {
+		background-color: #5878e8;
+		border-color: #5878e8;
+	}
+
+	.adjustment.el-button--primary {
+		background-color: #51cdd9;
+		border-color: #51cdd9;
+	}
+
+	.el-col {
+		background: #f6f7fc;
+	}
+
+	.record {
+		background: #fff;
+		color: #8890b1;
+		border-color: #fff;
+		display: inline-block;
+		margin-bottom: 10px;
+		cursor: pointer;
+		margin-left: 5px;
+		margin-right: 5px;
+	}
+
+	.record img {
+		position: relative;
+		top: 2px;
+	}
+
+	.record.active img {
+		position: relative;
+		top: 4px;
+	}
+
+	.record.active {
+		color: #262626;
+	}
+
+	.button-container {
+		display: flex;
+		flex-wrap: nowrap;
+		justify-content: space-between;
+		align-items: center;
+		background-color: #fff;
+		width: 100%;
+		height: 50px;
+		padding: 0 10px;
+
+		&>div {
+			margin-left: 10px;
+			display: flex;
+			flex-wrap: nowrap;
+			flex-direction: row;
+
+			&>span {
+				line-height: 50px;
+			}
+		}
+
+		/deep/.auditFlow-box {
+			position: unset;
+			margin-left: 10px;
+
+			&/deep/.auditFlow-icon {
+				width: auto;
+				padding-right: 30px;
+			}
+
+			&/deep/.auditFlow-main {
+				position: absolute;
+			}
+		}
+	}
+
+	.box-app {
+		display: inline-block;
+		float: left;
+		margin-left: 30px;
+		line-height: 50px;
+	}
+
+	/deep/.el-dialog {
+		.el-form-item {
+			margin-bottom: 0 !important;
+
+			.el-input--medium {
+				textarea {
+					min-height: 100px !important;
+				}
+			}
+		}
+	}
+
+	.top-grade {
+		background: linear-gradient(90deg, #5678e9, #7993f6);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.second-class {
+		background: linear-gradient(90deg, #50cdd9, #82e2ea);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.third-class {
+		background: linear-gradient(90deg, #ffa735, #ffbf70);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.substandard {
+		background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.collapse-bottom {
+		margin-bottom: 20px;
+	}
+
+	.input-main .textarea .el-textarea__inner {
+		width: 100%;
+		z-index: 1;
+	}
+
+	.bg-left {
+		padding-left: 30px;
+	}
+
+	.bg-right {
+		padding-right: 10px;
+		text-align: right;
+	}
+
+	.bg-bottom {
+		margin: 15px 0px;
+	}
+
+	.wenzi {
+		width: 900px;
+		margin: 0 auto;
+	}
+
+	.wenzi h3 {
+		display: inline-block;
+		left: 10px;
+	}
+
+	.wenzi p {
+		display: inline-block;
+	}
+
+	.center {
+		padding: 0 1%;
+	}
+
+	.el-form-item {
+		width: 50%;
+	}
+
+	.el-form-item__label {
+		text-align: center;
+	}
+
+	.ce {
+		width: 900px;
+		margin: 0 auto;
+	}
+
+	/*.crt-main .textarea /deep/ .el-form-item__label {*/
+	/*  height: 82px;*/
+	/*}*/
+	// 控制select为只读的时候显示样式
+
+	.hide-sel {
+		.el-input__inner {
+			border: 0px;
+		}
+
+		.el-icon-arrow-up {
+			display: none;
+		}
+
+		.el-textarea__inner {
+			background-color: #fff !important;
+			border: 0;
+		}
+
+		.el-date-editor {
+			i {
+				display: none;
+			}
+		}
+
+		.is-disabled {
+			.el-input__inner:hover {
+				background-color: #fff !important;
+				border: 0;
+			}
+
+			color: #606266;
+
+			.el-input__inner {
+				background-color: #fff !important;
+				border: 0;
+				color: #606266;
+			}
+
+			.el-textarea__inner {
+				background-color: #fff !important;
+				border: 0;
+				color: #606266;
+			}
+		}
+	}
+
+	// 控制select为只读的时候显示样式
+	/deep/.ws-class-table-col {
+		height: auto;
+		padding: 0px 2px;
+
+		/deep/.el-input__inner {
+			padding: 0px 2px;
+		}
+	}
+
+	/deep/.is-disabled {
+		.el-input__prefix,
+		.el-input__suffix {
+			display: none;
+		}
+
+		.el-input__inner {
+			background-color: #fff;
+			border-color: #fff !important;
+			color: #000 !important;
+			font-size: 14px;
+			cursor: text;
+			padding: 0 !important;
+		}
+	}
+
+	.winseaview-view {
+		padding: 0 0 20px;
+	}
+
+	.container {
+		overflow: scroll;
+		height: 93vh;
+	}
+
+	.el-textarea__inner {
+		display: none;
+	}
+
+	.readonly {
+		width: 16%;
+	}
+
+	.ws-info-table .el-form-item {
+		width: 14.28%;
+	}
+
+	/deep/.ws-info-table .el-form-item .el-form-item__label {
+		background-color: #f6f7fc;
+		font-size: 12px;
+		height: 45px;
+	}
+
+	//去边框
+	/deep/.el-form-item {
+		border-right: 0px;
+		border-bottom: 0px;
+	}
+
+	/deep/.ws-info-table {
+		border-left: 0px;
+		border-top: 0px;
+	}
+
+	.ws-info-table .el-form-item .el-form-item__content {
+		border-right: 0px;
+		border-bottom: 0px;
+		border-left: 0px;
+		border-top: 0px;
+	}
+
+	/deep/.ws-info-table .el-form-item {
+		border-right: 0px;
+		border-bottom: 0px;
+		border-left: 0px;
+		border-top: 0px;
+	}
+
+	/deep/.ws-info-table .el-form-item .el-form-item__content {
+		background: #f5f7fa;
+		border-radius: 4px;
+		border: 1px solid #d8dce6;
+		font-family: PingFangSC-Regular, PingFang SC;
+		margin-bottom: 5px;
+		background-color: #fff;
+		font-size: 14px;
+		font-weight: 400;
+		color: #8890b1;
+		line-height: 16px;
+	}
+
+	/deep/.ws-info-table .el-form-item .el-form-item__content {
+		border: 0px;
+	}
 </style>