Merge branch 'master' of http://git.zthymaoyi.com/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/api/V2/crew/index.js

@@ -202,7 +202,7 @@ export const API_GET_CREWSEAFARERINFO_QUERY_GETSEAFARERBYSEAFARERID = `/crewSeaf
 export const API_GET_CREWINTERVIEWINFO_GETINFOBYID = `/crewInterviewInfo/query/getInfoById`
 
 // 审核通过不通过接口
-export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+export const API_POST_WORKFLOW_API_HANDLE = `/newWorkflow/api/handle`
 // 培训管理=>基础数据维护添加-船员职务
 export const API_GET_TRAININGMANAGEMENT_DUTYPARAMETER_QUERY_GETQUERYLIST = `${baseUrl}/dutyParameter/query/getQueryList`
 // 培训管理=>上岗前培训
@@ -271,7 +271,7 @@ export const API_POST_CREWBATCHSHIFTSPLANINFO_AFFIRMCHANGESHIFTSINFO = `${baseUr
 // 调配管理=>交接班=>生成交接班记录
 export const API_POST_CREWBATCHSHIFTSPLANINFO_RECEIVE = `${baseUrl}/crewBatchShiftsPlanInfo/api/receive`
 // 调配管理=>审核 退回
-export const API_POST_WORKFLOW_HANDLE = `${baseUrl}/workflow/api/handle`
+export const API_POST_WORKFLOW_HANDLE = `${baseUrl}/newWorkflow/api/handle`
 
 // 考评管理=>查询考评详情信息列表
 export const API_GET_CREWEVALUATEINFO_GETINFOBYID = `${baseUrl}/crewEvaluateInfo/query/getInfoById`

src/api/V2/profitable/index.js

@@ -13,7 +13,7 @@ export const API_POST_EDITINFO = '/nonContractExpenses/editInfo'
 //查看
 export const API_GET_LOOKINFO = '/nonContractExpenses/getInfo'
 //审核
-export const API_POST_WORKFLOW_API_HANDLE = '/workflow/api/handle'
+export const API_POST_WORKFLOW_API_HANDLE = '/newWorkflow/api/handle'
 //审核记录
 export const API_POST_AUDITRECORD = '/billOperateHis/query/commonBillOperateHis'
 //仓库

src/api/V2/purchase/index.js

@@ -195,7 +195,7 @@ export const API_GET_EMAIL_CONFIG = '/emailConfig/query/emailConfig'
 export const API_POST_EMAIL_CONFIG_UPDATE = '/emailConfig/api/update'
 // #region 审核工作流
 // 处理任务任务审批
-export const API_POST_WORKFLOW_HANDLE = `${baseUrl}/workflow/api/handle`
+export const API_POST_WORKFLOW_HANDLE = `${baseUrl}/newWorkflow/api/handle`
 // 获取任务审批历史
 export const API_GET_WORKFLOW_HISTORY = `${baseUrl}/workflowHistory/query/taskHistories`
 // 可编辑单位下拉选查询
@@ -745,7 +745,7 @@ export const API_GET_APPL_LIST = '/navigationApplyPur/query/getListBy'
 // 航海资料申请 获取操作历史
 export const API_GET_APPL_HISTORY = `${baseUrl}/navigationApplyPur/query/getOperateHis`
 // 航海资料申请 审核
-export const API_POST_HANDLE = '/workflow/api/handle'
+export const API_POST_HANDLE = '/newWorkflow/api/handle'
 // 航海资料申请 获取审核历史
 export const API_GET_APPL_EXAMINE_HISTORY = `${baseUrl}/navigationApplyPur/query/getExamineHis`
 //  航海资料申请 导入

src/api/V2/purchasingManagement/index.js

@@ -29,7 +29,7 @@ export const API_POST_DELETEPURCHASE = '/purchaseOrder/api/deletePurchaseOrder'
 // 测试
 export const API_POST_SUBMIT = '/purchaseOrder/api/submitPurchaseOrder'
 // 审核通过不通过接口
-export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+export const API_POST_WORKFLOW_API_HANDLE = `/newWorkflow/api/handle`
 // export const API_POST_WORKFLOW_API_HANDLE ='/newWorkflow/api/handle'
 // 审核接口调用之后
 export const API_POST_QUERY_WORKFLOWINFO ='/newWorkflow/query/workflowInfo'

src/api/V2/servicer/index.js

@@ -16,7 +16,7 @@ export const API_POST_WF_CREATE = `${baseUrl}/workflow/api/create`
  * 处理任务 需要使用 动态替换路径 来达到请求的目的
  * @params  {purchase：process.env.VUE_APP_API_SUPPLY，system：'',systemManage||ship:process.env.VUE_APP_API_ISM,finance:process.env.VUE_APP_API_FINANCE}
  */
-export const API_POST_WF_HANDLE = `:baseUrl/workflow/api/handle`
+export const API_POST_WF_HANDLE = `:baseUrl/newWorkflow/api/handle`
 
 
 // 获取任务审批历史

src/api/V2/taskspost/index.js

@@ -19,7 +19,7 @@ export const API_GET_TRAN_EXAMINE = '/tranTaskInfo/getTranTask'
 // 运输任务-编辑
 export const API_GET_TRAN_EDIT = '/tranTaskInfo/api/editTranTask'
 // 审核通过不通过接口
-export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+export const API_POST_WORKFLOW_API_HANDLE = `/newWorkflow/api/handle`
 // export const API_POST_WORKFLOW_API_HANDLE ='/newWorkflow/api/handle'
 // 审核之后接口
 export const API_POST_WORKFLOW_TASK = `/newWorkflow/query/taskCandidates`

src/views/contractManagement/acquisitionContractAdd.vue

@@ -280,6 +280,7 @@
     delxiala,
     getstafffind,
     getcustomerinfo,
+    getRelationContractNo,
     examineList
   } from '@/model/contarct/index'
   import {

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -397,6 +397,9 @@ export default {
             this.baseInfoForm.bulkDensityStandard = ''
           }
             this.baseInfoForm.goodsNameKey = _list[0].constKey
+            
+            this.isSolidFood = false
+            this.baseInfoForm.bulkDensityStandard = ''
           }
         }
       })

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -3360,7 +3360,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

