前端 sdy

src/views/contractManagement/purchaseContract.vue

@@ -48,7 +48,6 @@
             style="color: #8890b1"
           />
         </ws-select>
-
         <el-date-picker
           v-model="value2"
           type="daterange"
@@ -68,7 +67,6 @@
           type="input"
           class="findValue"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
@@ -122,10 +120,10 @@
       <el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
       <el-table-column prop="buyer" label="买方"> </el-table-column>
       <el-table-column prop="seller" label="卖方"> </el-table-column>
-      <el-table-column prop="imperfectGrain" label="已完成（吨）">
+      <el-table-column prop="completedQuantity" label="已完成（吨）">
         <template slot-scope="scope">
           <span style="color: #5473e8; font-weight: 600">{{
-            scope.row.imperfectGrain
+            scope.row.completedQuantity
           }}</span>
         </template>
       </el-table-column>
@@ -199,10 +197,9 @@
             @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> -->
+          <span v-if="scope.row.addressUrlArray != null">
+            {{scope.row.addressUrlArray.length == 0? "":scope.row.addressUrlArray.length}}
+            </span>
         </template>
       </el-table-column>
       <el-table-column prop="address" label="操作" width="200">
@@ -513,12 +510,16 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             if (response.records[i].addressUrl != null) {
+              if(response.records[i].addressUrl){
               response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')
+                }
             } else {
               response.records[i].addressUrlArray = []
             }
           }
+          console.log( response.records[2].addressUrl == null)
+          console.log( response.records[2].addressUrl == "")
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total

src/views/contractManagement/purchaseContractAdd.vue

@@ -694,9 +694,6 @@ export default {
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
     this.deptBudgetList.packingMethod = '散装'
     this.deptBudgetList.packingMethodKey = 1
     this.deptBudgetList.contractGoodsInfo.goodsName = '玉米'
@@ -1062,7 +1059,7 @@ export default {
       }
       if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
         this.$message({
-          message: '请选择水分',
+          message: '请输入水分',
           type: 'warning',
         })
         return

src/views/contractManagement/purchaseContractEdit.vue

@@ -1092,7 +1092,7 @@ export default {
       }
       if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
         this.$message({
-          message: '请选择水分',
+          message: '请输入水分',
           type: 'warning',
         })
         return

src/views/contractManagement/salesContract.vue

@@ -124,17 +124,17 @@
       <el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
       <el-table-column prop="buyer" label="买方"> </el-table-column>
       <el-table-column prop="seller" label="卖方"> </el-table-column>
-      <el-table-column prop="imperfectGrain" label="已完成（吨）">
+      <el-table-column prop="completedQuantity" label="已完成（吨）">
         <template slot-scope="scope">
           <span
             v-if="scope.row.proportion < 90"
             style="color: #5473e8; font-weight: 600"
-            >{{ scope.row.imperfectGrain }}</span
+            >{{ scope.row.completedQuantity }}</span
           >
           <span
             v-if="scope.row.proportion > 90"
             style="color: red; font-weight: 600"
-            >{{ scope.row.imperfectGrain }}</span
+            >{{ scope.row.completedQuantity }}</span
           >
         </template>
       </el-table-column>
@@ -203,8 +203,8 @@
             @click="fujian(scope.row)"
             alt=""
           />
-          <span v-if="scope.row.addressUrlArray.length > 0">{{
-            scope.row.addressUrlArray.length
+          <span v-if="scope.row.addressUrlArray != null">{{
+            scope.row.addressUrlArray.length == 0 ? "":scope.row.addressUrlArray.length
           }}</span>
           <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
         </template>
@@ -486,11 +486,14 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray =
+              if(response.records[i].addressUrl != ""){
+                response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')
+              }
             } else {
               response.records[i].addressUrlArray = []
             }
+
             if (response.records[i].imperfectGrain != null) {
               response.records[i].proportion =
                 Math.floor(

src/views/contractManagement/salesContractAdd.vue

@@ -1040,7 +1040,7 @@ export default {
       }
       if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
         this.$message({
-          message: '请选择水分',
+          message: '请输入水分',
           type: 'warning',
         })
         return

src/views/contractManagement/salesContractEdit.vue

@@ -1082,7 +1082,7 @@ export default {
       }
       if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
         this.$message({
-          message: '请选择水分',
+          message: '请输入水分',
           type: 'warning',
         })
         return