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

public/static/warehousePrint.html

@@ -300,8 +300,8 @@
         this.date = new Date().toLocaleString()
         this.type = decodeURIComponent(this.getQueryVariable('type'))
         this.warehouseName = decodeURIComponent(this.getQueryVariable('warehouseName'))
-        this.startDate = this.getQueryVariable('startDate')
-        this.endDate = this.getQueryVariable('endDate')
+        this.startDate = this.getQueryVariable('startDate').replace('%20',' ')
+        this.endDate = this.getQueryVariable('endDate').replace('%20',' ')
         this.printData = JSON.parse(sessionStorage.getItem('inOutWarehouse_Print'))
         for (var count = 0; count < this.printData.length; count++) {
           this.maoZhong += this.printData[count].grossWeight

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -3355,7 +3355,11 @@ export default {
           this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
         ) {
           if(this.outContractNo[i].priceType == "定价收购"){
+            if( this.deptBudgetList.type == "潮粮"){
+           this.deptBudgetList.tidalGrainPrice = Number(this.outContractNo[i].unitContractPrice/1000).toFixed(2)
+            }else{
             this.deptBudgetList.dryGrainPrice = Number(this.outContractNo[i].unitContractPrice/1000).toFixed(2)
+            }
           }
           if(this.serviceManagementType==3){
             var arr=this.goodnameList.filter((item)=>{return item.goodsName==this.outContractNo[i].goodsName})

src/views/houseSelfCollect/paymentManagement.vue

@@ -580,6 +580,7 @@
               let obj = {}
               //xxx代表列名
               obj.qualityNo = v.业务编号
+              obj.contractNo = v.合同编号
               obj.customerName = v.客户姓名
               obj.customerNumberCard = v.身份证号
               obj.customerPhone = v.客户手机号

src/views/profitable/expensemanagementdetails.vue

@@ -243,9 +243,15 @@
       },
       fujian(row) {
         this.id = row.id
-        this.fujianshow = true
+        
         if(row.addressUrl){
          this.appendixIdss=row.addressUrl
+         this.fujianshow = true
+        }else{
+          this.$message({
+                message: '暂无附件查看!',
+                type: 'warning',
+              })
         }
       },
       look(row){

src/views/statisticalReport/autoSettlementList.vue

@@ -161,7 +161,7 @@
           </el-table-column>
           <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
           <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
-        <el-table-column width="100" class="table_td" label="应付金额(元)" prop="amountIngPayable"></el-table-column>
+        <!-- <el-table-column width="100" class="table_td" label="应付金额(元)" prop="amountIngPayable"></el-table-column> -->
         <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
         <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable"><template
             slot-scope="scope">
@@ -520,7 +520,7 @@ export default {
         this.$refs.upload
           .handleSaveBill()
           .then(async response => {
-            this.paymentScreenshot = response
+            this.deptBudgetList.addressUrl = response
           })
           .catch(res => {
             EventBus.$emit('error', (JSON.parse(res) || {}).message)
@@ -713,7 +713,7 @@ export default {
             // amountNotPayable: this.modification[0].amountNotPayable,
             money: this.money,
             paymentDate: this.paymentDate,
-            paymentScreenshot: this.paymentScreenshot,
+            paymentScreenshot: this.deptBudgetList.addressUrl,
           })
             .toPromise()
             .then((response) => {
@@ -811,6 +811,7 @@ export default {
       for (var i = 0; i < this.modification.length; i++) {
         this.amountEdPayable += this.modification[i].amountEdPayable
       }
+      this.alreadyInvoice=this.amountEdPayable
       this.dialogFormVisible2 = true
     },
     submitBatchInvoice() {
@@ -1213,7 +1214,7 @@ export default {
             response.records[i].deductionAmountchange = false
             response.records[i].amountIngPayable = response.records[i].amountIngPayable.toFixed(2)
             response.records[i].amountEdPayable = response.records[i].amountEdPayable.toFixed(2)
-            response.records[i].amountNotPayable = (response.records[i].amountIngPayable - response.records[i]
+            response.records[i].amountNotPayable = (response.records[i].totalPayable - response.records[i]
               .amountEdPayable).toFixed(2)
             if (response.records[i].tranPriceApproveList) {
               for (var j = 0; j < response.records[i].tranPriceApproveList.length; j++) {

src/views/statisticalReport/shippingList.vue

@@ -28,7 +28,7 @@
           </el-select>
           <el-select v-model="taskNo" placeholder="请选择运输任务编号" clearable filterable @change="taskNochange"
             maxlength="500" type="input" class="findValue">
-            <el-option v-for="item in taskNoList" :key="item.taskNoKey" :label="item.taskNoValue"
+            <el-option v-for="item in taskNoList" :key="'task'+item.taskNoKey" :label="item.taskNoValue"
               :value="item.taskNoValue" />
           </el-select>
           <!-- <el-select v-model="processNo" placeholder="请选择运输阶段编号" clearable filterable @change="processNochange"
@@ -55,7 +55,7 @@
             <span style="display:inline-block;margin-right:10px;">船名：{{shipName}}</span> 
             <span style="display:inline-block;margin-right:10px;">航次：{{shipNo}}</span>  
             <div style="display:inline-block;margin-right:10px;"> 水单装船重量（吨）：<span v-if="shippedWeight>0">{{shippedWeight}}<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png" @click="fujian1(scope.row)" alt="" /></span><ws-button v-if="shippedWeight==0" type="primary" @click="handlefeedback()">反馈</ws-button></div>
+            src="../../../public/img/fujian.png" @click="fujian1()" alt="" /></span><ws-button v-if="shippedWeight==0" type="primary" @click="handlefeedback()">反馈</ws-button></div>
           </div>
         </el-col>
       </el-row>
@@ -84,7 +84,7 @@
         <span class="span_text">{{ priceStatus }}</span>
       </div>
 
-      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px"
+      <el-table  show-summary :summary-method="getSummaries" class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px"
         ref="warehouseList.records" @row-click="handleRowClick" @selection-change="handleSelectionChange">
         <!-- <el-table-column
           :selectable="selectInit"
@@ -167,7 +167,7 @@
     <!--账户-->
     <el-dialog width="30%" title="账户信息" :visible.sync="dialogFormVisible8" :append-to-body="true">
       <h3 style="margin-left: 30px">{{ driverPayeeList.payeeName }}的账户</h3>
-      <div v-for="(item, index) in driverPayeeList" :key="index">
+      <div v-for="(item, index) in driverPayeeList" :key="'zh'+index">
         <h4 style="margin-left: 30px">账户-{{ index + 1 }}</h4>
         <div class="anniu">
           <el-radio-group @change="bankCard(item, id)" v-model="item.radio">
@@ -228,10 +228,13 @@
         <el-form-item label="重量（吨）" >
           <el-input type='number' v-model="shippedWeight" autocomplete="off" placeholder="输入水单装船重量"></el-input>
         </el-form-item>
-      </el-form>
-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure" 
+        <el-form-item label="水单截图" >
+          <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure" 
         @onChange="onChange"
 				accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
+        </el-form-item>
+      </el-form>
+        
       <div slot="footer" class="dialog-footer">
         <el-button @click="editshow = false">取 消</el-button>
         <el-button @click="taskconfirm">确定</el-button>
@@ -244,7 +247,7 @@
     </WinseaContentModal>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="accessoryTFs = false">
-      <div v-for="(item, index) in paymentScreenshotList" :key="index">
+      <div v-for="(item, index) in paymentScreenshotList" :key="'fj'+index">
         <!-- <ws-upload ref="upload" :comp-id="compId" :appendix-ids="item" :editable="false"
 				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
         <img :src="item" alt="附件" class="img_css" />
@@ -300,6 +303,7 @@
         alreadyInvoice: '',
         needReapply: true,
         taskform:{},
+        accessoryTFs1:false,
         dialogFormVisible1: false,
         dialogFormVisible2: false,
         dialogFormVisible3: false,
@@ -410,6 +414,7 @@
         paymentScreenshotUrls: [],
         carryovercontractnolist: [],
         historyList: [],
+        taskNoList1:[],
         pickerBeginDateBefore: {
           disabledDate: (time) => {
             return time.getTime() > Date.now()
@@ -422,10 +427,55 @@
       }
     },
     activated() {
+      this.contractNoList = []
+        getYunShuXiaLa({
+            flag: 1,
+          })
+          .toPromise()
+          .then((response) => {
+            for (let i = 0; i < response.length; i++) {
+              this.contractNoList.push({
+                constKey: i,
+                contractNo: response[i],
+              })
+            }
+            this.contractNoList.unshift({
+              contractNo: '全部合同'
+            })
+            this.options = this.contractNoList
+          })
       this.getList()
       this.showType = this.isShow
     },
     methods: {
+      getSummaries(param) {
+        const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            if(index==9||index==10){
+              sums[index] = values.reduce((prev, curr) => {
+                const value = Number(curr);
+                if (!isNaN(value)) {
+                  return prev + curr;
+                } else {
+                  return prev;
+                }
+              }, 0).toFixed(2)
+            }
+            
+          } else {
+            sums[index] = '';
+          }
+        });
+
+        return sums;
+      },
       onChange() {
         this.$refs.upload
           .handleSaveBill()
@@ -441,12 +491,27 @@
         this.editshow=true
       },
       taskconfirm(){
-        edittrantask({id:this.currecttask.id,shippedWeight:this.shippedWeight,enclosure:this.enclosure,tranProcessInfoList:[]}).toPromise().then((response) => {
+        if(!this.shippedWeight){
+          this.$message.warning('水单装船重量不能为空')
+          return
+        }
+        if(!this.enclosure){
+          this.$message.warning('至少上传一个水单截图')
+          return
+        }
+        this.$confirm(`水单信息提交后不可修改，确认提交？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          edittrantask({id:this.currecttask.id,shippedWeight:this.shippedWeight,enclosure:this.enclosure,tranProcessInfoList:[]}).toPromise().then((response) => {
               this.editshow=false
+              this.$message.success('提交成功')
             })
             .catch((response) => {
               EventBus.$emit('error', response.message)
             })
+        })
       },
       find(){
       this.getList()
@@ -463,6 +528,7 @@
         // this.appendixIdss = row.addressUrl
       },
       fujian1() {
+        console.log(this.enclosure)
           this.accessoryTFs1 = true
       },
       cur(status) {
@@ -979,7 +1045,9 @@
           })
           .toPromise()
           .then((response) => {
+            this.taskNoList1=response
             for (let i = 0; i < response.length; i++) {
+              
               this.taskNoList.push({
                 taskNoKey: i,
                 taskNoValue: response[i].taskNo,
@@ -988,6 +1056,8 @@
               this.taskNo=response[0].taskNo
               this.shipName=response[0].shipName
               this.shipNo=response[0].shipNo
+              this.shippedWeight=response[0].shippedWeight
+              this.enclosure=response[0].enclosure
               this.currecttask=response[0]
               this.getList()
             }
@@ -999,8 +1069,13 @@
         this.getList()
         // this.processNoList = []
         // this.processNo = ''
-        // for (let i = 0; i < this.taskNoList.length; i++) {
-        //   if (e == this.taskNoList[i].taskNoValue) {
+        for (let i = 0; i < this.taskNoList1.length; i++) {
+          if (e == this.taskNoList1[i].taskNo) {
+            this.shipName=this.taskNoList1[i].shipName
+            this.shipNo=this.taskNoList1[i].shipNo
+            this.enclosure=this.taskNoList1[i].enclosure
+            this.shippedWeight=this.taskNoList1[i].shippedWeight
+            this.currecttask=this.taskNoList1[i]
         //     for (let j = 0; j < this.taskNoList.length; j++) {
         //       this.processNoList.push({
         //         processNoKey: i,
@@ -1011,8 +1086,8 @@
         //         priceStatus: this.taskNoList[i].processNo[j].priceStatus,
         //       })
         //     }
-        //   }
-        // }
+          }
+        }
       },
       processNochange(e) {
         this.processNo = e
@@ -1122,23 +1197,7 @@
             this.deptBudgetTotal = response.total
             this.warehouseList = response
           })
-        this.contractNoList = []
-        getYunShuXiaLa({
-            flag: 1,
-          })
-          .toPromise()
-          .then((response) => {
-            for (let i = 0; i < response.length; i++) {
-              this.contractNoList.push({
-                constKey: i,
-                contractNo: response[i],
-              })
-            }
-            this.contractNoList.unshift({
-              contractNo: '全部合同'
-            })
-            this.options = this.contractNoList
-          })
+        
       },
       handleRemove(file) {
         console.log(file)

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -947,7 +947,18 @@
 					.toPromise()
 					.then(response => {
 						var that = this
-						this.$message.success('添加成功')
+						if(response=='该合同累计任务量已超过溢短装！'){
+							this.$message({
+							message: '该合同累计任务量已超过溢短装！',
+							type: 'error',
+							duration:15000
+							})
+						}else{
+							this.$message({
+							message: '提交成功!',
+							type: 'success',
+							})
+						}
 						setTimeout(function() {
 							that.dataList = {
 								taskTypeKey: 1

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -97,7 +97,7 @@
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="myTest">
             <!--当前运输总价-->
-          <ws-form-item label="当前运输总价(元/吨):" span="1" prop="tranPrice">
+          <ws-form-item label="当前运输总价(元):" span="1" prop="tranPrice">
               <ws-input
                 v-model="deptBudgetList.tranPrice"
                 maxlength="70"

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -82,7 +82,7 @@
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="myTest">
-            <ws-form-item label="当前运输总价(元/吨):" span="1" prop="tranPrice">
+            <ws-form-item label="当前运输总价(元):" span="1" prop="tranPrice">
                 <ws-input
                   v-model="deptBudgetList.tranPrice"
                   maxlength="70"
@@ -91,7 +91,7 @@
                   style="width:70px"
                 />
             </ws-form-item>
-            <ws-form-item label="审核中的运输总价(元/吨):" span="1" prop="tranPriceIng">
+            <ws-form-item label="审核中的运输总价(元):" span="1" prop="tranPriceIng">
               <ws-input
                   v-if="deptBudgetList.priceStatus=='审核中'"
                   :disabled="readonly"

src/views/warehousenew/warehouseManagementList.vue

@@ -221,11 +221,11 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="起始日期">
-              <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="请选择起始日期" v-model="parameter.startDate">
-              </el-date-picker>
+              <el-date-picker type="datetime" @change="startDataChange" placeholder="请选择起始日期" v-model="parameter.PrintStartDate"  default-time="12:00:00"></el-date-picker>
+              <!-- <el-date-picker v-model="value3" type="datetime" placeholder="选择日期时间" default-time="12:00:00"></el-date-picker> -->
             </el-form-item>
             <el-form-item label="截止日期">
-              <el-date-picker value-format="timestamp" type="date" placeholder="请选择截止日期" v-model="parameter.endDate">
+              <el-date-picker type="datetime" @change="endDataChange" placeholder="请选择截止日期" v-model="parameter.printEndDate"  default-time="12:00:00">
               </el-date-picker>
             </el-form-item>
               <!-- <el-form-item label="截止日期1">
@@ -380,6 +380,28 @@
       this.showType = this.isShow
     },
     methods: {
+      startDataChange(e){
+          var d = new Date(e);
+          let year =  d.getFullYear()
+          let month =  (d.getMonth() + 1)
+          month= month<10?'0'+month:month
+          let date = d.getDate()<10?'0'+d.getDate():d.getDate()
+          let hours = d.getHours()<10?'0'+d.getHours():d.getHours()
+          let minutes = d.getMinutes()<10?'0'+d.getMinutes():d.getMinutes()
+          let seconds = d.getSeconds()<10?'0'+d.getSeconds():d.getSeconds()
+          this.parameter.printStartDate = year + "-" + month+ "-" +date + " "+hours+":"+minutes+":"+seconds;
+      },
+      endDataChange(e){
+            var d = new Date(e);
+            let year =  d.getFullYear()
+          let month =  (d.getMonth() + 1)
+          month= month<10?'0'+month:month
+          let date = d.getDate()<10?'0'+d.getDate():d.getDate()
+          let hours = d.getHours()<10?'0'+d.getHours():d.getHours()
+          let minutes = d.getMinutes()<10?'0'+d.getMinutes():d.getMinutes()
+          let seconds = d.getSeconds()<10?'0'+d.getSeconds():d.getSeconds()
+           this.parameter.printEndDate = year + "-" + month+ "-" +date + " "+hours+":"+minutes+":"+seconds;
+      },
        //导出、打印
       outData(index) {
         if (index == 1) {
@@ -387,14 +409,14 @@
         } else if (index == 2) {
           this.headerText = '打印记录'
         }
-        let date = new Date()
-        var year = date.getFullYear();
-        var month = date.getMonth() + 1;
-        var strDate = date.getDate()
-        var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
-        this.parameter.startDate = pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + pastdate.getDate()
-        // this.parameter.endDate = '' + year + '-' + month + '-' + strDate
-        this.parameter.endDate = Date.now()
+        // let date = new Date()
+        // var year = date.getFullYear();
+        // var month = date.getMonth() + 1;
+        // var strDate = date.getDate()
+        // var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
+        // this.parameter.startDate = pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + pastdate.getDate()
+        // // this.parameter.endDate = '' + year + '-' + month + '-' + strDate
+        // this.parameter.endDate = Date.now()
         // this.parameter.endDate1 = Date.now()
         this.$forceUpdate();
         this.isShowPrintType = true
@@ -409,11 +431,11 @@
           this.$message.error('请选择打印的类型')
           return
         }
-        if (!this.parameter.startDate) {
+        if (!this.parameter.printStartDate) {
           this.$message.error('请选择打印的起始日期')
           return
         }
-        if (!this.parameter.endDate) {
+        if (!this.parameter.printEndDate) {
           this.$message.error('请选择打印的截止日期')
           return
         }
@@ -424,17 +446,17 @@
          if(this.parameter.warehouseName == '全部仓库'){
           this.parameter.warehouseName = ''
         }
-        let enddate = new Date(this.parameter.endDate).toLocaleString()//将截止时间的时间戳转为时间
-        this.parameter.endDate = enddate.split(' ')[0].replace('/' ,'-').replace('/','-')
+        // let enddate = new Date(this.parameter.endDate).toLocaleString()//将截止时间的时间戳转为时间
+        // this.parameter.endDate = enddate.split(' ')[0].replace('/' ,'-').replace('/','-')
         this.parameter.warehouseName = this.parameter.warehouseName.replace('（临）','')
-         this.isShowPrintType = false
+        this.isShowPrintType = false
         if (this.headerText == '导出记录') {
           if (this.parameter.radio == 3) {
             const {
               data
             } = await postExport({
-              startDate: this.parameter.startDate,
-              endDate: this.parameter.endDate,
+              startDate: this.parameter.printStartDate,
+              endDate: this.parameter.printEndDate,
               warehouseName: this.parameter.warehouseName
             }, {}, {
               responseType: 'blob'
@@ -467,8 +489,8 @@
         } else if (this.headerText == '打印记录') {
           addselectinfoList({
               compId: localStorage.getItem('ws-pf_compId'),
-              startDate: this.parameter.startDate,
-              endDate: this.parameter.endDate,
+              printStartDate: this.parameter.printStartDate,
+              printEndDate: this.parameter.printEndDate,
               warehouseName: this.parameter.warehouseName,
               searchType: this.parameter.radio,
               currentPage: 1,
@@ -520,7 +542,7 @@
                             sessionStorage.setItem('inOutWarehouse_Print', JSON.stringify(warehousePrint))
                             let _canshu = ''
                             _canshu = this.parameter.radio + '&warehouseName=' + this.parameter.warehouseName +
-                              '&startDate=' + this.parameter.startDate + '&endDate=' + this.parameter.startDate
+                              '&startDate=' + this.parameter.printStartDate + '&endDate=' + this.parameter.printEndDate
                             window.open('../../../../../static/warehousePrint.html?type=' + _canshu)
                           }
                         } else { //增量为0时
@@ -531,14 +553,14 @@
                       sessionStorage.setItem('inOutWarehouse_Print', JSON.stringify(warehousePrint))
                       let _canshu = ''
                       _canshu = this.parameter.radio + '&warehouseName=' + this.parameter.warehouseName +
-                        '&startDate=' + this.parameter.startDate + '&endDate=' + this.parameter.startDate
+                        '&startDate=' + this.parameter.printStartDate + '&endDate=' + this.parameter.printEndDate
                       window.open('../../../../../static/warehousePrint.html?type=' + _canshu)
                     })
                 } else { //没有增量比例的直接打印
                   sessionStorage.setItem('inOutWarehouse_Print', JSON.stringify(response.records))
                   let _canshu1 = ''
                   _canshu1 = this.parameter.radio + '&warehouseName=' + this.parameter.warehouseName +
-                    '&startDate=' + this.parameter.startDate + '&endDate=' + this.parameter.startDate
+                    '&startDate=' + this.parameter.printStartDate + '&endDate=' + this.parameter.printEndDate
                   window.open('../../../../../static/warehousePrint.html?type=' + _canshu1)
                 }
               }