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

main.js

@@ -9,7 +9,6 @@ const BrowserWindow = electron.BrowserWindow;
  
 const path = require('path');
 const url = require('url');
- 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;

public/static/payprint1.html

@@ -1258,6 +1258,7 @@
             if (this.printData.compName == undefined) this.printData.compName = ''
             document.title = this.printData.compName + '结算凭证'
             window.print()
+            console.log(11111111111111)
                 // sessionStorage.removeItem('selectPrint_selectPrintList');
                 // sessionStorage.removeItem('selectPrint_selectCustomerList');
             window.onafterprint = function(event) {

public/static/warehousePrint.html

@@ -241,7 +241,6 @@
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
-    // import  API_CONFIG from "../vue.config.js"
     new Vue({
       el: '#app',
       data: {
@@ -299,7 +298,7 @@
         printBig() {}
       },
       mounted() {
-        // console.log(API_CONFIG,1111111111)
+        console.log(API_CONFIG,1111111111)
         // var ippath=API_CONFIG.devServer.proxy['/pb'].target
 
         this.company = localStorage.getItem("ws-pf_compName")

src/App.vue

@@ -57,6 +57,15 @@ export default {
 }
 </script>
 <style lang="scss">
+
+// html{
+// -webkit-filter: grayscale(100%);
+// -moz-filter: grayscale(100%);
+// -ms-filter: grayscale(100%);
+// -o-filter: grayscale(100%);
+// filter: grayscale(100%);
+// filter: gray;
+//   }
 #app {
   width: 100%;
   height: 100%;

src/api/V2/houseSelfCollect/index.js

@@ -120,4 +120,6 @@ export const API_POST_CHANE_NO = `/weighingManagement/api/changeWarehouse`
 export const API_GET_CONTRACT ='/contractManagementInfo/getInContract'
 // 发起人撤回
 export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
+// 获取仓库id
+export const API_GET_BASEID ='/qualityInspectionManagement/selectBaseId'
 

src/api/V2/profitable/index.js

@@ -106,3 +106,5 @@ export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
 export const API_GET_WAREHOUSINGORDER_LIST = '/warehousingOrder/selectInfo'
 //费用明细信息
 export const API_POST_EXPORTFILE = '/expenseInfo/exportPc'
+//费用编号
+export const API_GET_CONSTNO = '/expenseInfo/costNoList'

src/layout/index/top/index.vue

@@ -219,7 +219,8 @@
     getLook
   } from '@/model/warehouse/index'
   import {
-    getQRCodeData
+    getQRCodeData,
+    getBaseId
   } from '@/model/houseSelfCollect/index'
 
 
@@ -414,6 +415,9 @@
         if(_userCompId.indexOf(',') != -1){
          _userCompId =  _userCompId.split(',')[1]
         }
+        if(!_userHouseId){
+          this.obtainBaseId(_userCompId,_qualityNo)
+        }
         this.tmp = {
           compId: _userCompId,
           number: _qualityNo,
@@ -421,7 +425,6 @@
         }
         //  this.barCode = ''
         //判断当前账号公司是否是二维码上公司
-        debugger
         if (this.userINfo.userCompany != _userCompId) {
           console.log('请切换公司在试！')
           this.$message.error('当前身份不可操作');
@@ -429,8 +432,9 @@
           return
         }
         //判断二维码上的仓库当前账号是否有权限操作
-        this.getLook(this.cangid,localStorage.getItem('ws-pf_staffName'))
-        
+        if(this.cangid){
+          this.getLook(this.cangid,localStorage.getItem('ws-pf_staffName'))
+        }
       },
       compNameChange(){
       //   this.complogin({username:this.UserInfo.loginInfo.userMobilePhone,
@@ -578,6 +582,26 @@
             
           })
       },
