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

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -384,7 +384,7 @@
         </ws-form-item>
 
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -411,7 +411,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -431,7 +431,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -441,7 +441,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -382,7 +382,7 @@
           {{ deptBudgetList.contractGoodsInfo.goodsName }}
         </ws-form-item>
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -409,7 +409,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -429,7 +429,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -439,7 +439,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"
@@ -1773,7 +1773,7 @@ export default {
   margin: 15px 0px;
 }
 .wenzi {
-  width: 900px;
+  width: 1200px;
   margin: 0 auto;
 }
 .wenzi h3 {

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -376,7 +376,7 @@
         </ws-form-item>
 
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -403,7 +403,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -423,7 +423,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -433,7 +433,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -376,7 +376,7 @@
             {{ deptBudgetList.contractGoodsInfo.goodsName }}
           </ws-form-item>
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -403,7 +403,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -423,7 +423,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -433,7 +433,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/purchaseContractAdd.vue

@@ -361,7 +361,7 @@
         </ws-form-item>
 
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -388,7 +388,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -408,7 +408,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -418,7 +418,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/salesContractAdd.vue

@@ -366,7 +366,7 @@
           </ws-form-item>
 
           <!--水分（%）<=-->
-          <ws-form-item label="水分（%）" span="1" prop="waterContent">
+          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.waterContent"
               placeholder="请输入水分占比"
@@ -393,7 +393,7 @@
           </ws-form-item>
 
           <!--杂质（%）<=-->
-          <ws-form-item label="杂质（%）" span="1" prop="impurity">
+          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.impurity"
               placeholder="请输入杂质占比（%）"
@@ -413,7 +413,7 @@
           </ws-form-item>
 
           <!--霉变粒（%）<=-->
-          <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+          <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
               placeholder="请输入霉变粒占比（%）"
@@ -423,7 +423,7 @@
           </ws-form-item>
 
           <!--热损伤（%）<=-->
-          <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
               placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/salesContractEdit.vue

@@ -344,7 +344,7 @@
           </ws-form-item>
 
           <!--水分（%）<=-->
-          <ws-form-item label="水分（%）" span="1" prop="contractNo">
+          <ws-form-item label="水分（%）<=" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.waterContent"
               placeholder="请输入水分（%）"
@@ -362,7 +362,7 @@
           </ws-form-item>
 
           <!--杂质（%）<=-->
-          <ws-form-item label="杂质（%）" span="1" prop="contractNo">
+          <ws-form-item label="杂质（%）<=" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.impurity"
               placeholder="请输入杂质（%）"
@@ -382,7 +382,7 @@
           </ws-form-item>
 
           <!--霉变粒（%）<=-->
-          <ws-form-item label="霉变粒（%）" span="1" prop="contractNo">
+          <ws-form-item label="霉变粒（%）<=" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
               placeholder="请输入霉变粒（%）"
@@ -392,7 +392,7 @@
           </ws-form-item>
 
           <!--热损伤（%）<=-->
-          <ws-form-item label="热损伤（%）" span="1" prop="contractNo">
+          <ws-form-item label="热损伤（%）<=" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
               placeholder="请输入热损伤（%）"

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -407,7 +407,7 @@ import { shippingLook, packList, dispatchCat ,delhaulagestage} from '@/model/tra
 import { getstaff } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-// import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -334,8 +334,8 @@
             />           
           </el-upload>
           <div class="tupian">
-          <span v-if="deptBudgetList.tranCarInfoList[0].loadPoundImg != null " >1</span>
-          <span v-if="deptBudgetList.tranCarInfoList[0].loadPoundImg == null ">未上传</span>
+          <span v-if="deptBudgetList.tranCarInfoList && deptBudgetList.tranCarInfoList.length > 0 && deptBudgetList.tranCarInfoList[0].loadPoundImg != null " >1</span>
+          <span v-else>未上传</span>
           </div>
         </template>       
       </ws-form-item>
@@ -430,9 +430,6 @@ export default {
       staffList: [],
       options: [],
       carModel: [],
-      tranCarInfoList: {
-        loadPoundImg: '',
-      },
       //上传
       accessoryTFs: false,
       fileList: [],
@@ -505,6 +502,7 @@ export default {
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
       this.dialogViewSpareMoney = false
+      this.accessoryTFs = false
     },
     //下拉司机姓名改变事件
     selectdriver() {},
@@ -522,9 +520,6 @@ export default {
     uploadSuccess(data, files, url) {
       console.log(data, files, url)
     },
-    handleClose() {
-      this.accessoryTFs = false
-    },
     //导入
     import() {},
     //完货
@@ -640,7 +635,9 @@ export default {
             if (valid) {
               // this.deptBudgetList.totalStorage = this.totalStorage
               this.tranCarInfoList = this.freightspace
-              this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
+              if(this.tranCarInfoList.length > 0){
+                this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
+              }
               // this.tranCarInfoList.boxNo = this.arr.toString()
               for (var i = 0; i < this.tranCarInfoList.length; i++) {
                 this.tranCarInfoList[i].id = this.freightspace[i].id
@@ -680,16 +677,18 @@ export default {
         .toPromise()
         .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
+          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++) {

src/views/tranManagement/tranManagementShippingLook.vue

@@ -180,7 +180,7 @@
           .toPromise()
           .then((response) => {
             this.deptBudgetList = response
-            if(response.tranCarInfoList[0].shipType =='集装箱') {
+            if(response.tranCarInfoList.length > 0 &&response.tranCarInfoList[0].shipType =='集装箱') {
               this.deptBudgetList.tranCarInfoList=[this.deptBudgetList.tranCarInfoList[0]]
 
             }else{