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

src/api/V2/contract/index.js

@@ -18,6 +18,8 @@ export const API_POST_EXPORT = '/contractManagementInfo/export'
 export const API_GET_BILL_OPERATE_HIS = '/billOperateHis/query/commonBillOperateHis'
 // 修改状态
 export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'
+// 补充协议查看关联合同
+export const API_GET_RELATION_CONTRACTNO = '/contractManagementInfo/selectContract'
 //删除销售合同
 export const API_POST_CONTRACT_DELETE = '/contractManagementInfo/deleteInfo '
 //销售合同修改编辑 

src/model/contarct/index.js

@@ -14,6 +14,7 @@ import {
     API_POST_EDITSTATUS,
     API_GET_CONTRACT_MANAGEMENTINFO,
     API_POST_EDITINFO,
+    API_GET_RELATION_CONTRACTNO,
     API_POST_CONTRACT_DELETE,
     API_GET_TRAN_TASK_WAREHOUSE,
     API_GET_SELECTCONFIRMATIONSHEET,
@@ -43,6 +44,8 @@ export const export1 = appRx.get(API_POST_EXPORT)
 export const billoperatehis = appRx.get(API_GET_BILL_OPERATE_HIS, errorCatcher, errorHandle, filter)
 // 修改状态
 export const editstatus = appRx.post(API_POST_EDITSTATUS, errorCatcher, errorHandle, filter)
+// 补充协议查看关联合同
+export const getRelationContractNo = appRx.get(API_GET_RELATION_CONTRACTNO, errorCatcher, errorHandle, filter)
 //删除销售合同
 export const deletecontract = appRx.post(API_POST_CONTRACT_DELETE, errorCatcher, errorHandle, filter)
 //修改销售合同编辑

src/views/contractManagement/purchaseContractAdd.vue

@@ -28,10 +28,31 @@
         </p>
       </div>
       <ws-info-table>
+        <!--合同类型-->
+        <ws-form-item
+          label="合同类型"
+          span="1"
+          prop="agreementType"
+        >
+          <ws-select
+            v-model="deptBudgetList.agreementType"
+            placeholder
+            class="deal"
+            @change="selectType"
+          >
+            <ws-option
+              v-for="item in agreementList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+          </ws-select>
+        </ws-form-item>
         <!--合同编号-->
         <ws-form-item
           label="合同编号"
           span="1"
+          v-if="deptBudgetList.agreementType == '采购合同'"
           prop="contractNo"
           class="readonly"
           required
@@ -43,7 +64,40 @@
             size="small"
           />
         </ws-form-item>
-
+        <!--关联合同-->
+        <ws-form-item
+          prop="contractNo"
+          label="关联合同"
+          span="1"
+          v-if="deptBudgetList.agreementType == '补充协议'"
+        >
+          <ws-select
+            v-model="deptBudgetList.contractNo"
+            placeholder="请选择编号"
+            @change="selectRelation"
+          >
+            <ws-option
+              v-for="item in contractNoList"
+              :key="item.constKey"
+              :label="item.contractNo"
+              :value="item.contractNo"
+            ></ws-option>
+          </ws-select>
+        </ws-form-item>
+        <!--补充协议编号-->
+        <ws-form-item
+          v-show="deptBudgetList.agreementType == '补充协议'"
+          label="补充协议编号"
+          span="1"
+          prop="agreementNo"
+        >
+          <ws-input
+            v-model="deptBudgetList.agreementNo"
+            placeholder="请输入补充协议编号"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
         <!--运输方式-->
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input
@@ -559,6 +613,7 @@ import {
   editxiala,
   delxiala,
   getstafffind,
+  getRelationContractNo
 } from '@/model/contarct/index'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -616,12 +671,23 @@ export default {
       appendixIdsAdd: '',
       size: 10,
       unitList: [],
+      agreementList: [
+        {
+          constValue: '采购合同',
+          constKey: '1'
+        },        
+        {
+          constValue: '补充协议',
+          constKey: '2'
+        },
+      ],
+      contractNoList: [],
       goodnameList: [],
       value1: '袋装',
       value2: '未回收',
       gradeList: [],
       ChapterTwoList: [],
-
+      agreementType:'',
       deptBudgetList: {
         deliverType: '1',
         addressUrl:'',
@@ -782,6 +848,19 @@ export default {
         .then((response) => {
           this.ChapterTwoList = response
         })
+      //关联合同
+      getRelationContractNo({
+        agreementType: '采购合同',
+        goodsType: 1
+      })
+        .toPromise()
+        .then((response) => {
+          this.contractNoList = response
+        })
+    },
+    selectRelation(e){
+        // this.deptBudgetList.agreementNo = e
+        this.$set(this.deptBudgetList,'agreementNo',e)
     },
     onChange() {
      this.$refs.upload
@@ -1388,6 +1467,14 @@ export default {
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()
     },
+    //选择合同类型
+    selectType(e) {
+      for (var i = 0; i < this.invoiceList.length; i++) {
+        if (this.agreementList[i].constValue == e) {
+          this.deptBudgetList.agreementType = this.agreementList[i].constValue
+        }
+      }
+    },
     addClick() {
       this.unitList.push({
         flag: 'add',
@@ -1624,7 +1711,7 @@ export default {
 .wenzi p {
   display: inline-block;
 }
-.upload-demo{
+.upload-demo {
   margin-top: 10px;
 }
 .center {
@@ -1735,11 +1822,11 @@ export default {
 }
 //上传文件成功标识
 /deep/.el-upload-list__item-status-label {
-    position: absolute;
-    right: 22px;
-    top: -1px;
-    line-height: inherit;
-    display: none;
+  position: absolute;
+  right: 22px;
+  top: -1px;
+  line-height: inherit;
+  display: none;
 }
 .map{
   position: fixed;

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -74,29 +74,29 @@
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input @input="weightchange1" v-model="dataList.weight" placeholder="请输入重量" maxlength="120" size="small"
+            <el-input @input="weightchange1" v-model="dataList.weight" placeholder="请输入重量（吨）" maxlength="120" size="small"
               class="huom" />
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select v-model="dataList.grade" placeholder class="typeselect" @change="selectpackingMethod">
+            <el-select disabled v-model="dataList.grade" placeholder class="typeselect" @change="selectpackingMethod">
               <el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
                 :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
-            <el-input @input="bulkDensitychange" v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120"
+          <el-form-item label="容重(克/升)>=" span="1">
+            <el-input disabled @input="bulkDensitychange" v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120"
               size="small" class="huom" />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input @input="waterContentchange" v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120"
+          <el-form-item label="水分（%）<=" span="1" style="margin-left: 250px; margin-top: -40px">
+            <el-input disabled @input="waterContentchange" v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120"
               size="small" class="huom" />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
-            <el-input @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120"
+          <el-form-item  label="单价(元/吨)" span="1" style="margin-left: 500px; margin-top: -40px">
+            <el-input disabled @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120"
               size="small" class="huom" />
           </el-form-item>
           <!--预计出库日期-->
@@ -105,15 +105,15 @@
               value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter"
               @change="selectstaff">
               <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="20">
-            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
+            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字" maxlength="150" size="large" />
           </el-form-item>
         </el-form>
       </div>
@@ -169,7 +169,7 @@
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量" maxlength="120" size="small"
+            <el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）" maxlength="120" size="small"
               class="huom" />
           </el-form-item>
           <!-- 品级 -->
@@ -201,15 +201,15 @@
               value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="入库经办人">
+          <!-- <el-form-item label="入库经办人">
             <el-select v-model="dataList1.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter1"
               @change="selectstaff1">
               <el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
-            <el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
+            <el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字" maxlength="150" size="large" />
           </el-form-item>
         </el-form>
       </div>
@@ -265,7 +265,7 @@
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.weight" placeholder="请输入重量"
+            <el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.weight" placeholder="请输入重量（吨）"
               maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!-- 品级 -->
@@ -297,15 +297,15 @@
               value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter"
               @change="selectstaff">
               <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item label="业务描述">
-            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
+            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字" maxlength="150" size="large" />
           </el-form-item>
         </el-form>
       </div>
@@ -606,7 +606,7 @@
                   this.$set(this.dataList, 'gradeKey', response.gradeKey)
                   this.$set(this.dataList, 'waterContent', response.waterContent)
                   this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
-                  this.$set(this.dataList, 'weight', response.weight)
+                  // this.$set(this.dataList, 'weight', response.weight)
                   this.$set(
                     this.dataList,
                     'unitPrice',
@@ -749,7 +749,7 @@
             this.dataList.weight > 200000
           ) {
             this.$message({
-              message: '重量输入有误！',
+              message: '重量（吨）输入有误！',
               type: 'warning'
             })
             return
@@ -838,13 +838,13 @@
             })
             return
           }
-          if (!this.dataList.agent) {
-            this.$message({
-              message: '出库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
+          // if (!this.dataList.agent) {
+          //   this.$message({
+          //     message: '出库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.dataList.businessDescribe) {
             this.$message({
               message: '业务描述不能为空！',
@@ -886,7 +886,7 @@
             this.dataList1.weight > 200000
           ) {
             this.$message({
-              message: '重量输入有误！',
+              message: '重量（吨）输入有误！',
               type: 'warning'
             })
             return
@@ -978,13 +978,13 @@
             })
             return
           }
-          if (!this.dataList1.agent) {
-            this.$message({
-              message: '入库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
+          // if (!this.dataList1.agent) {
+          //   this.$message({
+          //     message: '入库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.dataList1.businessDescribe) {
             this.$message({
               message: '业务描述不能为空！',
@@ -1032,7 +1032,7 @@
             this.dataList1.weight > 200000
           ) {
             this.$message({
-              message: '重量输入有误！',
+              message: '重量（吨）输入有误！',
               type: 'warning'
             })
             return
@@ -1131,20 +1131,20 @@
             })
             return
           }
-          if (!this.dataList.agent) {
-            this.$message({
-              message: '出库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.dataList1.agent) {
-            this.$message({
-              message: '入库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
+          // if (!this.dataList.agent) {
+          //   this.$message({
+          //     message: '出库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
+          // if (!this.dataList1.agent) {
+          //   this.$message({
+          //     message: '入库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.dataList1.businessDescribe) {
             this.$message({
               message: '业务描述不能为空！',
@@ -1200,7 +1200,7 @@
             this.dataList1.weight > 200000
           ) {
             this.$message({
-              message: '重量输入有误！',
+              message: '重量（吨）输入有误！',
               type: 'warning'
             })
             return
@@ -1299,20 +1299,20 @@
             })
             return
           }
-          if (!this.dataList.agent) {
-            this.$message({
-              message: '出库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.dataList1.agent) {
-            this.$message({
-              message: '入库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
+          // if (!this.dataList.agent) {
+          //   this.$message({
+          //     message: '出库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
+          // if (!this.dataList1.agent) {
+          //   this.$message({
+          //     message: '入库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.dataList.businessDescribe) {
             this.$message({
               message: '业务描述不能为空！',

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -148,7 +148,7 @@
             <el-input
               disabled
               v-model="dataList.weight"
-              placeholder="请输入重量"
+              placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
               class="huom"
@@ -214,7 +214,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select
               disabled
               v-model="dataList.agent"
@@ -230,7 +230,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
             <el-input
@@ -361,7 +361,7 @@
             <el-input
               @input="weightchange"
               v-model="dataList1.weight"
-              placeholder="请输入重量"
+              placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
               class="huom"
@@ -431,7 +431,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="入库经办人">
+          <!-- <el-form-item label="入库经办人">
             <el-select
               disabled
               v-model="dataList1.agent"
@@ -447,7 +447,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
             <el-input
@@ -574,7 +574,7 @@
             <el-input
               disabled
               v-model="dataList.weight"
-              placeholder="请输入重量"
+              placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
               class="huom"
@@ -640,7 +640,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select
               v-model="dataList.agent"
               placeholder="请选择经办人"
@@ -655,7 +655,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item label="业务描述">
             <el-input
@@ -929,7 +929,7 @@ export default {
                 this.$set(this.dataList, 'gradeKey', response.gradeKey)
                 this.$set(this.dataList, 'waterContent', response.waterContent)
                 this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
-                this.$set(this.dataList, 'weight', response.weight)
+                // this.$set(this.dataList, 'weight', response.weight)
                 this.$set(
                   this.dataList,
                   'unitPrice',

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -147,7 +147,7 @@
           <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               v-model="dataList.weight"
-              placeholder="请输入重量"
+              placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
               class="huom"
@@ -212,7 +212,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select
               v-model="dataList.agent"
               placeholder="请选择经办人"
@@ -227,7 +227,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
             <el-input
@@ -346,7 +346,7 @@
             <el-input
               @input="weightchange"
               v-model="dataList1.weight"
-              placeholder="请输入重量"
+              placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
               class="huom"
@@ -415,7 +415,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="入库经办人">
+          <!-- <el-form-item label="入库经办人">
             <el-select
               v-model="dataList1.agent"
               placeholder="请选择经办人"
@@ -430,7 +430,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
             <el-input
@@ -548,7 +548,7 @@
             <el-input
               :disabled="dataList.taskTypeKey == 4"
               v-model="dataList.weight"
-              placeholder="请输入重量"
+              placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
               class="huom"
@@ -614,7 +614,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select
               v-model="dataList.agent"
               placeholder="请选择经办人"
@@ -629,7 +629,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item label="业务描述">
             <el-input
@@ -865,7 +865,7 @@ export default {
                 this.$set(this.dataList, 'gradeKey', response.gradeKey)
                 this.$set(this.dataList, 'waterContent', response.waterContent)
                 this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
-                this.$set(this.dataList, 'weight', response.weight)
+                // this.$set(this.dataList, 'weight', response.weight)
                 this.$set(
                   this.dataList,
                   'unitPrice',
@@ -966,7 +966,7 @@ export default {
           this.dataList.weight > 200000
         ) {
           this.$message({
-            message: '重量输入有误！',
+            message: '重量（吨）输入有误！',
             type: 'warning'
           })
           return
@@ -1055,13 +1055,13 @@ export default {
           })
           return
         }
-        if (!this.dataList.agent) {
-          this.$message({
-            message: '出库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
+        // if (!this.dataList.agent) {
+        //   this.$message({
+        //     message: '出库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
         if (!this.dataList.businessDescribe) {
           this.$message({
             message: '业务描述不能为空！',
@@ -1102,7 +1102,7 @@ export default {
           this.dataList1.weight > 200000
         ) {
           this.$message({
-            message: '重量输入有误！',
+            message: '重量（吨）输入有误！',
             type: 'warning'
           })
           return
@@ -1194,13 +1194,13 @@ export default {
           })
           return
         }
-        if (!this.dataList1.agent) {
-          this.$message({
-            message: '入库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
+        // if (!this.dataList1.agent) {
+        //   this.$message({
+        //     message: '入库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
         if (!this.dataList1.businessDescribe) {
           this.$message({
             message: '业务描述不能为空！',
@@ -1251,7 +1251,7 @@ export default {
           this.dataList1.weight > 200000
         ) {
           this.$message({
-            message: '重量输入有误！',
+            message: '重量（吨）输入有误！',
             type: 'warning'
           })
           return
@@ -1350,20 +1350,20 @@ export default {
           })
           return
         }
-        if (!this.dataList.agent) {
-          this.$message({
-            message: '出库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.agent) {
-          this.$message({
-            message: '入库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
+        // if (!this.dataList.agent) {
+        //   this.$message({
+        //     message: '出库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
+        // if (!this.dataList1.agent) {
+        //   this.$message({
+        //     message: '入库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
         if (!this.dataList1.businessDescribe) {
           this.$message({
             message: '业务描述不能为空！',

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -310,10 +310,10 @@
             />
           </el-upload>
           <div class="tupian">
-            <span v-if="deptBudgetList.tranCarInfoList[0].loadPoundImg != null"
+            <span v-if="deptBudgetList.tranCarInfoList[0]&&deptBudgetList.tranCarInfoList[0].loadPoundImg != null"
               >1</span
             >
-            <span v-if="deptBudgetList.tranCarInfoList[0].loadPoundImg == null"
+            <span v-if="deptBudgetList.tranCarInfoList[0]&&deptBudgetList.tranCarInfoList[0].loadPoundImg == null"
               >未上传</span
             >
           </div>
@@ -487,7 +487,7 @@ export default {
                 var reader = new FileReader();
                 //if (!FileReader.prototype.readAsBinaryString) {
                 FileReader.prototype.readAsBinaryString = function (f) {
-                    var binary = "";
+                    var binary = '';
                     var rABS = false; //是否将文件读取为二进制字符串
                     var pt = this;
                     var wb; //读取完成的数据

src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -226,7 +226,7 @@
                   alt=""
                 />
                 <span
-                  v-if="
+                  v-if="deptBudgetList.tranCarInfoList[0]&&
                     deptBudgetList.tranCarInfoList[0].loadPoundImgArr
                       .length > 0
                   "
@@ -235,7 +235,7 @@
                   }}</span
                 >
                  <span
-                  v-if="
+                  v-if="deptBudgetList.tranCarInfoList[0]&&
                     deptBudgetList.tranCarInfoList[0].loadPoundImgArr
                       .length == 0
                   "
@@ -456,11 +456,11 @@ export default {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
             }
-            if (this.deptBudgetList.tranCarInfoList[i].loadPoundImg != null) {
+            if (this.deptBudgetList.tranCarInfoList[i]&&this.deptBudgetList.tranCarInfoList[i].loadPoundImg != null) {
               this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr =
-                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+              this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
               this.fileList[i] =
-                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+              this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
             } else {
               this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr = []
             }