+      //根据公司id、业务编号，获取仓库id
+      async obtainBaseId(compId, qualityNo){
+        await getBaseId({
+            compId: compId,
+            qualityNo: qualityNo,
+          })
+          .toPromise()
+          .then((response) => {
+             this.warehouseId = response.baseId
+             this.cangid = response.baseId
+             this.getLook(this.cangid,localStorage.getItem('ws-pf_staffName'))
+            this.tmp = {
+              compId: compId,
+              number: qualityNo,
+              warehouseId: this.warehouseId
+            }
+            // debugger
+            // this.getQRCodeData(this.tmp)
+          })
+      },
       // 二维码获取数据
       async getQRCodeData(tmp) {
         await getQRCodeData(tmp)

src/model/houseSelfCollect/index.js

@@ -62,7 +62,8 @@ import {
   API_POST_CHANE_NO,
   API_POST_DELETE,
   API_GET_CONTRACT,
-  API_SPONSOR_WITHDRAW
+  API_SPONSOR_WITHDRAW,
+  API_GET_BASEID
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -188,3 +189,5 @@ export const changeNo = appRx.post(API_POST_CHANE_NO, errorCatcher, errorHandle,
 export const getcontract = appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
 // 发起人撤回
 export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)
+// 获取仓库id
+export const getBaseId = appRx.get(API_GET_BASEID, errorCatcher, errorHandle, filter)

src/model/profitable/index.js

@@ -53,7 +53,8 @@ import {
   API_BATCH_DEL_FIXEDINFO,
   API_SPONSOR_WITHDRAW,
   API_GET_WAREHOUSINGORDER_LIST,
-  API_POST_EXPORTFILE
+  API_POST_EXPORTFILE,
+  API_GET_CONSTNO
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -161,4 +162,6 @@ export const batchDelFixedInfo = appRx.post(API_BATCH_DEL_FIXEDINFO, errorCatche
   //入库单列表
 export const getwarehousingorderList = appRx.get(API_GET_WAREHOUSINGORDER_LIST,errorCatcher, errorHandle, filter)
 // 导出费用明细信息
-export const exportFile = appRx.post(API_POST_EXPORTFILE)
+export const exportFile = appRx.post(API_POST_EXPORTFILE)
+  //费用编号
+  export const getcostNo = appRx.get(API_GET_CONSTNO,errorCatcher, errorHandle, filter)

src/views/contractManagement/acquisitionContractEdit.vue

@@ -168,7 +168,7 @@
         </div>
         <ws-input v-model="deptBudgetList.remarks" autosize type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
           maxlength="200" />
-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
+        <ws-upload @onChange="onChange" ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
           v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
       </base-card>
     </ws-form>
@@ -290,6 +290,18 @@
       this.showType = this.isShow
     },
     methods: {
+      // 上传附件
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.deptBudgetList.addressUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
        feedbackLeaderChange(e){
         this.deptBudgetList.feedbackLeader = this.feedbackLeaders[e].staffName
         this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone

src/views/contractManagement/collectionContract.vue

@@ -119,7 +119,7 @@
             " alt="" />
           <div v-if="
               (scope.row.approveStatus != '待决策人审核' &&
-                !scope.row.approveStatus)
+                !scope.row.approveStatus || scope.row.approveStatus == '发起人撤回')
             " style="display: inline-block">
             <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
               src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
@@ -144,6 +144,10 @@
             v-hasPermission="
                 `contractManagement.dsContract.dsContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
+              <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+                <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
+                  @click="withdraw(scope.row)" v-hasPermission="`contractManagement.dsContract.dsContractInfo.edit`" alt="" />
+              </div>
         </template>
       </el-table-column>
     </el-table>
@@ -166,7 +170,8 @@
     billoperatehis,
     deletecontract,
     editInfo,
-    getstafffind
+    getstafffind,
+    sponsorWithdraw
   } from '@/model/contarct/index'
   import {
     downloadFile
@@ -214,7 +219,7 @@
         searchType: 1,
         searchTypeText: '未完成',
         searchKeyWord: '',
-        contractType: 3,
+        contractType: 1,
         goodsType: 1,
         startDate: null,
         endDate: null,
@@ -301,7 +306,7 @@
         },
         value1: '',
         value2: '',
-        createPersion: "",//创建人
+        createPersion: '',//创建人
         persionList: [],
       }
     },
@@ -314,6 +319,22 @@
       this.persionXiaLa()
     },
     methods: {
+      withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该合同吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
       persionXiaLa() {
       getstafffind({
         roles: 'b96299bb5dcf461e916b72b64c6943b0'
@@ -386,6 +407,7 @@
             goodsType: this.goodsType,
             currentPage: this.currentPage,
             pageSize: this.pageSize,
+            agreementType: '代收合同',
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
             startDate: this.startDate,

src/views/contractManagement/purchaseContractAdd.vue

@@ -51,10 +51,10 @@
             />
           </ws-select>
         </ws-form-item> -->
-        <ws-form-item label="合同类型" span="1" prop="agreementType" class="readonly">
+        <!-- <ws-form-item label="合同类型" span="1" prop="agreementType" class="readonly">
           <el-radio v-model="deptBudgetList.agreementType" label="采购合同">采购合同</el-radio>
           <el-radio v-model="deptBudgetList.agreementType" label="补充协议">补充协议</el-radio>
-        </ws-form-item>
+        </ws-form-item> -->
 
         <!--关联合同-->
         <ws-form-item prop="agreementNo" label="关联合同" span="1" v-show="deptBudgetList.agreementType =='补充协议'">

src/views/contractManagement/purchaseContractEdit.vue

@@ -296,7 +296,7 @@
         </div>
         <ws-input v-model="deptBudgetList.remarks" type="textarea" :row="3" autosize placeholder="请输入备注信息，不超过200字"
           maxlength="200" />
-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
+        <ws-upload @onChange="onChange" ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
           v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
       </base-card>
     </ws-form>
@@ -417,6 +417,17 @@
       this.showType = this.isShow
     },
     methods: {
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.deptBudgetList.addressUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
        feedbackLeaderChange(e){
         this.deptBudgetList.feedbackLeader = this.feedbackLeaders[e].staffName
         this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone

src/views/contractManagement/salesContractAdd.vue

@@ -34,10 +34,10 @@
         <!--基本信息-->
         <ws-info-table>
           <!--合同类型-->
-          <ws-form-item label="合同类型" span="1" class="readonly">
+          <!-- <ws-form-item label="合同类型" span="1" class="readonly">
             <el-radio v-model="deptBudgetList.agreementType" label="销售合同">销售合同</el-radio>
             <el-radio v-model="deptBudgetList.agreementType" label="补充协议">补充协议</el-radio>
-          </ws-form-item>
+          </ws-form-item> -->
           <!--合同编号-->
           <!-- v-if="deptBudgetList.agreementType == '销售合同'" -->
           <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" v-if="deptBudgetList.agreementType == '销售合同'">

src/views/contractManagement/salesContractEdit.vue

@@ -381,7 +381,7 @@
         <!--备注信息-->
         <ws-input v-model="deptBudgetList.remarks" autosize type="textarea"  placeholder="请输入备注信息，不超过200字"
           maxlength="200" />
-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="true" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" v-hasPermission="
+        <ws-upload ref="upload" @onChange="onChange" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="true" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" v-hasPermission="
             `contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
     </div>

src/views/contractManagement/storageContract.vue

@@ -120,7 +120,7 @@
             " alt="" />
           <div v-if="
               (scope.row.approveStatus != '待决策人审核' &&
-                !scope.row.approveStatus)
+                !scope.row.approveStatus || scope.row.approveStatus == '发起人撤回')
             " style="display: inline-block">
             <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
               src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
@@ -145,6 +145,12 @@
             v-hasPermission="
                 `contractManagement.dcContract.dcContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
+              <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+              <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
+                @click="withdraw(scope.row)" v-hasPermission="
+                            `contractManagement.dcContract.dcContractInfo.edit`
+                          " alt="" />
+            </div>
         </template>
       </el-table-column>
     </el-table>
@@ -167,7 +173,8 @@
     billoperatehis,
     deletecontract,
     editInfo,
-    getstafffind
+    getstafffind,
+    sponsorWithdraw
   } from '@/model/contarct/index'
   import {
     downloadFile
@@ -285,7 +292,7 @@
           ],
         },
         value2: '',
-        createPersion: "",//创建人
+        createPersion: '',//创建人
       persionList: [],
       }
     },
@@ -298,6 +305,22 @@
       this.persionXiaLa()
     },
     methods: {
+      withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该合同吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
       persionXiaLa() {
       getstafffind({
         roles: 'b96299bb5dcf461e916b72b64c6943b0'

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -66,14 +66,14 @@
               </el-input>
             </el-form-item>
           </div>
-          <div class="grid-content" v-if="!isSolidFood">
+          <!-- <div class="grid-content" v-if="!isSolidFood">
             <el-form-item label="参数类型">
               <el-radio-group @change="paramTypeChange" v-model="baseInfoForm.paramType" :disabled="!isEdit">
                 <el-radio label="1">升水扣重</el-radio>
                 <el-radio label="2">升水扣钱</el-radio>
               </el-radio-group>
             </el-form-item>
-          </div>
+          </div> -->
 
         </div>
       </el-form>
@@ -315,7 +315,7 @@ export default {
       baseInfoForm: {
         warehouseId: '',
         warehouseName: '',
-        compId: '',
+        compId: this.$route.query.compId,
         goodsNameKey: '',
         goodsName: '',
         waterBase: '',
@@ -345,7 +345,6 @@ export default {
   },
 
   activated() {
-    debugger
 
     console.log(this.$route.query.type)
     // 货名
@@ -427,7 +426,7 @@ export default {
         this.baseInfoForm = {
           warehouseId: '',
           warehouseName: '',
-          compId: '',
+          compId: this.$route.query.compId,
           goodsNameKey: '',
           goodsName: '',
           waterBase: '',
@@ -443,7 +442,7 @@ export default {
           dryGrainPrice: '',
           details: [],
           detailPrints: [],
-          paramType: '1',
+          paramType: '2',
         }
         this.baseInfoForm.warehouseId = this.$route.query.warehouseId
         this.baseInfoForm.warehouseName = this.$route.query.warehouseName
@@ -522,7 +521,7 @@ export default {
         this.baseInfoForm.bulkDensityStandard = 1
       }else{
         this.isSolidFood = false
-        this.baseInfoForm.bulkDensityStandard = ""
+        this.baseInfoForm.bulkDensityStandard = ''
       }
     },
     onCloseGoodSelect() {
@@ -550,7 +549,7 @@ export default {
             this.baseInfoForm.bulkDensityStandard = 1
           }else{
             this.isSolidFood = false
-            this.baseInfoForm.bulkDensityStandard = ""
+            this.baseInfoForm.bulkDensityStandard = ''
           }
           // if (this.selectVal == '玉米淀粉' ||
           //   this.selectVal == '玉米（机收）' ||
@@ -596,7 +595,7 @@ export default {
           //防止填完数据  后切换货名不清空多余数据
           warehouseId: '',
           warehouseName: '',
-          compId: '',
+          compId: this.$route.query.compId,
           goodsNameKey: '',
           goodsName: '',
           waterBase: '',
@@ -612,8 +611,11 @@ export default {
           dryGrainPrice: '',
           details: [],
           detailPrints: [],
-          paramType: '1',
+          paramType: '2',
         }
+        this.baseInfoForm.warehouseId = this.$route.query.warehouseId
+        this.baseInfoForm.warehouseName = this.$route.query.warehouseName
+        this.baseInfoForm.compId = this.$route.query.compId
       if (e == '玉米淀粉' ||
         e == '玉米（机收）' ||
         e == '玉米（酒精）' ||
@@ -622,12 +624,10 @@ export default {
         e == '玉米（棒）' ||
         e == '玉米'
       ) {
-        this.baseInfoForm.warehouseId = this.$route.query.warehouseId
-        this.baseInfoForm.warehouseName = this.$route.query.warehouseName
-        this.baseInfoForm.compId = this.$route.query.compId
+       
         this.baseInfoForm.bulkDensityStandard = 1
       }else{
-        this.baseInfoForm.bulkDensityStandard = ""
+        this.baseInfoForm.bulkDensityStandard = ''
       }
       for (let num = 0; num < this.goodnameList.length; num++) {
         if (e == this.goodnameList[num].constValue) {
@@ -699,12 +699,12 @@ export default {
     // 增加分界
     add(item, item1, index) {
       let _data = this.detailList;
-      if (item.index > 2) {
-        this.$message({
-          message: '最多插入3个分界值',
-          type: 'warning',
-        })
-      } else {
+      // if (item.index > 2) {
+      //   this.$message({
+      //     message: '最多插入3个分界值',
+      //     type: 'warning',
+      //   })
+      // } else {
         item.index++
         item.detailList.splice(index + 1, 0, {
           name: '分界',
@@ -718,7 +718,7 @@ export default {
           type: 4,
         })
         this.makeSpliceIndex(item, item1, index)
-      }
+      // }
     },
     // 减少分界
     reduce(item, item1, index) {

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -238,7 +238,7 @@
                 <ws-form-item v-if='statusTypetext != "初检" && serviceManagementType == 1' label="经办人" span="1"
                   prop="agent">
                   <ws-input v-model="deptBudgetList.agent" placeholder="自动获取，不可编辑" maxlength="100" disabled
-                    size="small" />
+                    size="small" />   
                 </ws-form-item>
                 <!-- <ws-form-item v-if='statusTypetext == "初检" && serviceManagementType == 1' label="运费(元/吨)" span="1"
                   prop="freight">
@@ -1071,7 +1071,6 @@ export default {
       }
     },
     waterContentChange(type) {
-      // debugger
           //客户
           if(this.serviceManagementType==3){
           getcustomer({
@@ -1107,20 +1106,32 @@ export default {
       if (this.deptBudgetList.goodsName && type != 'water') {
         if (this.deptBudgetList.goodsName.indexOf('潮粮') != -1) {
           this.deptBudgetList.type = '潮粮'
+          this.deptBudgetList.grade = this.gradeList[1].constValue
+				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+          this.deptBudgetList.imperfectGrain=8
+					this.deptBudgetList.impurity=1
+					this.deptBudgetList.mildewGrain=2
+					this.deptBudgetList.jiaorenli=0
         } else {
           this.deptBudgetList.type = '干粮'
+          this.deptBudgetList.grade = this.gradeList[1].constValue
+				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+          this.deptBudgetList.imperfectGrain=8
+					this.deptBudgetList.impurity=1
+					this.deptBudgetList.mildewGrain=2
+					this.deptBudgetList.jiaorenli=0
+        }
+        if (!this.deptBudgetList.dryGrainPrice || this.deptBudgetList.dryGrainPrice == 0) {
+          getDryGrainPrice({
+            warehouseId: this.cangid,
+            goodsName: this.deptBudgetList.goodsName
+          })
+            .toPromise()
+            .then((response) => {
+              this.$set(this.deptBudgetList, 'dryGrainPrice', response)
+              this.dryGrainPrice=response
+            })
         }
-        // if (!this.deptBudgetList.dryGrainPrice || this.deptBudgetList.dryGrainPrice == 0) {
-        //   getDryGrainPrice({
-        //     warehouseId: this.cangid,
-        //     goodsName: this.deptBudgetList.goodsName
-        //   })
-        //     .toPromise()
-        //     .then((response) => {
-        //       this.$set(this.deptBudgetList, 'dryGrainPrice', response)
-        //       this.dryGrainPrice=response
-        //     })
-        // }
         // debugger
         for (var i = 0; i < this.purchasePriceList.length; i++) {
           if (this.purchasePriceList[i].goodsName == this.deptBudgetList.goodsName) {
@@ -1153,44 +1164,30 @@ export default {
                 .buckleMiscellaneous) / 100 * parseFloat(this.deptBudgetList.dryGrainPrice ? this.deptBudgetList
                   .dryGrainPrice : 0)).toFixed(4)
               }
-              if (!this.deptBudgetList.tidalGrainPrice) {
-									this.deptBudgetList.tidalGrainPrice = ''
-								}
-              if(this.deptBudgetList.type == '干粮'){
-                this.deptBudgetList.dryGrainPrice = response
-                this.dryGrainPrice = this.deptBudgetList.dryGrainPrice 
-              }
             } else {
-              if(this.deptBudgetList.type == '干粮'){
-                this.deptBudgetList.dryGrainPrice = response
-                this.dryGrainPrice = this.deptBudgetList.dryGrainPrice 
-              }else{
+              if (this.inspect.type == '干粮') {
+                if (response == 0) {
+                  getDryGrainPrice({
+                    warehouseId: this.cangid,
+                    goodsName: this.deptBudgetList.goodsName
+                  })
+                    .toPromise()
+                    .then((response) => {
+                      this.$set(this.deptBudgetList, 'dryGrainPrice', response)
+                      this.dryGrainPrice=response
+                    })
+                } else {
+                  if(response>0){
+                  this.deptBudgetList.dryGrainPrice = response
+                  this.dryGrainPrice = response
+                  }
+                }
+              } else {
+                if(response>0){
                 this.deptBudgetList.tidalGrainPrice = response
-                this.tidalGrainPrice = this.deptBudgetList.tidalGrainPrice 
+                this.tidalGrainPrice = response
+                }
               }
-              // if (this.inspect.type == '干粮') {
-              //   if (response == 0) {
-              //     getDryGrainPrice({
-              //       warehouseId: this.cangid,
-              //       goodsName: this.deptBudgetList.goodsName
-              //     })
-              //       .toPromise()
-              //       .then((response) => {
-              //         this.$set(this.deptBudgetList, 'dryGrainPrice', response)
-              //         this.dryGrainPrice=response
-              //       })
-              //   } else {
-              //     if(response>0){
-              //     this.deptBudgetList.dryGrainPrice = response
-              //     this.dryGrainPrice = response
-              //     }
-              //   }
-              // } else {
-              //   if(response>0){
-              //   this.deptBudgetList.tidalGrainPrice = response
-              //   this.tidalGrainPrice = response
-              //   }
-              // }
             }
           })
       }
@@ -2277,6 +2274,7 @@ export default {
       this.getList()
     },
     submit() {
+      console.log(this.deptBudgetList)
       if (this.reader) {
         this.reader.cancel()
       }
@@ -2395,7 +2393,6 @@ export default {
           })
           return
         }
-
         if (this.value1 == false && this.statusTypetext == '初检') {
           this.deptBudgetList.warehouseInOutDetail.grade = this.deptBudgetList.grade
           if (!this.deptBudgetList.grade) {
@@ -2503,7 +2500,7 @@ export default {
           this.deptBudgetList.warehouseInOutDetail.jiaorenli =
             this.deptBudgetList.jiaorenli
           //热损伤
-          if (!this.deptBudgetList.jiaorenli) {
+          if (!this.deptBudgetList.jiaorenli&&this.deptBudgetList.jiaorenli!=0) {
             this.$message({
               message: '请输入热损伤!',
               type: 'warning',
@@ -3639,8 +3636,20 @@ export default {
             this.deptBudgetList.goodsName = this.taskNolist[i].goodsName
             if(this.taskNolist[i].goodsName.indexOf("潮粮") != -1){  //收购从合同中带出货名  单价等信息  用货名是否带有潮粮字符来判断干潮类型
               this.deptBudgetList.type = "潮粮"
+              this.deptBudgetList.grade = this.gradeList[1].constValue
+				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+              this.deptBudgetList.imperfectGrain=8
+							this.deptBudgetList.impurity=1
+							this.deptBudgetList.mildewGrain=2
+							this.deptBudgetList.jiaorenli=0
             }else{
               this.deptBudgetList.type = "干粮"
+              this.deptBudgetList.grade = this.gradeList[1].constValue
+				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+              this.deptBudgetList.imperfectGrain=8
+							this.deptBudgetList.impurity=1
+							this.deptBudgetList.mildewGrain=2
+							this.deptBudgetList.jiaorenli=1
             }
           } else {
             if (this.taskNolist[i].contractNo) {
@@ -3689,7 +3698,7 @@ export default {
             this.deptBudgetList.goodsNameKey = this.outContractNo.goodsNameKey
           }
           this.goodsNameChange(this.deptBudgetList.goodsName)
-          this.deptBudgetList.grade = this.outContractNo.grade
+          // this.deptBudgetList.grade = this.outContractNo.grade
           if (this.outContractNo.inOutType == '采购入库') {
             if(this.outContractNo.deliverType==1){
                 gettask({contractNo:this.outContractNo.contractNo,compId:localStorage.getItem('ws-pf_compId')}).toPromise().then((response) => {

src/views/houseSelfCollect/settlement.vue

@@ -114,7 +114,7 @@
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="干粮水分（%）" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent
-                v-model="paymentList.qualityInspectionManagement.waterMin" placeholder="请输入干粮水分" maxlength="100"
+                v-model="ganwater" placeholder="请输入干粮水分" maxlength="100"
                 size="small" disabled />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType == "1"'
@@ -130,7 +130,7 @@
             <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType != 1'
               label="掉水(%)" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent
-                v-model="paymentList.qualityInspectionManagement.waterContent-paymentList.qualityInspectionManagement.waterMin"
+                v-model="paymentList.qualityInspectionManagement.waterContent-ganwater"
                 placeholder="请输入掉水" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType != 1'
@@ -305,6 +305,7 @@
           },
           unitDeduction: 0
         },
+        ganwater:14,
         disabled: false,
         types: '',
         isShowPrint: false,
@@ -386,7 +387,7 @@
       },
       printBig() {
         localStorage.setItem('print_pay_data',JSON.stringify(this.printData))
-        window.open('../../../../../static/payprint.html?type=2&dataList=' + JSON.stringify(this.printData))
+        window.open('../../../../../static/payprint.html?type=2')
       },
       getList() {
         getpaymentexamine({
@@ -400,7 +401,7 @@
           this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
           if (this.paymentList.qualityInspectionManagement.paramType == '2') {
             this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList
-                .qualityInspectionManagement.waterContent - this.paymentList.qualityInspectionManagement.waterMin) *
+                .qualityInspectionManagement.waterContent - 14) *
               this.paymentList.buckleWeightRatio
             this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList
               .qualityInspectionManagement.weightDeduction.toFixed(2)
@@ -686,7 +687,7 @@
       buckleWeightRatiochange(e) {
         if (this.paymentList.buckleWeightRatio >= 0 && this.paymentList.buckleWeightRatio <= 2) {
           this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList.qualityInspectionManagement
-              .waterContent - this.paymentList.qualityInspectionManagement.waterMin) * this.paymentList
+              .waterContent - 14) * this.paymentList
             .buckleWeightRatio
           this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList.qualityInspectionManagement
             .weightDeduction.toFixed(2)

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -646,7 +646,7 @@
         return fmt
       },
       lookup() {
-        if (this.value2) {
+        if (this.value2&&this.value2.length>0) {
           this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
           this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
         } else {

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -431,6 +431,7 @@
       },
       printclose() {
         this.isShowPrint = false
+
         this.getList()
       },
       printSmall() {
@@ -535,9 +536,11 @@
               url:this.global.uploadPath,
               data: formdata,
             }).then((response) => {
+              // debugger
+              // console.log(response,111111111111)
               //编辑接口
-              this.printData.pictureAddress = response.data.url
-              this.inspect.pictureAddress = response.data.url
+              this.printData.pictureAddress = response.data.data.url
+              this.inspect.pictureAddress = response.data.data.url
               addOut(this.inspect)
                 .toPromise()
                 .then((response) => {})
@@ -546,27 +549,27 @@
         })
       },
       closeDialog() {
-        html2canvas(this.$refs.saveImg.$el).then((canvas) => {
-          let dataURL = canvas.toDataURL('image/png')
-          this.imgUrl = dataURL
-          if (this.imgUrl !== '') {
-            let b = this.dataURLtoFile(this.imgUrl, 'printImage')
-            let formdata = new FormData()
-            formdata.append('file', b)
-            axios({
-              method: 'post',
-              url:this.global.uploadPath,
-              data: formdata,
-            }).then((response) => {
-              //编辑接口
-              this.printData.pictureAddress = response.data.url
-              this.inspect.pictureAddress = response.data.url
-              addOut(this.inspect)
-                .toPromise()
-                .then((response) => {})
-            })
-          }
-        })
+        // html2canvas(this.$refs.saveImg.$el).then((canvas) => {
+        //   let dataURL = canvas.toDataURL('image/png')
+        //   this.imgUrl = dataURL
+        //   if (this.imgUrl !== '') {
+        //     let b = this.dataURLtoFile(this.imgUrl, 'printImage')
+        //     let formdata = new FormData()
+        //     formdata.append('file', b)
+        //     axios({
+        //       method: 'post',
+        //       url:this.global.uploadPath,
+        //       data: formdata,
+        //     }).then((response) => {
+        //       //编辑接口
+        //       this.printData.pictureAddress = response.data.url
+        //       this.inspect.pictureAddress = response.data.url
+        //       addOut(this.inspect)
+        //         .toPromise()
+        //         .then((response) => {})
+        //     })
+        //   }
+        // })
         this.isShowPrint = false
       },
       print() {

src/views/profitable/cashoutaduit.vue

@@ -130,6 +130,49 @@
 
       </div> -->
       <div>
+        <div class="wenzi">车辆详情</div>
+        <el-table :data="deptBudgetList.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList"  >
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
+        <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+        <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+        <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
+        <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
+        </el-table-column>
+        <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
+        </el-table-column>
+        <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
+        <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
+        <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
+        <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+        </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="totalPayable"></el-table-column>
+        <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
+        </el-table-column>
+        <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+        <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
+        </el-table-column>
+        <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
+          <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+            <template
+              slot-scope="scope">
+              {{ scope.row.name }}
+              <span v-if="scope.row.fleetFlag==1">(队)</span>
+            </template>
+            </el-table-column>
+          </el-table>
         <div style='width:90%;margin:10px auto;text-align:right;'>
           <el-button class="bg-bottom" type="primary" size="small" @click="reject()">驳回
         </el-button>

src/views/profitable/cashoutaduitNQ.vue

@@ -71,6 +71,49 @@
             <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
           </el-form-item>
         </el-form>
+        <div class="wenzi">车辆详情</div>
+        <el-table :data="deptBudgetList.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList"  >
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
+        <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+        <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+        <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
+        <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
+        </el-table-column>
+        <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
+        </el-table-column>
+        <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
+        <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
+        <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
+        <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+        </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="totalPayable"></el-table-column>
+        <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
+        </el-table-column>
+        <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+        <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
+        </el-table-column>
+        <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
+          <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+            <template
+              slot-scope="scope">
+              {{ scope.row.name }}
+              <span v-if="scope.row.fleetFlag==1">(队)</span>
+            </template>
+            </el-table-column>
+          </el-table>
         <!-- 经营性费用不分配 -->
         <div v-if='deptBudgetList.expensesPurpose!=5'>
           <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>

src/views/profitable/expensemanagementdetails.vue

@@ -205,7 +205,7 @@
               " @click="allot(scope.row)" type="primary">分配</el-button>
               <!-- <el-button v-if='scope.row.approveStatus=="已驳回"' @click="del(0,scope.row)" type="primary">删除</el-button> -->
               <el-button v-if='scope.row.status=="已驳回"' @click="del(0,scope.row)" type="danger">删除</el-button>
-              <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待决策人审核"||scope.row.approveStatus=="待内勤审核"||scope.row.approveStatus=="待单证中心审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
+              <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待杜大光审核"||scope.row.approveStatus=="待决策人审核"||scope.row.approveStatus=="待内勤审核"||scope.row.approveStatus=="待单证中心审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
               <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
             </template>
           </el-table-column>
@@ -310,6 +310,7 @@ import {
   getXialaList,
   sponsorWithdraw,
   exportFile,
+  getcostNo
 } from '@/model/profitable/index'
 import { getwarehousName} from '@/model/warehouse/index'
 import {
@@ -327,6 +328,7 @@ export default {
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
+      
       size: 100,
       expensesPurpose: '',
       recordList: [],
@@ -435,17 +437,14 @@ export default {
           this.warehousNameList = response
         })
        //搜索框下拉数据
-       getexenseinfo({
+       getcostNo({
         compId: localStorage.getItem('ws-pf_compId'),
-        startDate: this.startDate,
-        endDate: this.endDate,
-        searchKeyWord: '',
-        currentPage: 1,
-        pageSize: 9999,
+        // currentPage: 1,
+        // pageSize: 9999,
       })
         .toPromise()
         .then((response) => {
-          this.choiceObj = response.records
+          this.choiceObj = response
         })
          //流向
          getXialaList({

src/views/profitable/expensemanagentlook.vue

@@ -61,6 +61,8 @@
           </div>
           <div v-else>暂无附件</div>
         </el-form-item>
+
+          
         </el-form>
         <el-form label-position="left">
             <div style='margin:20px -30px;font-weight:bold'>收款账户信息</div>
@@ -78,6 +80,49 @@
             </el-form-item>
           </el-form>
         </div>
+        <div class="wenzi">车辆详情</div>
+        <el-table :data="deptBudgetList.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList"  >
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
+        <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+        <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+        <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
+        <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
+        </el-table-column>
+        <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
+        </el-table-column>
+        <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
+        <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
+        <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
+        <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+        </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="totalPayable"></el-table-column>
+        <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
+        </el-table-column>
+        <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+        <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
+        </el-table-column>
+        <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
+          <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+            <template
+              slot-scope="scope">
+              {{ scope.row.name }}
+              <span v-if="scope.row.fleetFlag==1">(队)</span>
+            </template>
+            </el-table-column>
+          </el-table>
         <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
           <div style='margin-bottom:20px;'>费用分配</div>
           <!-- <div> -->
@@ -300,4 +345,8 @@
   width: 110px;
   height:140px;
 }
+.wenzi{
+  width:90%;
+  margin:0 auto;
+}
 </style>

src/views/profitable/payment.vue

@@ -17,6 +17,8 @@
           <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
             <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="1"
+                style="color: #8890b1" />
+                <ws-option label="运费" value="2"
                 style="color: #8890b1" />
                 <ws-option label="库点费用" value="3"
                 style="color: #8890b1" />
@@ -69,20 +71,20 @@
           </div>
         </el-form-item>
         </el-form>
-        <div v-if="this.payeeinfo" style='width:50%;'>
+        <div style='width:50%;'>
           <div style='margin:0 auto 10px;width:90%;'>账户信息</div>
             <el-form label-position="left">
             <el-form-item  label-width='100px' label="收款方" span="1" prop="purpose" class="readonly">
-            {{payeeinfo.customerType=="企业客户"?payeeinfo.compName:payeeinfo.customerName}}
+            {{deptBudgetList.payee}}
             </el-form-item>
             <el-form-item  label-width='100px' label="账号" span="1" prop="purpose" class="readonly">
-            {{payeeinfo.bankCard}}
+            {{deptBudgetList.accountNumber}}
             </el-form-item>
             <el-form-item  label-width='100px' label="开户行" span="1" prop="purpose" class="readonly">
-            {{payeeinfo.bankDeposit}}
+            {{deptBudgetList.bank}}
             </el-form-item>
             <el-form-item  label-width='100px' label="开户支行" span="1" prop="purpose" class="readonly">
-            {{payeeinfo.bankDepositBranch}}
+            {{deptBudgetList.bankBranch}}
             </el-form-item>
              </el-form>
         </div>
@@ -162,15 +164,15 @@
           //     this.paymentScreenshot.push(arr[i])
           //   }
           // }
-          if(localStorage.getItem('ws-pf_roleName')=='出纳'){
-            if(this.deptBudgetList.expensesPurpose==1){
-              getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:response.contractNo}).toPromise()
-              .then((response1) => {
-                this.payeeinfo=response1
-                console.log(this.payeeinfo)
-              })
-            }          
-          }
+          // if(localStorage.getItem('ws-pf_roleName')=='出纳'){
+          //   if(this.deptBudgetList.expensesPurpose==1){
+          //     getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:response.contractNo}).toPromise()
+          //     .then((response1) => {
+          //       this.payeeinfo=response1
+          //       console.log(this.payeeinfo)
+          //     })
+          //   }          
+          // }
         })
         
       },

src/views/profitable/receipt.vue

@@ -126,6 +126,7 @@
         this.$refs.upload
           .handleSaveBill()
           .then(async response => {
+            console.log(response)
             this.deptBudgetList.addressUrl = response
           })
           .catch(res => {
@@ -248,7 +249,6 @@
                 type: 'warning',
           })
         }
-        this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
         addexenseinfo(this.deptBudgetList).toPromise()
           .then(response => {
             this.$message({

src/views/profitable/receiptaduit.vue

@@ -175,6 +175,8 @@
           .then(() => {
             this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
         this.deptBudgetList.flag=0
+        this.$delete(this.deptBudgetList,'status')	
+        this.$delete(this.deptBudgetList,'statusFlag')	
         editexenseinfo(this.deptBudgetList)
         .toPromise()
         .then((response) => {

src/views/statisticalReport/autoSettlementList.vue

@@ -22,34 +22,42 @@
         </el-col>
         <el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="12">
           <el-select v-model="contractNo" placeholder="请选择合同" clearable filterable @change="contractchange"
-            maxlength="500" type="input" class="findValue">
+            maxlength="500" type="input">
             <el-option v-for="item in options" :key="item.id"
               :label="item.reportStatus?(item.contractNo + '(' + item.reportStatus + ')'):item.contractNo" :value="item.contractNo" />
             <!-- <el-option v-if="!item.reportStatus" v-for="item in options" :key="item.constKey" :label="item.contractNo"
               :value="item.contractNo" /> -->
           </el-select>
-          <el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" >
+          <el-select class="selectwarehouse" v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" >
             <el-option key="全部仓库" label="全部仓库" value="" style="color: #8890b1" />
             <el-option v-for="item in warehouseList1" :key="item.id" :label="item.warehouseName" :value="item.warehouseName" style="color: #8890b1" />
           </el-select>
-          <el-select v-model="carType" filterable placeholder="" @change="carTypeChange" >
+          <el-select  v-model="carType" filterable placeholder="" @change="carTypeChange" >
             <el-option key="全部" label="全部" value="" style="color: #8890b1" />
             <el-option key="未卸车" label="未卸车" value="1" style="color: #8890b1" />
             <el-option key="已卸车" label="已卸车" value="2" style="color: #8890b1" />
           </el-select>
-          <!-- <el-input v-model="startAddress" placeholder="可按照发货地进行查找" clearable maxlength="500" type="input"
+          <!--  -->
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col  :span="12">
+          &nbsp;
+          <div v-hasPermission="`report.transportationReport.wuliu`" style="display:flex;align-items:center;justify-content: flex-start;" v-if="contractNo!='全部合同'&&warehouseList.records.length>0"><div style="width:100px;">粮食单价：</div> <div v-if="grainPricetext=='编辑'">{{grainPrice}}</div><el-input style="margin:0;" v-else v-model="grainPrice"></el-input><el-button style="margin:0 0 0 5px;" type="primary" @click="editgrainPrice">{{grainPricetext}}</el-button></div></el-col>
+        <el-col style="padding-left: 15px;text-align:right;" :span="12">
+          <el-date-picker @change="datechange" format="yyyy-MM-dd" v-model="value2" type="daterange" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
+        </el-date-picker>
+          <el-input v-model="carNo" placeholder="可按车牌号进行查找" clearable maxlength="500" type="input"
           class="findValue" @keyup.enter.native="find()"></el-input>
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            " src="../../../public/img/sousuo.png" alt="" /></ws-button> -->
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
         </el-col>
       </el-row>
-      <el-row>
-        <div v-hasPermission="`report.transportationReport.wuliu`" style="display:flex;align-items:center;justify-content: flex-start;" v-if="contractNo!='全部合同'&&warehouseList.records.length>0"><div style="width:100px;">粮食单价：</div> <div v-if="grainPricetext=='编辑'">{{grainPrice}}</div><el-input style="margin:0;" v-else v-model="grainPrice"></el-input><el-button style="margin:0 0 0 5px;" type="primary" @click="editgrainPrice">{{grainPricetext}}</el-button></div>
-      </el-row>
       <el-row>
         <div style="color:red">注：审核时，同一运输阶段勾选任意复选框，当前运输阶段下所有条目都通过审核！</div>
       </el-row>
@@ -415,6 +423,34 @@
         <img style="width: 100px; height: 100px" :src="item" alt="" />
       </div> -->
     </WinseaContentModal>
+    <WinseaContentModal v-model="show" title="请款信息" @on-cancel="handleClose3">
+      <el-form>
+        <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
+          <el-input class='input50 input_css' placeholder="输入收款方" v-model="deptBudgetList.payee"></el-input>
+        </el-form-item>
+        <el-form-item label-width='100px' label="账号" span="1" prop="accountNumber">
+          <el-input class='input50 input_css' placeholder="输入账号" v-model="deptBudgetList.accountNumber"></el-input>
+        </el-form-item>
+        <el-form-item label-width='100px' label="开户行" span="1" prop="bank">
+          <el-input class='input50 input_css' placeholder="输入开户行" v-model="deptBudgetList.bank"></el-input>
+        </el-form-item>
+        <el-form-item label-width='100px' label="开户支行" span="1" prop="bankBranch">
+          <el-input class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
+        </el-form-item>
+        <el-form-item label-width='100px' label="备注" span="1" prop="bankBranch">
+          <el-input
+            type="textarea"
+            :rows="5"
+            placeholder="选填，不超过50个字"
+            v-model="deptBudgetList.remark">
+            </el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="handleClose3">取 消</el-button>
+        <el-button @click="submitdata">提交</el-button>
+      </div>
+    </WinseaContentModal>
   </div>
   <!-- </div> -->
 </template>
@@ -466,9 +502,55 @@ export default {
 
   data() {
     return { 
+      value2:[],
       alreadyInvoice: '',
       needReapply: true,
       totalList:[],
+      carNo:'',
+      deptBudgetList:{},
+      pickerOptions: {
+          shortcuts: [{
+              text: '本周',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                var thisDay = start.getDay()
+                var thisDate = start.getDate()
+                if (thisDay != 0) {
+                  start.setDate(thisDate - thisDay)
+                }
+                picker.$emit('pick', [start, end])
+              },
+            },
+            {
+              text: '本月',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                start.setDate(1)
+                picker.$emit('pick', [start, end])
+              },
+            },
+            {
+              text: '本季度',
+              onClick(picker) {
+                var oDate = new Date()
+
+                var thisYear = oDate.getFullYear()
+                var thisMonth = oDate.getMonth() + 1
+
+                var n = Math.ceil(thisMonth / 3) // 季度
+
+                var Month = n * 3 - 1
+
+                var start = new Date(thisYear, Month - 2, 1)
+                var end = new Date()
+
+                picker.$emit('pick', [start, end])
+              },
+            },
+          ],
+        },
       dialogFormVisible1: false,
       dialogFormVisible2: false,
       dialogFormVisible3: false,
@@ -507,7 +589,6 @@ export default {
       year: '',
       options: [],
       id: '',
-      value2: '',
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
@@ -568,6 +649,7 @@ export default {
           month: dayjs().format('MM'),
         },
       carType:'',
+      show:false,
       settlementPrice:0,
       amountNotPayable: 0,
       amountEdPayable: 0,
@@ -595,6 +677,16 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    datechange(e){
+      if (this.value2) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.getList()
+    },
     async exportlist() {
       if(this.modification.length>0){
         const {
@@ -778,7 +870,7 @@ export default {
         }
       }
     },
-    date() {
+    getDate() {
       var date = new Date();
       var y = date.getFullYear();
       var m = date.getMonth() + 1;
@@ -809,6 +901,9 @@ export default {
     handleClose2() {
       this.paymentImg = false
     },
+    handleClose3() {
+      this.show = false
+    },
     //账户
     look(item) {
       this.dialogFormVisible8 = true
@@ -832,7 +927,7 @@ export default {
       // this.money = this.money
       this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
       this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
-      this.paymentDate = this.date()
+      this.paymentDate = this.getDate()
       if (this.modification.length == 0) {
         this.$message.warning('请选择一条要付款的条目')
       } else {
@@ -1408,17 +1503,17 @@ export default {
           }
         }
         var arr=this.ArrSet(this.modification,this.contractNo)
-        
-        this.$confirm(`是否确定请款？`, {
-          cancelButtonText: '取消',
-          confirmButtonText: '确定',
-          type: 'warning',
-        }).then(() => {
-          submitlogistics({tranSettlementReportList:this.modification}).toPromise()
-        .then((response) => {
-          this.$message.success('请款成功')
-          this.getList()
-        })
+        this.show=true
+        // this.$confirm(`是否确定请款？`, {
+        //   cancelButtonText: '取消',
+        //   confirmButtonText: '确定',
+        //   type: 'warning',
+        // }).then(() => {
+        //   submitlogistics({tranSettlementReportList:this.modification}).toPromise()
+        // .then((response) => {
+        //   this.$message.success('请款成功')
+        //   this.getList()
+        // })
           //批次通过  选中列表中 数据一个batchId， 选中列表去重
           // var obj = {};
           // that.modification = that.modification.reduce(function (item, next) {
@@ -1427,9 +1522,32 @@ export default {
           // }, []);
           // console.log('去重后提交数据', that.modification);
           // that.audit(this.modification[0], 0, true, 2)
-        })
+        // })
       }
     },
+    submitdata(){
+      this.deptBudgetList.tranSettlementReportList=this.modification
+      this.$confirm(`是否确定请款？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          submitlogistics(this.deptBudgetList).toPromise()
+        .then((response) => {
+          this.show=false
+          this.$message.success('请款成功')
+          this.getList()
+        })
+          // 批次通过  选中列表中 数据一个batchId， 选中列表去重
+        //   var obj = {};
+        //   that.modification = that.modification.reduce(function (item, next) {
+        //     obj[next.batchId] ? '' : obj[next.batchId] = true && item.push(next);
+        //     return item;
+        //   }, []);
+        //   console.log('去重后提交数据', that.modification);
+        //   that.audit(this.modification[0], 0, true, 2)
+        })
+    },
     handleSelectionChange(val) {
       if (val.length !== 0) {
         this.totalList = this.countTotal(val)
@@ -1506,7 +1624,10 @@ export default {
         searchType: this.searchType,
         contractNo: this.contractNo,
         manualFlag: this.manualFlag,
-        carType:this.carType
+        carType:this.carType,
+        carNo:this.carNo,
+        startDate:this.startDate,
+        endDate:this.endDate
       })
         .toPromise()
         .then((response) => {
@@ -1577,7 +1698,7 @@ export default {
         } else {
           //不是第一项时，就根据标识去存储
           if (data[index].warehouseNumViewList.length > 1) {
-            查找到符合条件的数据时每次要把之前存储的数据 + 1
+            // 查找到符合条件的数据时每次要把之前存储的数据 + 1
             this.spanArr[this.pos] = data[index].warehouseNumViewList.length
             this.spanArr.push(0)
           } else {
@@ -1594,7 +1715,7 @@ export default {
         'Y+': date.getFullYear().toString(), // 年
         'm+': (date.getMonth() + 1).toString(), // 月
         'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
+        // 'H+': date.getHours().toString(), // 时
         // "M+": date.getMinutes().toString(),         // 分
         // "S+": date.getSeconds().toString()          // 秒
         // 有其他格式化字符需求可以继续添加，必须转化成字符串
@@ -1883,7 +2004,7 @@ export default {
 .el-input--small {
   font-size: 13px;
   width: 390px;
-  margin-left: 74%;
+  // margin-left: 74%;
 }
 
 /deep/.el-table .el-table__header .cell,
@@ -1925,9 +2046,11 @@ hr {
   width: 66%;
   margin-left: 9%;
 }
-
 .el-date-editor.el-input,
-.el-date-editor.el-input__inner,
+.el-date-editor.el-input__inner{
+  width:40% !important;
+}
+
 .el-input-number--small {
   width: 123% !important;
 }
@@ -1954,4 +2077,10 @@ hr {
     border: 1px solid #5473e8;
     color: #5473e8;
   }
+  /deep/.el-select{
+    width:30%;
+  }
+  // .selectwarehouse{
+  //   margin-left:5px;
+  // }
 </style>

src/views/taskManagement/supplyofgoods.vue

@@ -72,7 +72,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
   </div>
 </template>
 <script>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -125,10 +125,9 @@
               <!-- <el-button @click="examine(2)" v-else-if="deptBudgetList.priceStatus=='审核中'&&pricetype==2" type="primary">{{deptBudgetList.approveStatus}}</el-button> -->
             </div>
           </div>
-          <div class="content3" v-for="(item, index) in driverlist" :key="index">
+          <div class="content3" v-for="(item, index) in driverlist" :key="item.id">
             <div class="content3-item1">
-
-              <div class="">
+              <div>
                 <span style="margin-left: 30px;font-weight: 600;">司机-{{ index + 1 }}</span>
                 <span class="noservice" v-show="item.status == '未装车'">{{
                      item.status
@@ -140,7 +139,6 @@
                      item.status
                    }}</span>
               </div>
-
               <el-col :span="8">
 
                 <el-form-item label="姓名：" span="1" prop="driverName" label-width="125px">
@@ -167,7 +165,7 @@
                                  phonechange(val, item.tranCarIndex)
                                }
                              ">
-                    <el-option v-for="(items, index) in carList" :key="index" :label="items.driverPhone"
+                    <el-option v-for="(items, index) in carList" :key="items.id" :label="items.driverPhone"
                       :value="items.driverPhone" />
                   </el-select>
                   <span v-show="
@@ -184,7 +182,7 @@
                                  carNochange(val, item.tranCarIndex)
                                }
                              ">
-                    <el-option v-for="(items, index) in carNoList" :key="index" :label="items.carNumber"
+                    <el-option v-for="(items, index) in carNoList" :key="items.id" :label="items.carNumber"
                       :value="items.carNumber" />
                   </el-select>
                   <!-- <el-input :disabled="readonly" v-model="item.carNo" placeholder="" maxlength="120" size="small" /> -->
@@ -192,7 +190,8 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="派车编号：" span="1" prop="carModel" label-width="125px">
-                  <el-input :disabled="readonly" v-model="item.tranCarNo" maxlength="120" size="small" />
+                  <el-input v-if="!readonly" v-model="item.tranCarNo" maxlength="120" size="small" />
+                  <span v-else>{{item.tranCarNo}}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -1010,242 +1009,6 @@
   }
 </script>
 <style lang="scss" scoped>
-  // /deep/.basicInformation {
-  //   .ws-info-table {
-  //     border: none;
-  //   }
-
-  //   .myTest {
-  //     width: 800px;
-  //     display: flex;
-  //     height: 40px;
-  //   }
-
-  //   .el-form-item {
-  //     width: 33.3333%;
-  //     border: none;
-  //     height: 50px;
-
-  //     .el-form-item__label {
-  //       background: transparent;
-  //       border: none;
-  //     }
-
-  //     .el-form-item__content {
-  //       border: none;
-  //     }
-  //   }
-  // }
-
-  // .title {
-  //   position: relative;
-  //   padding-left: 10px;
-  // }
-
-  // .title::before {
-  //   content: '';
-  //   display: inline-block;
-  //   width: 5px;
-  //   height: 30px;
-  //   background: #5473e8;
-  //   position: absolute;
-  //   left: 0;
-  // }
-
-  // .el-form {
-  //   padding: 0 10%;
-  // }
-
-  // .el-button--primary {
-  //   background-color: #5878e8;
-  //   border-color: #5878e8;
-  // }
-
-  // .el-col {
-  //   background: #f6f7fc;
-  // }
-
-  // .bg-right {
-  //   text-align: right;
-  //   padding: 16px 20px;
-  // }
-
-  // .center {
-  //   margin: 0 auto;
-  //   width: 70%;
-  // }
-
-  //表格文字
-  // /deep/.ws-info-table .el-form-item .el-form-item__label {
-  //   text-align: center;
-  //   font-size: 14px;
-  //   font-weight: 400;
-  //   color: #8890b1;
-  //   line-height: 16px;
-  // }
-
-  // //蓝标
-  // .small-title {
-  //   position: relative;
-  //   padding: 10px;
-  //   font-weight: 600;
-  // }
-
-  // .small-title::before {
-  //   position: absolute;
-  //   content: '';
-  //   display: block;
-  //   background: #5473e8;
-  //   width: 4px;
-  //   height: 14px;
-  //   left: 0px;
-  //   top: 13px;
-  //   padding: 4px 2px;
-  // }
-
-  // .position {
-  //   position: relative;
-  // }
-
-  // .position .zaizhong {
-  //   width: 16%;
-  // }
-
-  // //减号
-  // .del {
-  //   position: absolute;
-  //   // right: -38px;
-  //   top: 9px;
-  //   cursor: pointer;
-  //   right: 0;
-  //   display: inline-block;
-  //   font-size: 20px;
-  //   width: 20px;
-  //   height: 10px;
-  //   line-height: 0px;
-  // }
-
-  // .driver .el-form-item {
-  //   width: 16.63%;
-  // }
-
-  // /deep/.ws-info-table .el-form-item .el-form-item__content {
-  //   background: #f5f7fa;
-  //   border-radius: 4px;
-  //   color: #8890b1;
-  //   font-size: 14px;
-  //   padding: 0 25px;
-  // }
-
-  // /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
-  //   width: 72px;
-  // }
-
-  // /deep/.liaison .ws-info-table .el-form-item {
-  //   width: 220px;
-  //   color: #8890b1;
-  //   font-size: 14px;
-  // }
-
-  // /deep/.ws-info-table .el-form-item {
-  //   border: none;
-  //   height: 50px;
-  // }
-
-  // /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  //   width: 50%;
-  //   border: 0px solid #d8dce6;
-  //   background: #f5f7fa;
-  //   text-align: center;
-  // }
-
-  // /deep/.liaison {
-  //   background: #f5f7fa;
-  //   border-radius: 4px;
-  //   border: 0px solid #d8dce6;
-  // }
-
-  // /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-  //   border: none;
-  //   background: #f5f7fa;
-  //   padding: 0px;
-  // }
-
-  // .catNos {
-  //   width: 100%;
-  //   height: 30px;
-  //   margin-top: 10px;
-  //   margin-left: 20px;
-  //   font-size: 14px;
-  // }
-
-  // /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-  //   border-radius: 0px;
-  //   border-left: none;
-  //   border-bottom: none;
-  //   border-top: none;
-  // }
-
-  // /deep/.liaison .ws-info-table {
-  //   background: #f6f7fc;
-  //   border-radius: 4px;
-  //   border: 1px solid #d8dce6;
-  //   margin-top: 20px;
-  // }
-
-  //送达/未送达
-  // .noservice,
-  // .service {
-  //   display: inline-block;
-  //   border-radius: 4px;
-  //   border: 1px solid #d8dce6;
-  //   padding: 2px;
-  //   font-size: 12px;
-  // }
-
-  // .noservice {
-  //   background: #c4cada;
-  //   color: #ffffff;
-  // }
-
-  // .service {
-  //   background: #e5f1f7;
-  //   color: #50cad4;
-  // }
-
-  // .serviced {
-  //   display: inline-block;
-  //   border-radius: 4px;
-  //   border: 1px solid #d8dce6;
-  //   padding: 2px;
-  //   font-size: 12px;
-  //   background: #e5f1f7;
-  //   color: #2c81cf;
-  // }
-
-  // //添加司机
-  // .add {
-  //   width: 100px;
-  //   height: 34px;
-  //   background: #f6f7fb;
-  //   border-radius: 17px;
-  //   color: #5473e8;
-  //   font-size: 14px;
-  //   border: none;
-  // }
-
-  // .add img {
-  //   display: inline-block;
-  //   margin-top: 3px;
-  //   margin-left: -12px;
-  // }
-
-  // .add .spans {
-  //   display: table-caption;
-  //   width: 56px;
-  //   height: 20px;
-  //   line-height: 18px;
-  // }
 
   /deep/.el-form-item--small.el-form-item {
     margin-bottom: 0px
@@ -1335,14 +1098,7 @@
       height: 90px;
     }
 }
-  .content4 {
-    background: #F5F7FA;
-    display: flex;
-    margin: 10px 0;
-    border: 1px solid #E4E7ED;
-    border-radius: 5px;
-    position: relative;
-  }
+
 
   .del {
     position: absolute;

src/views/universalityAudit/audit.vue

@@ -51,6 +51,8 @@
           </el-table-column>
           <el-table-column prop="auditBusinessNo" label="审核业务编号">
           </el-table-column>
+          <el-table-column prop="sponsor" label="发起人">
+          </el-table-column>
           <el-table-column prop="businessType" label="类型">
           </el-table-column>
           <el-table-column prop="buyer" label="备注">
@@ -108,7 +110,7 @@
     <el-dialog
   title="提示"
   :visible.sync="addshow"
-  width="30%"
+  width="70%"
   :before-close="handleClose">
   <el-form ref="form" :model="form" label-width="80px">
   <el-form-item label="类型">
@@ -123,7 +125,7 @@
   </el-form-item>
   
   <el-form-item label="备注">
-    <el-input maxlength="2000" type="textarea" show-word-limit v-model="form.remark"></el-input>
+    <el-input maxlength="2000" rows="5" type="textarea" show-word-limit v-model="form.remark"></el-input>
   </el-form-item>
   <el-form-item>
     <el-button @click="addshow=false">取消</el-button>
@@ -441,7 +443,7 @@
           })
           .then(() => {
             this.form.compId=localStorage.getItem('ws-pf_compId')
-            this.form.sponsor=localStorage.getItem('ws-pf_roleName')
+            this.form.sponsor=localStorage.getItem('ws-pf_staffName')
           addaduitinfo(this.form).toPromise().then(response => {
             this.$message({
                 message: '提交成功!',

src/views/universalityAudit/component/routers/route.js

@@ -1,36 +1,36 @@
 import Layout from '@/layout/index';
 
-// const profitableRouter = {
-//   path: '/aduitmanagement',
-//   component: Layout,
-//   redirect: '/aduitmanagement',
-//   name: 'aduitmanagement',
-//   alwaysShow: true, // will always show the root menu
-//   meta: {
-//     title: 'aduitmanagement',
-//     module: 'generalAudit',
-//     icon: '-caigouguanli'
-//   },
-//   children: [
+const profitableRouter = {
+  path: '/aduitmanagement',
+  component: Layout,
+  redirect: '/aduitmanagement',
+  name: 'aduitmanagement',
+  alwaysShow: true, // will always show the root menu
+  meta: {
+    title: 'aduitmanagement',
+    module: 'generalAudit',
+    icon: '-caigouguanli'
+  },
+  children: [
    
-//       {
-//         path: 'audit',
-//         component: () =>
-//           import(/* webpackChunkName: "applDetail" */ '@/views/universalityAudit/audit'),
-//         name: 'audit',
-//         meta: {
-//           title: 'universalityaudit',
-//           shortcutEntrance: 'profitable',
-//           module: 'generalAudit',
-//           permissicon: [],
-//           keepAlive: true,
-//           _title:'通用审核'
-//           // module: 'procurement.sparepart.applDetail'
-//         }
-//       },  
+      {
+        path: 'audit',
+        component: () =>
+          import(/* webpackChunkName: "applDetail" */ '@/views/universalityAudit/audit'),
+        name: 'audit',
+        meta: {
+          title: 'universalityaudit',
+          shortcutEntrance: 'profitable',
+          module: 'generalAudit',
+          permissicon: [],
+          keepAlive: true,
+          _title:'通用审核'
+          // module: 'procurement.sparepart.applDetail'
+        }
+      },  
     
-//   ],
+  ],
 
-// };
+};
 
-// export default profitableRouter;
+export default profitableRouter;

src/views/warehousenew/warehouseManagementList.vue

@@ -382,7 +382,7 @@
       }
     },
     activated() {
-       this.tableData = []
+      this.tableData = []
       this.getList()
       //  this.$refs.childMap.clearVal()
       this.showType = this.isShow

src/views/warehousenew/warehousingOrder.vue

@@ -19,14 +19,21 @@
           </el-select>
         </div>
         <div style='width:50%;margin-right:10px;display: flex;'>
-          <el-select v-model="goodsName" filterable placeholder="" @change="goodsNameChange" :value="searchType"
+          <el-select v-model="goodsName" filterable placeholder="" @change="goodsNameChange" 
             style="margin: 0 10px">
-            <el-option key="全部货名" label="全部货名" value="" style="color: #8890b1" />
-            <el-option v-for="(item,index) in goodsList" :key="index" :label="item.goodsName"
-              :value="index" style="color: #8890b1" />
+            <el-option key="全部货名" label="全部货名" value="0" style="color: #8890b1" />
+            <el-option v-for="(item,index) in goodsList" :key="item.id" :label="item.goodsName"
+              :value="(index+1)" style="color: #8890b1" />
           </el-select>
           <span style="width:100px" v-if="warehouseName && goodsName">{{reserves?reserves:0}}吨</span>
         </div>
+        <div style='width:50%;margin-right:10px;display: flex;'>
+          <el-select v-model="weightGreater" filterable placeholder="" @change="weightGreaterChange" 
+            style="margin: 0 10px">
+            <el-option key="全部重量" label="全部重量" value="" style="color: #8890b1" />
+            <el-option key="剩余重量大于0" label="剩余重量大于0" value="1" style="color: #8890b1" />
+          </el-select>
+        </div>
       </template>
       <template slot="right">
         <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按货源查找" clearable
@@ -549,6 +556,7 @@ export default {
       rejectshow:false,
       options: [],
       textarea: '',
+      weightGreater:'',
       dialogVisiblecontent: false,
       // 船舶类型
       monetaryKey: null,
@@ -649,7 +657,7 @@ export default {
       endDate: '',
       startDate: '',
       warehouseName: '',
-      goodsName:'',
+      goodsName:'0',
       reserves:'',
       goodsList:[],
       compId: localStorage.getItem('ws-pf_compId'),
@@ -668,7 +676,7 @@ export default {
       warehouseList: [],
       currectfocusdata: {},
       customershow: false,
-      interestratevalue: '',
+      interestratevalue: {},
       accessoryTFs: false,
       remarkList: false,
       dialogTitle: '',
@@ -699,6 +707,9 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    weightGreaterChange(e){
+      this.getList()
+    },
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];
@@ -731,7 +742,7 @@ export default {
       if (e == '全部仓库' || e == '') {
         this.warehouseName = ''
         this.goodsList = []
-        this.goodsName = ''
+        this.goodsName = '0'
         this.baseId = ''
       }else{
         for(let i =0 ; i<this.warehouseList.length;i++){
@@ -740,30 +751,39 @@ export default {
               if(j==0){
                 this.goodsList.push(this.warehouseList[i].goodsNameInfos[j])
               }else{
-                for(let n = 0;n < this.goodsList.length;n++){
-                  if(this.goodsList[n].goodsName == this.warehouseList[i].goodsNameInfos[j].goodsName){
-                    this.goodsList[n].storage += this.warehouseList[i].goodsNameInfos[j].storage
-                  }else{
+                // 
+                  if(this.goodsList.every((item)=>{return item.goodsName != this.warehouseList[i].goodsNameInfos[j].goodsName}) ){
                     this.goodsList.push(this.warehouseList[i].goodsNameInfos[j])
+                  }else{
+                    for(let n = 0;n < this.goodsList.length;n++){
+                      if(this.goodsList[n].goodsName == this.warehouseList[i].goodsNameInfos[j].goodsName){
+                        this.goodsList[n].storage += this.warehouseList[i].goodsNameInfos[j].storage
+                      }
+                   }
                   }
-                }
+                // 
               }
             }
             this.baseId = this.warehouseList[i].id
             break
           }
         }
-        this.goodsName= ''
+        this.goodsName= '0'
         this.reserves = ''
       }
       this.multipleSelection1={}
       this.getList()
     },
     goodsNameChange(e){
-        this.goodsName = this.goodsList[e].goodsName
-        this.reserves = this.goodsList[e].storage
+      console.log(e,1111111111)
+      if (e == '全部货名' || e == '0') {
+        this.goodsName = '0'
+        this.reserves = ''
+      }else{
+        this.goodsName = this.goodsList[e-1].goodsName
+        this.reserves = this.goodsList[e-1].storage
+      }
         this.multipleSelection1={}
-        
         this.getList()
     },
     handleClose5() {
@@ -1009,7 +1029,7 @@ export default {
     },
     payout(item) {
       console.log(item)
-      if (localStorage.getItem('ws-pf_roleName') == '销售内勤' || localStorage.getItem('ws-pf_roleName') == '采购内勤') {
+      if (localStorage.getItem('ws-pf_roleName') == '销售内勤' || localStorage.getItem('ws-pf_roleName') == '采购内勤'||localStorage.getItem('ws-pf_roleName').indexOf('专员')> -1) {
         if (Object.keys(this.multipleSelection1).length != 0 && this.multipleSelection1[item.id].length > 0) {
           for (let i = 0; i < this.multipleSelection1[item.id].length; i++) {
             if (item.warehouseName == this.multipleSelection1[item.id][i].warehouseName) {
@@ -1337,7 +1357,7 @@ export default {
       //   })
     },
     selectInit(row, index) {
-      if (localStorage.getItem('ws-pf_roleName') == '销售内勤' || localStorage.getItem('ws-pf_roleName') == '采购内勤') {
+      if (localStorage.getItem('ws-pf_roleName') == '销售内勤' || localStorage.getItem('ws-pf_roleName') == '采购内勤'||localStorage.getItem('ws-pf_roleName').indexOf('专员')> -1) {
         return true
 
       } else if (localStorage.getItem('ws-pf_staffName') == '杜大光') {
@@ -1348,6 +1368,8 @@ export default {
         return true
       } else if (localStorage.getItem('ws-pf_roleName') == '出纳') {
         return true
+      }else if (localStorage.getItem('ws-pf_deptName') == '单证中心') {
+        return true
       } else {
         return false
       }
@@ -1826,7 +1848,8 @@ export default {
         baseId: this.baseId,
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
-        goodsName:this.goodsName
+        goodsName:this.goodsName!='0'?this.goodsName:'',
+        weightGreater:this.weightGreater
       })
         .toPromise()
         .then((response) => {

src/views/workNotification/utils/index.js

@@ -26,6 +26,9 @@ export function code2Url (type, code, state,status,message,businessId) {
         // 判断 付款
     case 'PAYMENT':
       return payment(code, state)
+    // 判断 运输结算统计
+    case 'TRANSPORTATION':
+      return yunshujiesuan(code, state)
     case 'TRADE':
       return warehouseReceiptRegulation(code, state)
     case 'ROLE':
@@ -63,6 +66,16 @@ export function trantask(code, state,message){
   }
    return url
 }
+export function yunshujiesuan(code, state,message){
+  let url = ''
+  switch (code) {
+      case 'TRANSPORTATION-SETTLEMENT-REPORT':
+        url = 'autoSettlementList'
+        break
+
+  }
+   return url
+}
 export function daichu(code, state,message){
   let url = ''
   switch (code) {