Merge branch 'dev' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc into dev

src/views/contractManagement/collectionContractEdit.vue

@@ -1228,6 +1228,9 @@
           .then(() => {
             this.$refs.deptBudgetList.validate((valid) => {
               if (valid) {
+                if(this.deptBudgetList.personPhone){
+                  this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.toString()
+                }
                 this.deptBudgetList.compId = this.compId
                 this.deptBudgetList.contractType = 1
                 editInfo(this.deptBudgetList)

src/views/contractManagement/collectionContractRecord.vue

@@ -171,8 +171,15 @@
             <div class="upLoad">
               <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
                 :on-success="handleAvatarSuccess">
-                <img v-if="imageUrl" :src="imageUrl" class="avatar" />
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                
+                <div v-if='imageUrl.length>0'>
+                  <div style='display:inline-block;' v-for='item in imageUrl'>
+                    <img :src="item" class="avatar" />
+                  </div>
+                </div>
+                <i class="el-icon-plus avatar-uploader-icon"></i>
+                
+                
               </el-upload>
             </div>
           </ws-info-table>
@@ -199,8 +206,14 @@
             <div class="upLoad">
               <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
                 :on-success="handleAvatarSuccess">
-                <img v-if="imageUrl" :src="imageUrl" class="avatar" />
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <!-- <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i> -->   
+                <div v-if='imageUrl.length>0'>
+                  <div style='display:inline-block;' v-for='item in imageUrl'>
+                    <img :src="item" class="avatar" />
+                  </div>
+                </div>
+                <i class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
           </ws-info-table>
@@ -448,7 +461,7 @@
         showPayImgs: false,
         isShowAdopt: false,
         //上传截图路径
-        imageUrl: '',
+        imageUrl:[],
         payImg: [],
         rowData: {},
         value2: [],
@@ -551,6 +564,7 @@
               message: '导入成功！'
             })
             this.selectCollectionWarehousingRecordPage()
+            this.getList()
             // debugger
             // if (response.length != 0) {
             //   const h = this.$createElement;
@@ -982,7 +996,7 @@
         editCollectionWarehousingRecord(this.customerObj)
           .toPromise()
           .then((response) => {
-            debugger
+            // debugger
             this.$message({
               message: '编辑成功！',
               type: 'success',
@@ -1031,7 +1045,7 @@
 
       //上传付款截图
       handleAvatarSuccess(e) {
-        this.imageUrl = e.url
+        this.imageUrl.push(e.url)
       },
       printBig() {
         let _list2 = []
@@ -1067,7 +1081,7 @@
           .toPromise()
           .then((response) => {
             this.recordList = response.records
-            // this.deptBudgetTotal = response.total
+            this.deptBudgetTotal = response.total
           })
         // getJurisdiction({
         //   managementType: 1,
@@ -1144,7 +1158,7 @@
               collectionWarehousingRecordList: this.modification,
               money: this.collectionments.money,
               collectionDate: this.collectionments.collectionDate,
-              collectionScreenshot: this.imageUrl,
+              collectionScreenshot: this.imageUrl.toString(),
             })
             .toPromise()
             .then((response) => {
@@ -1153,6 +1167,7 @@
               this.collectionDate = ''
               this.collectionScreenshot = ''
               this.collectForm = false
+              this.imageUrl=[]
               this.getList()
             })
         })
@@ -1223,7 +1238,7 @@
           })
           return
         }
-        this.payments.paymentScreenshot = this.imageUrl
+        this.payments.paymentScreenshot = this.imageUrl.toString()
         delete this.payments.amountNotPayable
         // this.payments.cashier = localStorage.getItem('ws-pf_staffName')
         this.payments.collectionWarehousingRecordList = this.modification
@@ -1241,6 +1256,7 @@
                   title: '成功',
                   message: '付款成功',
                 })
+                this.imageUrl=[]
                 this.paymentForm = false
                 this.getList()
               })
@@ -1494,7 +1510,7 @@
     height: 178px;
     border: 1px solid #8890b1;
     border-radius: 5px;