@@ -52,7 +52,7 @@
           end-placeholder="结算时间止">
         </el-date-picker>
         <div></div>
-        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找"
+        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="编号、合同号、客户名、车牌号"
           clearable maxlength="500" type="input">
         </ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
@@ -106,21 +106,22 @@
       @row-click="handleRowClick" @selection-change="handleSelectionChange" :summary-method="getSummaries" show-summary>
       <!-- <el-table-column :selectable="selectInit" type="selection" width="30"></el-table-column> -->
       <el-table-column  type="selection" width="30"></el-table-column>
-      <el-table-column type="index" label="序号" width="50">
+      <el-table-column fixed type="index" label="序号" width="50">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="paymentNo" width="90" label="编号" sortable></el-table-column>
-      <el-table-column class="table_td" prop="customerName" label="客户" sortable>
+      <el-table-column fixed class="table_td" prop="paymentNo" width="90" label="编号" sortable></el-table-column>
+      <el-table-column fixed class="table_td" prop="customerName" label="客户" sortable>
         <template slot-scope="scope">
           <div @click.stop="customer(scope.row)">
             <span class="text_css">{{ scope.row.customerName }}</span>
           </div>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
+      <el-table-column fixed class="table_td" prop="carNo" label="车牌号"></el-table-column>
+      <el-table-column  class="table_td" prop="contractNo" label="合同号"></el-table-column>
       <el-table-column class="table_td" v-if='warehouseName=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee"
         label="卸车过磅费（元）"></el-table-column>
       <el-table-column class="table_td" prop="goodsName" width="70" label="货名"></el-table-column>
@@ -579,6 +580,7 @@
               let obj = {}
               //xxx代表列名
               obj.qualityNo = v.业务编号
+              obj.contractNo = v.合同编号
               obj.customerName = v.客户姓名
               obj.customerNumberCard = v.身份证号
               obj.customerPhone = v.客户手机号

src/views/salesManagement/salesPlanLook.vue

@@ -144,6 +144,8 @@
   </div>
 </template>
 <script>
+
+import { mapGetters } from 'vuex'
   import {
     saleLook,
   } from '@/model/salesManagement/index'

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -753,7 +753,7 @@
       },
       //提交按钮
       submit() {
-        if (!this.deptBudgetList.tranPrice) {
+        if (!this.deptBudgetList.tranPrice&&this.deptBudgetList.tranPrice!= 0) {
           this.$message({
             message: '请设置运输单价！',
             type: 'warning',

src/views/warehousenew/transformation.vue

@@ -203,13 +203,7 @@ export default {
     },
     //新增折转
     addTurnAround() {
-      turnAroundXiaLa({
-        id: this.warehouseId,
-      })
-        .toPromise()
-        .then((response) => {
-          this.goodsNameList = response
-        })
+      
       turnAroundGoodsNameAll({
         constId: 'CON2',
       })
@@ -254,6 +248,13 @@ export default {
     binNo(e) {
       this.transformationAdd.beforeBinNo = this.binNoList[e].binNumber
       this.transformationAdd.positionId = this.binNoList[e].id
+      turnAroundXiaLa({
+        id: this.transformationAdd.positionId,
+      })
+        .toPromise()
+        .then((response) => {
+          this.goodsNameList = response
+        })
     },
     binNo1(e) {
       this.transformationAdd.afterBinNo = this.binNoList[e].binNumber

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'
@@ -450,8 +472,8 @@
             const {
               data
             } = await postExportOut({
-              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)
                 }
               }