-    display: block;
+    display: inline-block;
   }
 
   .pay_img {

src/views/contractManagement/salesContractEdit.vue

@@ -15,7 +15,7 @@
          <div class="remark">
       <h3>基本信息</h3>
       <p style="color: #8890b1">
-          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
+          &nbsp;&nbsp;注：基本信息均为必填项，“<span style="color:red">*</span>”
           标记的条目提交后不可修改。
         </p>
     </div>
@@ -106,7 +106,7 @@
           </ws-form-item>
           <!--卖方电话-->
           <ws-form-item label="卖方电话" span="1" prop="contractNo">
-            <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖房电话" maxlength="100" size="small" />
+            <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" />
           </ws-form-item>
           <!--验收方式-->
           <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
@@ -560,32 +560,6 @@
           })
           .toPromise()
           .then((response) => {
-            var tmp = []
-            tmp[0] = TextToCode[response.sourceProvince].code
-            tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
-            if (tmp[0] == 810000 || tmp[0] == 820000) {
-              tmp[2] = null
-            } else {
-              tmp[2] =
-                TextToCode[response.sourceProvince][response.sourceCity][
-                  response.sourceArea
-                ].code
-            }
-            this.selectedOptions = tmp
-            var tmp1 = []
-            tmp1[0] = TextToCode[response.deliveryProvince].code
-            tmp1[1] =
-              TextToCode[response.deliveryProvince][response.deliveryCity].code
-            if (tmp1[0] == 810000 || tmp1[0] == 820000) {
-              tmp1[2] = null
-            } else {
-              tmp1[2] =
-                TextToCode[response.deliveryProvince][response.deliveryCity][
-                  response.deliveryArea
-                ].code
-            }
-
-            this.selectedOptions1 = tmp1
             this.deptBudgetList = response
             if (this.deptBudgetList.deliverType == 1) {
               this.deptBudgetList.deliverType1 = '我方送货'
@@ -1041,13 +1015,6 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
-          this.$message({
-            message: '请输入水分',
-            type: 'warning',
-          })
-          return
-        }
         if (
           this.deptBudgetList.contractGoodsInfo.waterContent &&
           String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
@@ -1069,13 +1036,6 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.impurity) {
-          this.$message({
-            message: '请输入杂质',
-            type: 'warning',
-          })
-          return
-        }
         if (
           this.deptBudgetList.contractGoodsInfo.impurity &&
           String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
@@ -1089,13 +1049,6 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
-          this.$message({
-            message: '请输入容重',
-            type: 'warning',
-          })
-          return
-        }
         if (
           (this.deptBudgetList.contractGoodsInfo.bulkDensity &&
             String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
@@ -1110,13 +1063,6 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
-          this.$message({
-            message: '请输入霉变粒',
-            type: 'warning',
-          })
-          return
-        }
         if (
           !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
           (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
@@ -1136,13 +1082,6 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
-          this.$message({
-            message: '请输入热损伤',
-            type: 'warning',
-          })
-          return
-        }
         if (
           !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
           (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
@@ -1161,13 +1100,6 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
-          this.$message({
-            message: '请输入不完善粒',
-            type: 'warning',
-          })
-          return
-        }
         if (
           !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
           (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(

src/views/contractManagement/storageContract.vue

@@ -51,7 +51,7 @@
       </el-table-column>
       <el-table-column prop="grainMoney" label="粮款（元）"> </el-table-column>
       <el-table-column prop="storageFeeNew" label="代储费（元）"> </el-table-column>
-      <el-table-column width='120' prop="total" label="合计应收（元）"> 
+      <el-table-column width='120' prop="total" label="合计应收（元）">
       </el-table-column>
       <el-table-column prop="received" label="已收（元）"> </el-table-column>
       <el-table-column width='120' prop="goodsNames" label="已开发票（元）"> </el-table-column>
@@ -185,23 +185,16 @@
     data() {
       return {
         id: '',
+        size:0,
         //弹出框
         dialogViewSpareMoney: false,
-        dialogApproveFormVisible: false,
-        // 船舶类型
-        monetaryKey: null,
-        // 表格显示数据
-        tableDate: [],
-        size: 10,
         // 是否显示
         // showType: true,
         // 年
         year: '',
-        deliver_type: 1,
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 9999,
-        appendixIdsAdd: '',
         searchType: 1,
         searchTypeText: '未完成',
         searchKeyWord: '',
@@ -210,9 +203,6 @@
         startDate: null,
         endDate: null,
         addressUrls: [],
-        accesscard: false,
-        // 提交类型
-        submitType: true,
         deptCircularPage: {},
         date: {
           year: dayjs().format('YYYY'),
@@ -222,13 +212,7 @@
         deptBudgetList: {},
         historyList: [],
         appendixIdss: [],
-        fileList: [],
         compId: localStorage.getItem('ws-pf_compId'),
-        pickerBeginDateBefore: {
-          disabledDate: (time) => {
-            return time.getTime() > Date.now()
-          },
-        },
         accessoryTFs: false,
         taskTypeList: [{
             value: '未完成',
@@ -286,7 +270,6 @@
             },
           ],
         },
-        value1: '',
         value2: '',
       }
     },
@@ -363,7 +346,7 @@
             pageSize: this.pageSize,
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
-            agreementType:'代储合同',
+            agreementType: '代储合同',
             startDate: this.startDate,
             endDate: this.endDate,
             contrPage: this.contrPage,
@@ -374,19 +357,23 @@
               if (response.records[i].completedQuantity) {
                 response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
               }
-              if(response.records[i].grainMoney&&response.records[i].storageFeeNew){
-                response.records[i].total = response.records[i].grainMoney+response.records[i].storageFeeNew
-              }else if(response.records[i].grainMoney){
+              if (response.records[i].grainMoney && response.records[i].storageFeeNew) {
+                response.records[i].total = response.records[i].grainMoney + response.records[i].storageFeeNew
+              } else if (response.records[i].grainMoney) {
                 response.records[i].total = response.records[i].grainMoney
-              }else if(response.records[i].storageFeeNew){
+              } else if (response.records[i].storageFeeNew) {
                 response.records[i].total = response.records[i].storageFeeNew
+              }else{
+                response.records[i].total = 0
               }
-               if(response.records[i].grainMoneyEd&&response.records[i].depositReceived){
-                response.records[i].received = response.records[i].grainMoneyEd+response.records[i].depositReceived
-              }else if(response.records[i].grainMoneyEd){
+              if (response.records[i].grainMoneyEd && response.records[i].depositReceived) {
+                response.records[i].received = response.records[i].grainMoneyEd + response.records[i].depositReceived
+              } else if (response.records[i].grainMoneyEd) {
                 response.records[i].received = response.records[i].grainMoneyEd
-              }else if(response.records[i].depositReceived){
+              } else if (response.records[i].depositReceived) {
                 response.records[i].received = response.records[i].depositReceived
+              }else{
+                response.records[i].received = 0
               }
               if (response.records[i].addressUrl != null) {
                 if (response.records[i].addressUrl) {
@@ -517,17 +504,17 @@
         const {
           data
         } = await export3({
-         compId: localStorage.getItem('ws-pf_compId'),
-            contractType: this.contractType,
-            goodsType: this.goodsType,
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchType: this.searchType,
-            searchKeyWord: this.searchKeyWord,
-            agreementType:'代储合同',
-            startDate: this.startDate,
-            endDate: this.endDate,
-            contrPage: this.contrPage,
+          compId: localStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          goodsType: this.goodsType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          agreementType: '代储合同',
+          startDate: this.startDate,
+          endDate: this.endDate,
+          contrPage: this.contrPage,
         }, {}, {
           responseType: 'blob',
         }).toPromise()
@@ -577,7 +564,12 @@
         this.$router.push({
           name: 'storageContractRecord',
           query: {
-            id: row.id,
+            contractNo: row.contractNo,
+            buyer: row.buyer,
+            weight: row.weight,
+            completedQuantity: row.completedQuantity,
+            total: row.total,
+            received: row.received,
           },
         })
       },

src/views/contractManagement/storageContractAdd.vue

@@ -161,7 +161,7 @@
             <ws-input v-model="deptBudgetList.placeDelivery" placeholder="请输入交货详细地址" maxlength="20" size="small" />
           </ws-form-item>
           <ws-form-item label="代储费(元/吨·天)" span="1" prop="storageFee">
-            <ws-input v-model="deptBudgetList.storageFee" placeholder="请输入仓储费" maxlength="20" size="small" />
+            <ws-input v-model="deptBudgetList.storageFeeNew" placeholder="请输入仓储费" maxlength="20" size="small" />
           </ws-form-item>
           <!--合同单价（元/吨）-->
         <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice">
@@ -868,7 +868,7 @@
           })
           return
         }
-        if (!this.deptBudgetList.storageFee) {
+        if (!this.deptBudgetList.storageFeeNew) {
           this.$message({
             message: '代储费不能为空！',
             type: 'warning',
@@ -883,13 +883,13 @@
           return
         }
         if (
-          isNaN(this.deptBudgetList.storageFee) ||
-          (String(this.deptBudgetList.storageFee).indexOf('.') != -1 &&
-            String(this.deptBudgetList.storageFee).length -
-            (String(this.deptBudgetList.storageFee).indexOf('.') + 1) >
+          isNaN(this.deptBudgetList.storageFeeNew) ||
+          (String(this.deptBudgetList.storageFeeNew).indexOf('.') != -1 &&
+            String(this.deptBudgetList.storageFeeNew).length -
+            (String(this.deptBudgetList.storageFeeNew).indexOf('.') + 1) >
             2) ||
-          this.deptBudgetList.storageFee < 0 ||
-          this.deptBudgetList.storageFee > 1000
+          this.deptBudgetList.storageFeeNew < 0 ||
+          this.deptBudgetList.storageFeeNew > 1000
         ) {
           this.$message({
             message: '代储费填写错误！',
@@ -1333,7 +1333,7 @@
               this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.toString()
             }
             this.deptBudgetList.compId = this.compId
-            this.deptBudgetList.contractType = 4
+            this.deptBudgetList.contractType = 1
             this.deptBudgetList.goodsType = 1
             addList(this.deptBudgetList)
               .toPromise()

src/views/contractManagement/storageContractEdit.vue

@@ -1414,6 +1414,7 @@
           .then(() => {
             this.$refs.deptBudgetList.validate((valid) => {
               if (valid) {
+                
                 this.deptBudgetList.compId = this.compId
                 this.deptBudgetList.contractType = 1
                 editInfo(this.deptBudgetList)

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -829,9 +829,13 @@
             if (index === 0) {
               sums[index] = '合计'
             } else if (
+              index === 7 ||
+              index === 8 ||
+              index === 9 ||
               index === 10 ||
               index === 11 ||
               index === 13 ||
+              index === 14 ||
               index === 12
             ) {
               const values = data.map((item) => Number(item[column.property]))