Bladeren bron

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

ccj 2 jaren geleden
bovenliggende
commit
0161d72298

+ 78 - 61
public/static/payprint2.html

@@ -10,48 +10,48 @@
             border: 2px solid #333333;
             padding: 5px 0;
         }
-        
+
         #app {
             height: 88vh;
             position: relative;
         }
-        
+
         .simple {
-            height: 120vh !important;
+            height: 100vh !important;
         }
-        
+
         .content {
             width: 1000px;
             margin: auto;
         }
-        
+
         table {
             width: 100%;
             text-align: center;
             border-collapse: collapse;
         }
-        
+
         .col-bgc {
             background: #f6f7fb;
         }
-        
+
         .bottom-row1 {
             display: flex;
             justify-content: space-between;
             margin: 20px 0;
         }
-        
+
         .bottom-row2 {
             display: flex;
             margin: 10px 0;
         }
-        
+
         img {
             width: 80px;
             height: 80px;
             /* margin-right: 118px; */
         }
-        
+
         .leftimg {
             width: 80px;
             height: 80px;
@@ -59,35 +59,35 @@
             right: 20px;
             top: 3px;
         }
-        
+
         .config {
             margin-right: 240px;
         }
-        
+
         .bottom-row3 {
             margin: 10px 0;
         }
-        
+
         .title {
             text-align: center;
             font-size: 24px;
         }
-        
+
         .number {
             text-align: right;
             margin-bottom: 10px;
         }
-        
+
         .number1 {
             text-align: right;
             margin-bottom: 10px;
             margin-top: 60px;
         }
-        
+
         .small-row {
             display: flex;
         }
-        
+
         .small-content {
             width: 400px;
             margin: 0 auto;
@@ -101,7 +101,7 @@
             margin: auto;
             height: 650px;
         }
-        
+
         .small-title {
             text-align: center;
             font-size: 18px;
@@ -109,88 +109,99 @@
             justify-content: space-between;
             align-items: center;
         }
-        
+
         .small-row {
             display: flex;
             justify-content: space-between;
             margin: 10px;
         }
-        
+
         .small-img {
             margin-right: 0;
         }
-        
+
         .sign {
             margin-right: 100px;
         }
-        
+
         .header {
             display: flex;
             justify-content: space-between;
             font-size: 16px;
             margin: 10px 0;
         }
-        
+
         .header1 {
             font-size: 24px;
             /* margin: 30px 60px 10px 60px; */
             display: flex;
             justify-content: center;
         }
-        
+
         .line {
             height: 2px;
             width: 410px;
             margin: 3px auto;
             background: black;
         }
-        
+
         .line:nth-of-type(3) {
             margin-bottom: 30px;
         }
-        
+
         .header-top {
             display: flex;
             justify-content: space-between;
         }
-        
+
         .sfcard {
-            background: red;
+            /* background: red; */
         }
-        
+
         .sfcard-content {
             /*        display: flex;
         align-items: center;
         justify-content: space-evenly; */
+            /* background-color: red; */
+            /* height: 100vh; */
+        }
+        .sfcard-content_other{
+              height: 100vh;
         }
         
-        .sfcard-content img {
+
+        .sfcard-content img ,.sfcard-content_other img{
             width: 100%;
-            height: 130vh;
+            height: calc(100vh - 100px);
         }
-        
+
         .sfcard-title {
             font-size: 28px;
             text-align: center;
         }
-        
+
         .center {
-            height: 140vh;
+            height: 100vh;
         }
-        
+
         .part2 {
-            height: 140vh;
+            height: 100vh;
             /* background: red; */
         }
-        
+
         .part5 {
             width: 100%
         }
-        
+
         .paymentScreenshot {
             width: 100%;
             height: 130vh
         }
+        .bankCard_css{
+            width: 100%;
+            height: 100vh;
+        }
+
         /* .onlypz-center{
         height: 130vh;
       } */
@@ -524,9 +535,10 @@
                     </div>
 
                     <div class="part1" v-if="isShowPrintType1">
-                        <div class="sfcard-content">
+                        <div class="sfcard-content_other">
                             <div class="sfcard-title">
-                                {{ printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                                {{
+                                printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
                             </div>
                             <img :src="customerList1[index].imgURl.imageUrl1" class="avatar" />
                         </div>
@@ -539,17 +551,22 @@
               </div> -->
                     </div>
                     <div class="bankcard" v-if="isShowPrintType2">
-
-                        <div class="sfcard-content part2">
+                        <div class="sfcard-content">
                             <div class="sfcard-title">
                                 {{printData1[index].bankDeposit}}{{printData1[index].bankCard}}
                             </div>
                             <!-- <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" /> -->
-                            <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl3" class="avatar" />
-                            <img v-else  class="avatar" />
-                            <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl4" class="avatar" />
-                            <img v-else  class="avatar" />
+                            <div class="bankCard_css">
+                                <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl3"
+                                class="avatar" />
+                            <img v-else class="avatar" />
 
+                            </div>
+                            <div class="bankCard_css">
+                                <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl4"
+                                class="avatar" />
+                                <img v-else class="avatar" />
+                            </div>
                         </div>
                         <!--          <div class="sfcard-content part2">
                 <div class="sfcard-title">
@@ -1127,12 +1144,12 @@
                 }
                 return false
             },
-            printSmall() {},
-            printBig() {}
+            printSmall() { },
+            printBig() { }
         },
         mounted() {
             this.date = new Date().toLocaleString()
-                // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
+            // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
             let _data = {}
             if (localStorage.getItem('print_pay_data')) {
                 _data = localStorage.getItem('print_pay_data')
@@ -1157,7 +1174,7 @@
                 }
             } else {
                 this.printData = JSON.parse(_data)
-                    //地址过长截取
+                //地址过长截取
                 if (this.printData.identityAuthenticationInfo && this.printData.identityAuthenticationInfo.compAddress.length > 24) {
                     this.printData.identityAuthenticationInfo.compAddress = this.printData.identityAuthenticationInfo
                         .compAddress.substring(0, 24)
@@ -1166,13 +1183,13 @@
             }
             let _type = decodeURIComponent(this.getQueryVariable('type'))
             this.showType = decodeURIComponent(
-                    this.getQueryVariable('printTypeList')
-                )
-                // this.pzList = this.showType.split(',')
-                // if((this.showType.indexOf('打印结算凭证')>-1)&&this.pzList.length==1){
-                //   this.onlyShowPz = true
-                // }
-                // this.pageType = decodeURIComponent(this.getQueryVariable('printTypeList'))
+                this.getQueryVariable('printTypeList')
+            )
+            // this.pzList = this.showType.split(',')
+            // if((this.showType.indexOf('打印结算凭证')>-1)&&this.pzList.length==1){
+            //   this.onlyShowPz = true
+            // }
+            // this.pageType = decodeURIComponent(this.getQueryVariable('printTypeList'))
             let _data1 = decodeURIComponent(this.getQueryVariable('customerList'))
             if (!_data1) {
                 this.customerList1 = JSON.parse(
@@ -1187,7 +1204,7 @@
                 if (this.selectPrint) {
                     for (let i = 0; i < this.customerList1.length; i++) {
                         let _url1 = this.customerList1[i].cardAddressUrl.split(',')
-                            // let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
+                        // let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
                         this.customerList1[i].imgURl = {
                             imageUrl1: _url1[0],
                             imageUrl2: _url1[1],
@@ -1258,9 +1275,9 @@
             if (this.printData.compName == undefined) this.printData.compName = ''
             document.title = this.printData.compName + '结算凭证'
             window.print()
-                // sessionStorage.removeItem('selectPrint_selectPrintList');
-                // sessionStorage.removeItem('selectPrint_selectCustomerList');
-            window.onafterprint = function(event) {
+            // sessionStorage.removeItem('selectPrint_selectPrintList');
+            // sessionStorage.removeItem('selectPrint_selectCustomerList');
+            window.onafterprint = function (event) {
                 window.history.back(-1)
             }
         },

+ 8 - 2
src/api/V2/profitable/index.js

@@ -34,7 +34,7 @@ export const API_GET_EXPENSEINFO = '/expenseInfo/selectInfo'
 export const API_SET_EXPENSEINFO = '/expenseInfo/api/addInfo'
 // 获取仓库的入库单
 export const API_GET_SELECTWAREHOUSINGORDER ='/expenseInfo/selectWarehousingOrder'
-// 费用管理编辑、分配、完成、确认收款、确认分配
+// 费用管理编辑、分配、完成、确认收款、确认分配、确认保证金
 export const API_EDIT_EXPENSEINFO ='/expenseInfo/editInfo'
 // 费用管理查看
 export const API_LOOK_EXPENSEINFO ='/expenseInfo/ExpenseInfo'
@@ -78,4 +78,10 @@ export const API_JUDGE_SETTLEMENT ='/contractManagementInfo/judgeSettlementCondi
 export const API_FUELFILLINGINFO  ='/fuelFillingInfo/selectFillingPc'
 
 // 费用下拉详情筛选
-export const API_GETXIALALIST  ='/expenseInfo/removeRepeatList'
+export const API_GETXIALALIST  ='/expenseInfo/removeRepeatList'
+//保证金列表
+export const API_BOODINFO  ='/expenseInfo/selectBondInfo'
+//全部合同
+export const API_GET_CONTRACT  ='/contractManagementInfo/selectContractAll'
+//抵粮款
+export const API_SET_FOODALLOWANCE  ='/expenseInfo/api/foodAllowance'

+ 1 - 0
src/lang/zh.js

@@ -667,6 +667,7 @@ export default {
     billDetail: '备件结算详情',
     warehousingOrder: '入库单',
     storageCharge:'仓储费',
+    earnestmoney:'保证金',
     oilcost:'油费',
     inventoryCheck:'库存盘点',
     sparepartMa: '物料采购',

+ 10 - 3
src/model/profitable/index.js

@@ -40,7 +40,10 @@ import {
   API_EDIT_CONTRACT,
   API_JUDGE_SETTLEMENT,
   API_FUELFILLINGINFO,
-  API_GETXIALALIST
+  API_GETXIALALIST,
+  API_BOODINFO,
+  API_GET_CONTRACT,
+  API_SET_FOODALLOWANCE
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -120,5 +123,9 @@ export const editcontract= appRx.post(API_EDIT_CONTRACT, errorCatcher, errorHand
 export const judgesettlement= appRx.post(API_JUDGE_SETTLEMENT, errorCatcher, errorHandle, filter)
 // 油费列表
 export const getfielfillinginfo= appRx.get(API_FUELFILLINGINFO, errorCatcher, errorHandle, filter)
-//费用下拉详情筛选
-export const getXialaList= appRx.get(API_GETXIALALIST, errorCatcher, errorHandle, filter)
+//保证金列表
+export const getboodinfo= appRx.get(API_BOODINFO, errorCatcher, errorHandle, filter)
+
+export const getcontractno= appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
+//抵粮款
+export const setfoodallowance= appRx.post(API_SET_FOODALLOWANCE, errorCatcher, errorHandle, filter)

+ 25 - 3
src/views/contractManagement/acquisitionContract.vue

@@ -2,7 +2,7 @@
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="8">
+    <BaseHeaderLayout :leftSpan="4">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
           v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
@@ -11,7 +11,14 @@
           ">导出</ws-button>
       </template>
       <template slot="right">
-        <span style="width: 142px; display: inline-block; color: #8890b1">状态:</span>
+        <span style="width: 205px; display: inline-block; color: #8890b1">创建人:</span>
+        <ws-select v-model="createPersion" placeholder="可按创建人筛选" class="typeselect" @change="getList"
+          :value="searchType">
+          <ws-option key="全部内勤" label="全部内勤" value="" style="color: #8890b1" />
+          <ws-option v-for="item in persionList" :key="item.staffName" :label="item.staffName" :value="item.staffName"
+            style="color: #8890b1" />
+        </ws-select>
+        <span style="width: 142px; display: inline-block; color: #8890b1;margin-left: 5px;">状态:</span>
         <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selecttaskType"
           :value="searchType">
           <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
@@ -222,7 +229,8 @@
     billoperatehis,
     deletecontract,
     editInfo,
-    getsettlementprice
+    getsettlementprice,
+    getstafffind
   } from '@/model/contarct/index'
   import {
     downloadFile
@@ -362,6 +370,8 @@
         },
         value1: '',
         value2: '',
+        createPersion: "",//创建人
+      persionList: [],
       }
     },
     activated() {
@@ -371,8 +381,19 @@
       // this.getVesselData();
       this.getList()
       this.showType = this.isShow
+    this.persionXiaLa()
+
     },
     methods: {
+      persionXiaLa() {
+      getstafffind({
+        roles: 'b96299bb5dcf461e916b72b64c6943b0'
+      })
+        .toPromise()
+        .then((response) => {
+          this.persionList = response
+        })
+    },
       handlecost(row){
          this.$router.push({
           name: 'buyContractcost',
@@ -495,6 +516,7 @@
             startDate: this.startDate,
             endDate: this.endDate,
             contrPage: this.contrPage,
+            creator:this.createPersion
           })
           .toPromise()
           .then((response) => {

+ 23 - 2
src/views/contractManagement/collectionContract.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="8">
+    <BaseHeaderLayout :leftSpan="4">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
           v-hasPermission="`contractManagement.dsContract.dsContractInfo.add`">添加</ws-button>
@@ -9,7 +9,14 @@
           ">导出</ws-button>
       </template>
       <template slot="right">
-        <span style="width: 142px; display: inline-block; color: #8890b1">状态:</span>
+        <span style="width: 205px; display: inline-block; color: #8890b1">创建人:</span>
+        <ws-select v-model="createPersion" placeholder="可按创建人筛选" class="typeselect" @change="getList"
+          :value="searchType">
+          <ws-option key="全部内勤" label="全部内勤" value="" style="color: #8890b1" />
+          <ws-option v-for="item in persionList" :key="item.staffName" :label="item.staffName" :value="item.staffName"
+            style="color: #8890b1" />
+        </ws-select>
+        <span style="width: 150px; display: inline-block; color: #8890b1;margin-left: 5px;">状态:</span>
         <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selecttaskType"
           :value="searchType">
           <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
@@ -159,6 +166,7 @@
     billoperatehis,
     deletecontract,
     editInfo,
+    getstafffind
   } from '@/model/contarct/index'
   import {
     downloadFile
@@ -293,6 +301,8 @@
         },
         value1: '',
         value2: '',
+        createPersion: "",//创建人
+        persionList: [],
       }
     },
     activated() {
@@ -301,8 +311,18 @@
       // this.getVesselData();
       this.getList()
       // this.showType = this.isShow
+      this.persionXiaLa()
     },
     methods: {
+      persionXiaLa() {
+      getstafffind({
+        roles: 'b96299bb5dcf461e916b72b64c6943b0'
+      })
+        .toPromise()
+        .then((response) => {
+          this.persionList = response
+        })
+    },
       onChange() {
         this.$refs.upload
           .handleSaveBill()
@@ -371,6 +391,7 @@
             startDate: this.startDate,
             endDate: this.endDate,
             contrPage: this.contrPage,
+            creator:this.createPersion
           })
           .toPromise()
           .then((response) => {

+ 24 - 4
src/views/contractManagement/purchaseContract.vue

@@ -2,7 +2,7 @@
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="8">
+    <BaseHeaderLayout :leftSpan="4">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
           v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
@@ -11,7 +11,14 @@
         ">导出</ws-button>
       </template>
       <template slot="right">
-        <span style="width: 142px; display: inline-block; color: #8890b1">状态:</span>
+        <span style="width: 205px; display: inline-block; color: #8890b1">创建人:</span>
+        <ws-select v-model="createPersion" placeholder="可按创建人筛选" class="typeselect" @change="getList"
+          :value="searchType">
+          <ws-option key="全部内勤" label="全部内勤" value="" style="color: #8890b1" />
+          <ws-option v-for="item in persionList" :key="item.staffName" :label="item.staffName" :value="item.staffName"
+            style="color: #8890b1" />
+        </ws-select>
+        <span style="width: 150px; display: inline-block; color: #8890b1;margin-left: 5px;">状态:</span>
         <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selecttaskType"
           :value="searchType">
           <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
@@ -255,7 +262,8 @@ import {
   billoperatehis,
   deletecontract,
   editInfo,
-  getsettlementprice
+  getsettlementprice,
+  getstafffind
 } from '@/model/contarct/index'
 import {
   downloadFile
@@ -399,10 +407,11 @@ export default {
       fapiaostatus:false,
       value1: '',
       value2: '',
+      createPersion: "",//创建人
+      persionList: [],
     }
   },
   activated() {
-
     this.applstatus = hasPermission('contractManagement.buyContract.buyContractInfo.appl')
     this.jiesuanstatus = hasPermission('contractManagement.buyContract.buyContractInfo.jiedan')
     this.fapiaostatus = hasPermission('contractManagement.buyContract.buyContractInfo.fapiao')
@@ -412,8 +421,18 @@ export default {
     // this.getVesselData();
     this.getList()
     this.showType = this.isShow
+    this.persionXiaLa()
   },
   methods: {
+    persionXiaLa() {
+      getstafffind({
+        roles: 'b96299bb5dcf461e916b72b64c6943b0'
+      })
+        .toPromise()
+        .then((response) => {
+          this.persionList = response
+        })
+    },
     handlecost(row) {
       this.$router.push({
         name: 'buyContractcost',
@@ -578,6 +597,7 @@ export default {
         startDate: this.startDate,
         endDate: this.endDate,
         contrPage: this.contrPage,
+        creator:this.createPersion
       })
         .toPromise()
         .then((response) => {

+ 958 - 946
src/views/contractManagement/salesContract.vue

@@ -2,17 +2,24 @@
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="8">
+    <BaseHeaderLayout :leftSpan="4">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()" v-hasPermission="
-            `contractManagement.salesContract.salesContractInfo.add`
-          ">添加</ws-button>
+          `contractManagement.salesContract.salesContractInfo.add`
+        ">添加</ws-button>
         <ws-button @click="exportlist()" v-hasPermission="
-            `contractManagement.salesContract.salesContractInfo.view`
-          ">导出</ws-button>
+          `contractManagement.salesContract.salesContractInfo.view`
+        ">导出</ws-button>
       </template>
       <template slot="right">
-        <span style="width: 142px; display: inline-block; color: #8890b1">状态:</span>
+        <span style="width: 205px; display: inline-block; color: #8890b1">创建人:</span>
+        <ws-select v-model="createPersion" placeholder="可按创建人筛选" class="typeselect" @change="getList"
+          :value="searchType">
+          <ws-option key="全部内勤" label="全部内勤" value="" style="color: #8890b1" />
+          <ws-option v-for="item in persionList" :key="item.staffName" :label="item.staffName" :value="item.staffName"
+            style="color: #8890b1" />
+        </ws-select>
+        <span style="width: 150px; display: inline-block; color: #8890b1;margin-left: 5px;">状态:</span>
         <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selecttaskType"
           :value="searchType">
           <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
@@ -69,32 +76,29 @@
       <el-table-column prop="seller" label="卖方"> </el-table-column>
       <el-table-column width='150' prop="completedQuantity" label="已完成(吨)">
         <template slot-scope="scope">
-          <span v-if="scope.row.proportion < 90"
-            style="color: #5473e8; font-weight: 600">{{ scope.row.completedQuantity }}</span>
-          <span v-if="scope.row.proportion > 90"
-            style="color: red; font-weight: 600">{{ scope.row.completedQuantity }}</span>
+          <span v-if="scope.row.proportion < 90" style="color: #5473e8; font-weight: 600">{{ scope.row.completedQuantity
+          }}</span>
+          <span v-if="scope.row.proportion > 90" style="color: red; font-weight: 600">{{ scope.row.completedQuantity
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
-          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'&&scope.row.status != '已驳回'">
+          <div v-if="scope.row.status != '执行中' && scope.row.status != '发运结束' && scope.row.status != '已驳回'">
             <!-- <span v-if="scope.row.approveStatus">{{
               scope.row.approveStatus
             }}</span> -->
-            <el-select v-if="scope.row.approveStatus" v-model="scope.row.approveStatus" placeholder="" class="statusselect"
-            @change='selectstatuschange($event,scope.row)'
-            disabled
-            :value="scope.row.approveStatus">
-            <el-option label="待决策人审核" value="待决策人审核"
-              style="color: #8890b1" />
-          </el-select>
-          <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
-            @change='selectstatuschange($event,scope.row)'
-            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'||scope.row.status=='已驳回'"
-            :value="scope.row.status">
-              <el-option label="执行中" value="执行中"
-              style="color: #8890b1" />
-          </el-select>
+            <el-select v-if="scope.row.approveStatus" v-model="scope.row.approveStatus" placeholder=""
+              class="statusselect" @change='selectstatuschange($event, scope.row)' disabled
+              :value="scope.row.approveStatus">
+              <el-option label="待决策人审核" value="待决策人审核" style="color: #8890b1" />
+            </el-select>
+            <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
+              @change='selectstatuschange($event, scope.row)'
+              :disabled="scope.row.status == '已完成' || scope.row.status == '已结算' || scope.row.status == '已驳回'"
+              :value="scope.row.status">
+              <el-option label="执行中" value="执行中" style="color: #8890b1" />
+            </el-select>
             <!-- <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
               @show="history(scope.row)">
               <template>
@@ -130,12 +134,10 @@
           <div v-else>
             <!-- {{scope.row.status}} -->
             <el-select v-model="scope.row.status" placeholder="" class="statusselect"
-            @change='selectstatuschange($event,scope.row)'
-            :value="scope.row.status"
-          >
-            <el-option v-for="item in statusList" :key="item.value" :label="item.value" :value="item.value"
-              style="color: #8890b1" />
-          </el-select>
+              @change='selectstatuschange($event, scope.row)' :value="scope.row.status">
+              <el-option v-for="item in statusList" :key="item.value" :label="item.value" :value="item.value"
+                style="color: #8890b1" />
+            </el-select>
           </div>
         </template>
       </el-table-column>
@@ -144,28 +146,29 @@
       <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
       <el-table-column width='120' prop="mildewGrain" label="未回款(元)">
         <template slot-scope="scope">
-        <span style='color:red;' v-if='scope.row.datestatus&&scope.row.invoiced>scope.row.contractRevenue'>{{scope.row.mildewGrain}}</span>
-        <span v-else>{{scope.row.mildewGrain}}</span>
+          <span style='color:red;'
+            v-if='scope.row.datestatus && scope.row.invoiced > scope.row.contractRevenue'>{{ scope.row.mildewGrain }}</span>
+          <span v-else>{{ scope.row.mildewGrain }}</span>
         </template>
       </el-table-column>
-      
+
       <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column>
       <el-table-column prop="statementUrl" label="结算单">
         <template slot-scope="scope">
           <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
             src="../../../public/img/fujian.png" @click="settlement(scope.row)" alt="" />
           <span v-if="scope.row.statementUrl != null">
-            {{ scope.row.statementUrl? scope.row.statementUrl.split(",").length : "" }}
+            {{ scope.row.statementUrl ? scope.row.statementUrl.split(",").length : "" }}
           </span>
         </template>
       </el-table-column>
       <el-table-column width='120' prop="goodsNames" label="已开发票 (元)">
         <template slot-scope="scope">
-          {{scope.row.goodsNames}}
+          {{ scope.row.goodsNames }}
           <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
             src="../../../public/img/fujian.png" @click="invoiceUploade(scope.row)" alt="" />
           <span v-if="scope.row.invoiceUrl != null">
-            {{ scope.row.invoiceUrl? scope.row.invoiceUrl.split(",").length : "" }}
+            {{ scope.row.invoiceUrl ? scope.row.invoiceUrl.split(",").length : "" }}
           </span>
         </template>
       </el-table-column>
@@ -174,9 +177,9 @@
           <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
             src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
           <span v-if="scope.row.addressUrlArray != null">{{
-            scope.row.addressUrlArray.length == 0
-              ? ''
-              : scope.row.addressUrlArray.length
+              scope.row.addressUrlArray.length == 0
+                ? ''
+                : scope.row.addressUrlArray.length
           }}</span>
           <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
         </template>
@@ -196,9 +199,9 @@
               `contractManagement.salesContract.salesContractInfo.view`
             " alt="" />
           <div v-if="
-              (scope.row.approveStatus != '待决策人审核' &&
-                !scope.row.approveStatus)
-            " style="display: inline-block">
+            (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" v-hasPermission="
                 `contractManagement.salesContract.salesContractInfo.edit`
@@ -210,30 +213,29 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " v-if="scope.row.status == '待执行'&&!scope.row.approveStatus||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
-            v-hasPermission="
+            " v-if="scope.row.status == '待执行' && !scope.row.approveStatus || scope.row.status == '已驳回'"
+            src="../../../public/img/shanchu.png" v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination  :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    <el-pagination :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" @size-change="handleSizeChange"
+      @current-change="handleCurrentChange" :current-page="currentPage" :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
     </el-pagination>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-        <div v-if="applstatus">
-      <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
-        v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
-        />
+      <div v-if="applstatus">
+        <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
+          accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
+          v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
       </div>
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
     <!-- 结算单 -->
-    <WinseaContentModal v-model="countMoney" title="结算单信息"
-      @on-cancel="handleClose">
+    <WinseaContentModal v-model="countMoney" title="结算单信息" @on-cancel="handleClose">
       <div v-if="jiesuanstatus">
         <ws-upload ref="upload" :size-limit="size" @onChange="onChange1" :comp-id="compId" :appendix-ids="appendixIdss"
           accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
@@ -242,9 +244,8 @@
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
-     <!-- 上传已开发票 -->
-     <WinseaContentModal v-model="invoiceSwitch" title="发票信息"
-      @on-cancel="handleClose">
+    <!-- 上传已开发票 -->
+    <WinseaContentModal v-model="invoiceSwitch" title="发票信息" @on-cancel="handleClose">
       <div v-if="fapiaostatus">
         <ws-upload ref="upload" :size-limit="size" @onChange="onChange2" :comp-id="compId" :appendix-ids="appendixIdss"
           accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
@@ -253,266 +254,275 @@
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
-    <el-dialog
-    title="合同完成"
-    :visible.sync="show"
-    width="30%"
-    :before-close="handleClose">
-    <span>该合同为随行就市的销售合同,结算单价确认后不可修改。</span>
-    <div style="margin-top:10px;">
-      <el-form class="priceform" ref="form" >
-        <el-form-item label="结算单价">
-          <el-input v-model="currectPrice"></el-input>
-          元/吨
-        </el-form-item>
-      </el-form>
-      
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="handleClose1">取 消</el-button>
-      <el-button type="primary" @click="selectstatuschange1()">确 定</el-button>
-    </span>
-  </el-dialog>
+    <el-dialog title="合同完成" :visible.sync="show" width="30%" :before-close="handleClose">
+      <span>该合同为随行就市的销售合同,结算单价确认后不可修改。</span>
+      <div style="margin-top:10px;">
+        <el-form class="priceform" ref="form">
+          <el-form-item label="结算单价">
+            <el-input v-model="currectPrice"></el-input>
+            元/吨
+          </el-form-item>
+        </el-form>
+
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose1">取 消</el-button>
+        <el-button type="primary" @click="selectstatuschange1()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
-  import {
-    getList,
-    export1,
-    editstatus,
-    billoperatehis,
-    deletecontract,
-    editInfo,
-    getsettlementprice
-  } from '@/model/contarct/index'
-  import {
-    downloadFile
-  } from '@/utils/batchDown'
-  import { hasPermission } from '../../utils/getHasPermission'
-  import Pagination from '@/components/Pagination'
-  import WsUpload from '@/components/WsUpload'
-  import {
-    dayjs,
-    fmoney,
-    EventBus
-  } from 'base-core-lib'
-  export default {
-    name: 'viewSpareMoney',
-    components: {
-      WsUpload,
-      Pagination,
+import {
+  getList,
+  export1,
+  editstatus,
+  billoperatehis,
+  deletecontract,
+  editInfo,
+  getsettlementprice,
+  getstafffind
+} from '@/model/contarct/index'
+import {
+  downloadFile
+} from '@/utils/batchDown'
+import { hasPermission } from '../../utils/getHasPermission'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import {
+  dayjs,
+  fmoney,
+  EventBus
+} from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
     },
-    watch: {
-      vesselId(val) {
-        this.getList()
-      },
-      isShow(val) {
-        this.showType = val
-      },
+    isShow(val) {
+      this.showType = val
     },
-    data() {
-      return {
-        id: '',
-        //弹出框
-        dialogViewSpareMoney: false,
-        dialogApproveFormVisible: false,
-        currectPrice:'',
-        currectdata:{},
-        // 船舶类型
-        monetaryKey: null,
-        // 表格显示数据
-        tableDate: [],
-        size: 10,
-        // 是否显示
-        showType: true,
-        // 年
-        year: '',
-        currectstatus:'',
-        deptBudgetTotal: 0,
-        currentPage: 1,
-        pageSize: 20,
-        appendixIdsAdd: '',
-        searchType: 1,
-        searchTypeText: '未完成',
-        searchKeyWord: '',
-        contractType: 1,
-        goodsType: 1,
-        startDate: null,
-        endDate: null,
-        // 提交类型
-        submitType: true,
-        contractForm: {},
-        categoryIndex: 0,
-        rulesVendor: {},
-        size: 10,
-        appendixIdss: [],
-        compId: localStorage.getItem('ws-pf_compId'),
-        deptCircularPage: {},
-        date: {
-          year: dayjs().format('YYYY'),
-          month: dayjs().format('MM'),
+  },
+  data() {
+    return {
+      id: '',
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      currectPrice: '',
+      currectdata: {},
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      size: 10,
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      currectstatus: '',
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 20,
+      appendixIdsAdd: '',
+      searchType: 1,
+      searchTypeText: '未完成',
+      searchKeyWord: '',
+      contractType: 1,
+      goodsType: 1,
+      startDate: null,
+      endDate: null,
+      // 提交类型
+      submitType: true,
+      contractForm: {},
+      categoryIndex: 0,
+      rulesVendor: {},
+      size: 10,
+      appendixIdss: [],
+      compId: localStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      contractList: [],
+      deptBudgetList: {},
+      historyList: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
         },
-        contractList: [],
-        deptBudgetList: {},
-        historyList: [],
-        pickerBeginDateBefore: {
-          disabledDate: (time) => {
-            return time.getTime() > Date.now()
+      },
+      statusList: [{
+        value: '发运结束',
+      }, { value: '已完成', }],
+      accessoryTFs: false,//附件
+      countMoney: false,//结算单
+      invoiceSwitch: false,//发票上传
+      accesscard: false,
+      accessurl: '',
+      fileList: [],
+      taskTypeList: [{
+        value: '未完成',
+        type: 1,
+      },
+      {
+        value: '已完成',
+        type: 2,
+      },
+      {
+        value: '未回款',
+        type: 3,
+      },
+      {
+        value: '审批中',
+        type: 4,
+      },
+      {
+        value: '全部合同',
+        type: '',
+      },
+      ],
+      addressUrls: [],
+      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])
           },
         },
-        statusList:[{
-          value:'发运结束',
-        },{value:'已完成',}],
-        accessoryTFs: false,//附件
-        countMoney:false,//结算单
-        invoiceSwitch:false,//发票上传
-        accesscard: false,
-        accessurl: '',
-        fileList: [],
-        taskTypeList: [{
-            value: '未完成',
-            type: 1,
-          },
-          {
-            value: '已完成',
-            type: 2,
+        {
+          text: '本月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setDate(1)
+            picker.$emit('pick', [start, end])
           },
-          {
-            value: '未回款',
-            type: 3,
-          },
-           {
-            value: '审批中',
-            type: 4,
-          },
-          {
-            value: '全部合同',
-            type: '',
+        },
+        {
+          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])
           },
+        },
         ],
-        addressUrls: [],
-        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])
-              },
-            },
-          ],
+      },
+      currentDate: 0,
+      applstatus: false,
+      jiesuanstatus: false,
+      fapiaostatus: false,
+      value1: '',
+      value2: '',
+      createPersion: "",//创建人
+      persionList: [],
+    }
+  },
+  activated() {
+    this.applstatus = hasPermission('contractManagement.buyContract.buyContractInfo.appl')
+    this.jiesuanstatus = hasPermission('contractManagement.salesContract.salesContractInfo.jiedan')
+    this.fapiaostatus = hasPermission('contractManagement.salesContract.salesContractInfo.fapiao')
+    //cg.viewBudget
+    //cg.viewSpareMoney
+    // this.getVesselData();
+    this.getList()
+    this.showType = this.isShow
+    this.persionXiaLa()
+  },
+  methods: {
+    persionXiaLa() {
+      getstafffind({
+        roles: 'b96299bb5dcf461e916b72b64c6943b0'
+      })
+        .toPromise()
+        .then((response) => {
+          this.persionList = response
+        })
+    },
+    handlecost(row) {
+      this.$router.push({
+        name: 'salesContractcost',
+        query: {
+          id: row.id,
+          contractNo: row.contractNo,
+          status: row.status,
+          buyer: row.buyer
         },
-        currentDate:0,
-        applstatus:false,
-        jiesuanstatus:false,
-        fapiaostatus:false,
-        value1: '',
-        value2: '',
-      }
+      })
     },
-    activated() {
-      this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
-      this.jiesuanstatus = hasPermission('contractManagement.salesContract.salesContractInfo.jiedan')
-      this.fapiaostatus = hasPermission('contractManagement.salesContract.salesContractInfo.fapiao')
-      //cg.viewBudget
-      //cg.viewSpareMoney
-      // this.getVesselData();
+    handleClose1() {
+      this.show = false
       this.getList()
-      this.showType = this.isShow
     },
-    methods: {
-      handlecost(row){
-         this.$router.push({
-          name: 'salesContractcost',
-          query: {
-            id: row.id,
-            contractNo: row.contractNo,
-            status:row.status,
-            buyer:row.buyer
-          },
+    async selectstatuschange1() {
+      var data = { id: this.currectdata.id, settlementPrice: this.currectPrice }
+      editstatus(data)
+        .toPromise()
+        .then((response) => {
+          this.$notify.success({
+            title: '成功',
+            message: '状态修改成功',
+          })
+          this.show = false
+          this.getList()
         })
-      },
-      handleClose1(){
-        this.show=false
-        this.getList()
-      },
-      async selectstatuschange1(){
-        var data={id:this.currectdata.id,settlementPrice:this.currectPrice}
-        editstatus(data)
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '状态修改成功',
-                })
-                this.show=false
-                this.getList()
-              })
-              .catch((response) => {
-                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              })
-      },
-      async selectstatuschange(e,row){
-        var response=await getsettlementprice({contractNo:row.contractNo}).toPromise()
-        var data={}
-        var text=`是否将状态改为${e}`
-        if(e=='发运结束'){
-          data={id: row.id,endFlag:1}
-        }else if(e=='已完成'&&row.priceType!='随行就市'){
-          data={id:row.id,settlementPrice:response}
-          text=`合同单价${response}元/吨,确定合同已完成?`
-        }else{
-          data={id: row.id}
-        }
-        if(e=='执行中'){
-          if(row.addressUrl==''){
-            this.$notify.error({
-              title: '失败',
-              message: '修改失败,未上传双章合同附件',
-            })
-            row.status=row.currectstatus
-            return
-          }
-          console.log(row)
-        }
-        if(e!='已完成'||e=='已完成'&&row.priceType!='随行就市'){
-          this.$confirm(text, {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
+        .catch((response) => {
+          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+        })
+    },
+    async selectstatuschange(e, row) {
+      var response = await getsettlementprice({ contractNo: row.contractNo }).toPromise()
+      var data = {}
+      var text = `是否将状态改为${e}`
+      if (e == '发运结束') {
+        data = { id: row.id, endFlag: 1 }
+      } else if (e == '已完成' && row.priceType != '随行就市') {
+        data = { id: row.id, settlementPrice: response }
+        text = `合同单价${response}元/吨,确定合同已完成?`
+      } else {
+        data = { id: row.id }
+      }
+      if (e == '执行中') {
+        if (row.addressUrl == '') {
+          this.$notify.error({
+            title: '失败',
+            message: '修改失败,未上传双章合同附件',
           })
+          row.status = row.currectstatus
+          return
+        }
+        console.log(row)
+      }
+      if (e != '已完成' || e == '已完成' && row.priceType != '随行就市') {
+        this.$confirm(text, {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
           .then(() => {
             editstatus(data)
               .toPromise()
@@ -528,36 +538,36 @@
               })
           })
           .catch(() => {
-            row.status=row.currectstatus
+            row.status = row.currectstatus
             return false
           })
-        }else{
-          this.currectdata=row
-          this.currectPrice=response
-          this.show=true
-        }      
-      },
-      onChange() {
-        this.$refs.upload
-          .handleSaveBill()
-          .then(async (response) => {
-            this.deptBudgetList.addressUrl = response
-            this.deptBudgetList.id = this.id
-            this.deptBudgetList.flag = 1
-            editInfo(this.deptBudgetList)
-              .toPromise()
-              .then((response) => {
-                this.accessoryTFs = false
-                this.$message.success('上传成功')
-                this.getList()
-              })
-          })
-          .catch((res) => {
-            EventBus.$emit('error', (JSON.parse(res) || {}).message)
-            this.$refs.upload.clearFiles()
-          })
-      },
-      onChange1() {
+      } else {
+        this.currectdata = row
+        this.currectPrice = response
+        this.show = true
+      }
+    },
+    onChange() {
+      this.$refs.upload
+        .handleSaveBill()
+        .then(async (response) => {
+          this.deptBudgetList.addressUrl = response
+          this.deptBudgetList.id = this.id
+          this.deptBudgetList.flag = 1
+          editInfo(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.accessoryTFs = false
+              this.$message.success('上传成功')
+              this.getList()
+            })
+        })
+        .catch((res) => {
+          EventBus.$emit('error', (JSON.parse(res) || {}).message)
+          this.$refs.upload.clearFiles()
+        })
+    },
+    onChange1() {
       this.$refs.upload
         .handleSaveBill()
         .then(async (response) => {
@@ -597,671 +607,673 @@
           this.$refs.upload.clearFiles()
         })
     },
-      dateFormat(fmt, date) {
-        let ret
-        const opt = {
-          'Y+': date.getFullYear().toString(), // 年
-          'm+': (date.getMonth() + 1).toString(), // 月
-          'd+': date.getDate().toString(), // 日
-          'H+': date.getHours().toString(), // 时
-          // "M+": date.getMinutes().toString(),         // 分
-          // "S+": date.getSeconds().toString()          // 秒
-          // 有其他格式化字符需求可以继续添加,必须转化成字符串
-        }
-        for (let k in opt) {
-          ret = new RegExp('(' + k + ')').exec(fmt)
-          if (ret) {
-            fmt = fmt.replace(
-              ret[1],
-              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-            )
-          }
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加,必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
         }
-        return fmt
-      },
+      }
+      return fmt
+    },
 
-      handleClose() {
-        this.dialogViewSpareMoney = false
-      },
-      handleClose1() {
-        this.accesscard = false
-      },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`)
-        this.pageSize = val
-        this.getList()
-      },
-      handleCurrentChange(val) {
-        this.currentPage = val
-        console.log(`当前页: ${val}`)
-        this.getList()
-      },
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    handleClose1() {
+      this.accesscard = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
 
-      getList() {
-        getList({
-            compId: localStorage.getItem('ws-pf_compId'),
-            contractType: this.contractType,
-            goodsType: this.goodsType,
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchType: this.searchType,
-            searchKeyWord: this.searchKeyWord,
-            startDate: this.startDate,
-            endDate: this.endDate,
-            contrPage: this.contrPage,
-          })
-          .toPromise()
-          .then((response) => {
-            var date=new Date().getTime()
-            for (var i = 0; i < response.records.length; i++) {
-              if(response.records[i].status){
-                response.records[i].currectstatus=response.records[i].status
-              }
-              if(response.records[i].collectionDeadline){
-                response.records[i].date=new Date(response.records[i].collectionDeadline).getTime()
-                console.log(response.records[i].date,parseInt(date) + (5 * 24 * 3600 * 1000))
-                if(response.records[i].date<parseInt(date) + (5 * 24 * 3600 * 1000)){
-                  response.records[i].datestatus=true
-                }
-              }else{
-                response.records[i].datestatus=false
-              }
-              
-              
-              
-              if (response.records[i].completedQuantity) {
-                response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
-              }
-              if (response.records[i].addressUrl != null) {
-                if (response.records[i].addressUrl != '') {
-                  response.records[i].addressUrlArray =
-                    response.records[i].addressUrl.split(',')
-                }
-              } else {
-                response.records[i].addressUrlArray = []
+    getList() {
+      getList({
+        compId: localStorage.getItem('ws-pf_compId'),
+        contractType: this.contractType,
+        goodsType: this.goodsType,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        searchKeyWord: this.searchKeyWord,
+        startDate: this.startDate,
+        endDate: this.endDate,
+        contrPage: this.contrPage,
+        creator:this.createPersion
+      })
+        .toPromise()
+        .then((response) => {
+          var date = new Date().getTime()
+          for (var i = 0; i < response.records.length; i++) {
+            if (response.records[i].status) {
+              response.records[i].currectstatus = response.records[i].status
+            }
+            if (response.records[i].collectionDeadline) {
+              response.records[i].date = new Date(response.records[i].collectionDeadline).getTime()
+              console.log(response.records[i].date, parseInt(date) + (5 * 24 * 3600 * 1000))
+              if (response.records[i].date < parseInt(date) + (5 * 24 * 3600 * 1000)) {
+                response.records[i].datestatus = true
               }
+            } else {
+              response.records[i].datestatus = false
+            }
 
-              if (response.records[i].imperfectGrain != null) {
-                response.records[i].proportion =
-                  Math.floor(
-                    (response.records[i].imperfectGrain /
-                      response.records[i].weight) *
-                    10000
-                  ) / 100
-              } else {
-                response.records[i].proportion = 0
-              }
+
+
+            if (response.records[i].completedQuantity) {
+              response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
             }
-            this.deptCircularPage.currentPage = response.current
-            this.deptCircularPage.pageSize = response.size
-            this.deptBudgetTotal = response.total
-            this.contractList = response
-            for (var i = 0; i < response.records.length; i++) {
-              var arr = new Array()
-              this.addressUrls[i] = new Array()
-              if (this.contractList.records[i].addressUrl != null) {
-                arr = this.contractList.records[i].addressUrl.split(',')
-                this.addressUrls[i] = arr
+            if (response.records[i].addressUrl != null) {
+              if (response.records[i].addressUrl != '') {
+                response.records[i].addressUrlArray =
+                  response.records[i].addressUrl.split(',')
               }
+            } else {
+              response.records[i].addressUrlArray = []
             }
+
+            if (response.records[i].imperfectGrain != null) {
+              response.records[i].proportion =
+                Math.floor(
+                  (response.records[i].imperfectGrain /
+                    response.records[i].weight) *
+                  10000
+                ) / 100
+            } else {
+              response.records[i].proportion = 0
+            }
+          }
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+          this.contractList = response
+          for (var i = 0; i < response.records.length; i++) {
+            var arr = new Array()
+            this.addressUrls[i] = new Array()
+            if (this.contractList.records[i].addressUrl != null) {
+              arr = this.contractList.records[i].addressUrl.split(',')
+              this.addressUrls[i] = arr
+            }
+          }
+        })
+    },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+
+      // this.deptBudgetList.
+      // this.formData.append('files', files)
+      // this.feedbackObj.uploadNameAttachment = data.appendixName
+      // this.feedbackObj.pathUploadAttachment = data.appendixPath
+      // // this.newAppendixs = files
+      // this.onChangeFlag = true
+    },
+    editClick(row) {
+      var status = ''
+      if (row.status == '待执行' || row.status == '已完成') {
+        status = '执行中'
+      } else if (row.status == '执行中' || row.status == '发运结束') {
+        status = '已完成'
+      }
+      //cancelButtonClass: "btn-custom-cancel"
+      this.$confirm(`是否将状态改为${status}`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          editstatus({
+            id: row.id,
           })
-      },
-      // 上传附件
-      uploadSuccess(data, files, url) {
-        console.log(data, files, url)
-
-        // this.deptBudgetList.
-        // this.formData.append('files', files)
-        // this.feedbackObj.uploadNameAttachment = data.appendixName
-        // this.feedbackObj.pathUploadAttachment = data.appendixPath
-        // // this.newAppendixs = files
-        // this.onChangeFlag = true
-      },
-      editClick(row) {
-        var status = ''
-        if (row.status == '待执行' || row.status == '已完成') {
-          status = '执行中'
-        } else if (row.status == '执行中'||row.status == '发运结束') {
-          status = '已完成'
-        }
-        //cancelButtonClass: "btn-custom-cancel"
-        this.$confirm(`是否将状态改为${status}`, {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          })
-          .then(() => {
-            editstatus({
-                id: row.id,
-              })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '状态修改成功',
-                })
-                this.getList()
-              })
-              .catch((response) => {
-                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '状态修改成功',
               })
-          })
-          .catch(() => {
-            return false
-          })
-      },
-      selecttaskType(e) {
-        for (var i = 0; i < this.taskTypeList.length; i++) {
-          if (this.taskTypeList[i].value == e) {
-            this.searchType = this.taskTypeList[i].type
-            this.find()
-          }
+              this.getList()
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+          this.find()
         }
-      },
-      // receiveAttachmentPath
-      fujian(row) {
-        this.id = row.id
-        this.accessoryTFs = true
-        this.appendixIdss = row.addressUrl
-        console.log(this.appendixIdss)
-      },
-      settlement(row){
+      }
+    },
+    // receiveAttachmentPath
+    fujian(row) {
+      this.id = row.id
+      this.accessoryTFs = true
+      this.appendixIdss = row.addressUrl
+      console.log(this.appendixIdss)
+    },
+    settlement(row) {
       this.id = row.id
       this.countMoney = true
       this.appendixIdss = row.statementUrl
     },
-    invoiceUploade(row){
+    invoiceUploade(row) {
       this.id = row.id
       this.invoiceSwitch = true
       this.appendixIdss = row.invoiceUrl
     },
-      handleExamine(row) {
-        this.$router.push({
-          name: 'salesContractExamine',
-          query: {
-            id: row.id,
-          },
-        })
-      },
-      handleAdd() {
-        this.$router.push({
-          path: 'salesContractAdd',
-        })
-      },
-      handleEdit(row) {
-        this.$router.push({
-          name: 'salesContractEdit',
-          query: {
-            id: row.id,
-          },
+    handleExamine(row) {
+      this.$router.push({
+        name: 'salesContractExamine',
+        query: {
+          id: row.id,
+        },
+      })
+    },
+    handleAdd() {
+      this.$router.push({
+        path: 'salesContractAdd',
+      })
+    },
+    handleEdit(row) {
+      this.$router.push({
+        name: 'salesContractEdit',
+        query: {
+          id: row.id,
+        },
+      })
+    },
+
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    history(row) {
+      billoperatehis({
+        id: row.id,
+      })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
         })
-      },
+    },
+    find() {
+      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.currentPage = 1
+      this.getList()
+    },
+    async exportlist() {
+      const {
+        data
+      } = await export1({
+        compId: localStorage.getItem('ws-pf_compId'),
+        contractType: this.contractType,
+        goodsType: this.goodsType,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        searchKeyWord: this.searchKeyWord,
+        startDate: this.startDate,
+        endDate: this.endDate,
+      }, {}, {
+        responseType: 'blob',
+      }).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${this.date.year + (this.date.month ? `-${this.date.month}` : '')
+          }_销售合同`,
+        type: 'xls',
+      })
+    },
 
-      // 关闭 dialog时 处理文件url 初始化upload组件
-      handleCloe() {
-        this.dialogViewSpareMoney = false
-      },
-      history(row) {
-        billoperatehis({
+    handleDelete(row) {
+      var handleDelete = ' '
+      if (row.handleDelete == '') { }
+      this.$confirm(
+        `删除该合同将同时永久删除合同对应的临时仓库相关数据,是否确定删除?`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }
+      )
+        .then(() => {
+          deletecontract({
             id: row.id,
           })
-          .toPromise()
-          .then((response) => {
-            this.historyList = response
-          })
-      },
-      find() {
-        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.currentPage = 1
-        this.getList()
-      },
-      async exportlist() {
-        const {
-          data
-        } = await export1({
-          compId: localStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          goodsType: this.goodsType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate,
-        }, {}, {
-          responseType: 'blob',
-        }).toPromise()
-        downloadFile({
-          res: data,
-          fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_销售合同`,
-          type: 'xls',
-        })
-      },
-
-      handleDelete(row) {
-        var handleDelete = ' '
-        if (row.handleDelete == '') {}
-        this.$confirm(
-            `删除该合同将同时永久删除合同对应的临时仓库相关数据,是否确定删除?`, {
-              cancelButtonText: '取消',
-              confirmButtonText: '确定',
-              type: 'warning',
-            }
-          )
-          .then(() => {
-            deletecontract({
-                id: row.id,
-              })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '删除成功',
-                })
-                this.getList()
-              })
-              .catch((response) => {
-                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '删除成功',
               })
-          })
-          .catch(() => {
-            return false
-          })
-      },
+              this.getList()
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        })
+        .catch(() => {
+          return false
+        })
     },
-  }
+  },
+}
 </script>
 <style lang="scss" scoped>
-  .vertical-text-left {
-    width: 62px;
-    text-align: right;
-  }
-
-  .flex {
-    display: flex;
-  }
-
-  .el-range-editor.el-input__inner {
-    margin-left: 10px;
-  }
-
-  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
-    width: 30px;
-    margin-left: -10px;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
-  }
-
-  .el-button--primary {
-    background-color: #5878e8;
-    border-color: #5878e8;
-  }
-
-  .el-button--default {
-    border: 1px solid #5473e8;
-    color: #5473e8;
-  }
-
-  .warning {
-    width: 100%;
-    height: 2px;
-    background: red;
-  }
-
-  .executory,
-  .inExecution,
-  .done {
-    width: 6px;
-    height: 6px;
-    display: inline-block;
-    border-radius: 50%;
-    position: relative;
-    top: -1px;
-  }
-
-  .executory {
-    background: #ff9f24;
-  }
-
-  .inExecution {
-    background: #5878e8;
-  }
-
-  .done {
-    background: #50cad4;
-  }
-
-  // .top-grade {
-  //   background: linear-gradient(90deg, #5678e9, #7993f6);
-  //   color: #fff;
-  //   padding: 3px;
-  //   border-radius: 2px;
-  // }
-
-  // .second-class {
-  //   background: linear-gradient(90deg, #50cdd9, #82e2ea);
-  //   color: #fff;
-  //   padding: 3px;
-  //   border-radius: 2px;
-  // }
-
-  // .third-class {
-  //   background: linear-gradient(90deg, #ffa735, #ffbf70);
-  //   color: #fff;
-  //   padding: 3px;
-  //   border-radius: 2px;
-  // }
-
-  // .substandard {
-  //   background: linear-gradient(90deg, #b2b4bb, #ced0d5);
-  //   color: #fff;
-  //   padding: 3px;
-  //   border-radius: 2px;
-  // }
-
-  .wrap {
-    width: 400px;
-    position: absolute;
-    top: 131px;
-    left: 794px;
-    transform-origin: right center;
-    z-index: 2005;
-  }
-
-  .vertical-line {
-    height: 100px;
-    border-left: 2px solid #e9ecf7;
-    margin-left: 4px;
-    padding: 0 3px;
-    // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
-    // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
-    // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
-  }
-
-  .el-pagination {
-    padding: 10px 15px;
-    margin-bottom: 0;
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+
+.flex {
+  display: flex;
+}
+
+.el-range-editor.el-input__inner {
+  margin-left: 10px;
+}
+
+/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+  width: 30px;
+  margin-left: -10px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+
+.el-button--default {
+  border: 1px solid #5473e8;
+  color: #5473e8;
+}
+
+.warning {
+  width: 100%;
+  height: 2px;
+  background: red;
+}
+
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+}
+
+.executory {
+  background: #ff9f24;
+}
+
+.inExecution {
+  background: #5878e8;
+}
+
+.done {
+  background: #50cad4;
+}
+
+// .top-grade {
+//   background: linear-gradient(90deg, #5678e9, #7993f6);
+//   color: #fff;
+//   padding: 3px;
+//   border-radius: 2px;
+// }
+
+// .second-class {
+//   background: linear-gradient(90deg, #50cdd9, #82e2ea);
+//   color: #fff;
+//   padding: 3px;
+//   border-radius: 2px;
+// }
+
+// .third-class {
+//   background: linear-gradient(90deg, #ffa735, #ffbf70);
+//   color: #fff;
+//   padding: 3px;
+//   border-radius: 2px;
+// }
+
+// .substandard {
+//   background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+//   color: #fff;
+//   padding: 3px;
+//   border-radius: 2px;
+// }
+
+.wrap {
+  width: 400px;
+  position: absolute;
+  top: 131px;
+  left: 794px;
+  transform-origin: right center;
+  z-index: 2005;
+}
+
+.vertical-line {
+  height: 100px;
+  border-left: 2px solid #e9ecf7;
+  margin-left: 4px;
+  padding: 0 3px;
+  // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
+  // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
+  // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
+}
+
+.el-pagination {
+  padding: 10px 15px;
+  margin-bottom: 0;
+  text-align: center;
+}
+
+/deep/.el-pager li.active {
+  color: #5878e8;
+  cursor: default;
+}
+
+/deep/.el-pager li:hover {
+  color: #5878e8;
+  cursor: default;
+}
+
+.vertical-circle {
+  width: 10px;
+  height: 10px;
+  border: 2px solid #5878e8;
+  background-color: #ffffff;
+  -webkit-border-radius: 100px;
+}
+
+.vertical-circle:first-child {
+  color: red;
+}
+
+.vertical-text {
+  margin: 0 10px;
+  color: #8890b1;
+  font-size: 12px;
+  margin-top: -4px;
+}
+
+/deep/.el-table .el-table__header .cell,
+/deep/.el-table .el-table__body .cell {
+  text-align: center;
+}
+
+.typeselect {
+  width: 500px;
+}
+
+// .padding-xs {
+//   padding: 15px;
+//   text-align: right;
+// }
+
+.clearfix:after {
+  content: '';
+  display: block;
+  clear: both;
+}
+
+.el-table {
+  font-size: 16px;
+}
+
+.taskType {
+  width: 100%;
+  background-color: #fff;
+  margin-top: 2px;
+  margin-bottom: 10px;
+  list-style: none;
+
+  // padding-bottom: 20px;
+  li {
+    float: left;
+    border: 1px solid #6ea0f3;
+    border-radius: 5px;
+    max-width: 190px;
+    padding: 0 5px;
     text-align: center;
-  }
-
-  /deep/.el-pager li.active {
-    color: #5878e8;
-    cursor: default;
-  }
+    margin: 10px 20px;
+    cursor: pointer;
+    font-size: 14px;
 
-  /deep/.el-pager li:hover {
-    color: #5878e8;
-    cursor: default;
-  }
+    p {
+      margin: 8px 0px;
 
-  .vertical-circle {
-    width: 10px;
-    height: 10px;
-    border: 2px solid #5878e8;
-    background-color: #ffffff;
-    -webkit-border-radius: 100px;
-  }
-
-  .vertical-circle:first-child {
-    color: red;
-  }
-
-  .vertical-text {
-    margin: 0 10px;
-    color: #8890b1;
-    font-size: 12px;
-    margin-top: -4px;
-  }
-
-  /deep/.el-table .el-table__header .cell,
-  /deep/.el-table .el-table__body .cell {
-    text-align: center;
-  }
-
-  .typeselect {
-    width: 500px;
-  }
-
-  // .padding-xs {
-  //   padding: 15px;
-  //   text-align: right;
-  // }
-
-  .clearfix:after {
-    content: '';
-    display: block;
-    clear: both;
+      span {
+        color: #e74c3c;
+      }
+    }
   }
 
-  .el-table {
-    font-size: 16px;
+  li:hover {
+    background-color: #e4eeff;
+    color: #1d6ced;
   }
-
-  .taskType {
-    width: 100%;
-    background-color: #fff;
-    margin-top: 2px;
-    margin-bottom: 10px;
-    list-style: none;
-
-    // padding-bottom: 20px;
-    li {
-      float: left;
-      border: 1px solid #6ea0f3;
-      border-radius: 5px;
-      max-width: 190px;
-      padding: 0 5px;
-      text-align: center;
-      margin: 10px 20px;
-      cursor: pointer;
-      font-size: 14px;
-
-      p {
-        margin: 8px 0px;
-
-        span {
-          color: #e74c3c;
-        }
+}
+
+.el-date-editor--date {
+  margin: 0 10px;
+}
+
+.findValue {
+  margin: 0 10px;
+}
+
+/deep/.findValue .el-input__inner {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+
+// .button-container {
+//   display: flex;
+//   flex-wrap: nowrap;
+//   justify-content: space-between;
+//   align-items: center;
+//   background-color: #fff;
+//   width: 100%;
+//   height: 50px;
+//   padding: 0 10px;
+
+//   &>div {
+//     margin-left: 10px;
+//     display: flex;
+//     flex-wrap: nowrap;
+//     flex-direction: row;
+
+//     &>span {
+//       line-height: 50px;
+//     }
+//   }
+
+//   /deep/.auditFlow-box {
+//     position: unset;
+//     margin-left: 10px;
+
+//     &/deep/.auditFlow-icon {
+//       width: auto;
+//       padding-right: 30px;
+//     }
+
+//     &/deep/.auditFlow-main {
+//       position: absolute;
+//     }
+//   }
+// }
+
+// .box-app {
+//   display: inline-block;
+//   float: left;
+//   margin-left: 30px;
+//   line-height: 50px;
+// }
+
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
       }
     }
-
-    li:hover {
-      background-color: #e4eeff;
-      color: #1d6ced;
-    }
-  }
-
-  .el-date-editor--date {
-    margin: 0 10px;
   }
-
-  .findValue {
-    margin: 0 10px;
+}
+
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+
+.priceform .el-input {
+  width: 79%;
+}
+
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+// .hide-sel {
+//   .el-input__inner {
+//     border: 0px;
+//   }
+
+//   .el-icon-arrow-up {
+//     display: none;
+//   }
+
+//   .el-textarea__inner {
+//     background-color: #fff !important;
+//     border: 0;
+//   }
+
+//   .el-date-editor {
+//     i {
+//       display: none;
+//     }
+//   }
+
+//   .is-disabled {
+//     .el-input__inner:hover {
+//       background-color: #fff !important;
+//       border: 0;
+//     }
+
+//     color: #606266;
+
+//     .el-input__inner {
+//       background-color: #fff !important;
+//       border: 0;
+//       color: #606266;
+//     }
+
+//     .el-textarea__inner {
+//       background-color: #fff !important;
+//       border: 0;
+//       color: #606266;
+//     }
+//   }
+// }
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+
+  /deep/.el-input__inner {
+    padding: 0px 2px;
   }
+}
 
-  /deep/.findValue .el-input__inner {
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
   }
 
-  // .button-container {
-  //   display: flex;
-  //   flex-wrap: nowrap;
-  //   justify-content: space-between;
-  //   align-items: center;
-  //   background-color: #fff;
-  //   width: 100%;
-  //   height: 50px;
-  //   padding: 0 10px;
-
-  //   &>div {
-  //     margin-left: 10px;
-  //     display: flex;
-  //     flex-wrap: nowrap;
-  //     flex-direction: row;
-
-  //     &>span {
-  //       line-height: 50px;
-  //     }
-  //   }
-
-  //   /deep/.auditFlow-box {
-  //     position: unset;
-  //     margin-left: 10px;
-
-  //     &/deep/.auditFlow-icon {
-  //       width: auto;
-  //       padding-right: 30px;
-  //     }
-
-  //     &/deep/.auditFlow-main {
-  //       position: absolute;
-  //     }
-  //   }
-  // }
-
-  // .box-app {
-  //   display: inline-block;
-  //   float: left;
-  //   margin-left: 30px;
-  //   line-height: 50px;
-  // }
-
-  /deep/.el-dialog {
-    .el-form-item {
-      margin-bottom: 0 !important;
-
-      .el-input--medium {
-        textarea {
-          min-height: 100px !important;
-        }
-      }
-    }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
   }
 
-  .collapse-bottom {
-    margin-bottom: 20px;
+  .el-message-box {
+    width: 440px;
+    height: 160px;
+    background: #ffffff;
+    box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
+    border-radius: 4px;
   }
 
-  .input-main .textarea .el-textarea__inner {
-    width: 100%;
-    z-index: 1;
-  }
-  .priceform .el-input{
-    width:79%;
+  /deep/.el-message-box__message p {
+    width: 351px;
+    height: 20px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #191919;
+    line-height: 20px;
   }
 
-  /*.crt-main .textarea /deep/ .el-form-item__label {*/
-  /*  height: 82px;*/
-  /*}*/
-  // 控制select为只读的时候显示样式
-
-  // .hide-sel {
-  //   .el-input__inner {
-  //     border: 0px;
-  //   }
-
-  //   .el-icon-arrow-up {
-  //     display: none;
-  //   }
-
-  //   .el-textarea__inner {
-  //     background-color: #fff !important;
-  //     border: 0;
-  //   }
-
-  //   .el-date-editor {
-  //     i {
-  //       display: none;
-  //     }
-  //   }
-
-  //   .is-disabled {
-  //     .el-input__inner:hover {
-  //       background-color: #fff !important;
-  //       border: 0;
-  //     }
-
-  //     color: #606266;
-
-  //     .el-input__inner {
-  //       background-color: #fff !important;
-  //       border: 0;
-  //       color: #606266;
-  //     }
-
-  //     .el-textarea__inner {
-  //       background-color: #fff !important;
-  //       border: 0;
-  //       color: #606266;
-  //     }
-  //   }
-  // }
-
-  // 控制select为只读的时候显示样式
-  /deep/.ws-class-table-col {
-    height: auto;
-    padding: 0px 2px;
-
-    /deep/.el-input__inner {
-      padding: 0px 2px;
-    }
+  .el-message-box__title {
+    width: 440px;
+    height: 160px;
+    background: #ffffff;
+    box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
+    border-radius: 4px;
   }
+}
 
-  /deep/.is-disabled {
-    .el-input__prefix,
-    .el-input__suffix {
-      display: none;
-    }
-
-    .el-input__inner {
-      background-color: #fff;
-      border-color: #fff !important;
-      color: #000 !important;
-      font-size: 14px;
-      cursor: text;
-      padding: 0 !important;
-    }
-
-    .el-message-box {
-      width: 440px;
-      height: 160px;
-      background: #ffffff;
-      box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
-      border-radius: 4px;
-    }
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
+}
 
-    /deep/.el-message-box__message p {
-      width: 351px;
-      height: 20px;
-      font-size: 14px;
-      font-weight: 400;
-      color: #191919;
-      line-height: 20px;
-    }
-
-    .el-message-box__title {
-      width: 440px;
-      height: 160px;
-      background: #ffffff;
-      box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
-      border-radius: 4px;
-    }
-  }
-
-  /deep/.typeselect .el-input__inner {
-    color: #8890b1;
-  }
-  /deep/.statusselect .el-input__inner {
-    color: #8890b1;
-    width:100%;
-  }
+/deep/.statusselect .el-input__inner {
+  color: #8890b1;
+  width: 100%;
+}
 </style>

+ 23 - 2
src/views/contractManagement/storageContract.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="8">
+    <BaseHeaderLayout :leftSpan="4">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
           v-hasPermission="`contractManagement.dcContract.dcContractInfo.add`">添加</ws-button>
@@ -9,7 +9,14 @@
           ">导出</ws-button>
       </template>
       <template slot="right">
-        <span style="width: 142px; display: inline-block; color: #8890b1">状态:</span>
+        <span style="width: 205px; display: inline-block; color: #8890b1">创建人:</span>
+        <ws-select v-model="createPersion" placeholder="可按创建人筛选" class="typeselect" @change="getList"
+          :value="searchType">
+          <ws-option key="全部内勤" label="全部内勤" value="" style="color: #8890b1" />
+          <ws-option v-for="item in persionList" :key="item.staffName" :label="item.staffName" :value="item.staffName"
+            style="color: #8890b1" />
+        </ws-select>
+        <span style="width: 150px; display: inline-block; color: #8890b1;margin-left: 5px;">状态:</span>
         <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selecttaskType"
           :value="searchType">
           <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
@@ -160,6 +167,7 @@
     billoperatehis,
     deletecontract,
     editInfo,
+    getstafffind
   } from '@/model/contarct/index'
   import {
     downloadFile
@@ -277,6 +285,8 @@
           ],
         },
         value2: '',
+        createPersion: "",//创建人
+      persionList: [],
       }
     },
     activated() {
@@ -285,8 +295,18 @@
       // this.getVesselData();
       this.getList()
       // this.showType = this.isShow
+      this.persionXiaLa()
     },
     methods: {
+      persionXiaLa() {
+      getstafffind({
+        roles: 'b96299bb5dcf461e916b72b64c6943b0'
+      })
+        .toPromise()
+        .then((response) => {
+          this.persionList = response
+        })
+    },
       onChange() {
         this.$refs.upload
           .handleSaveBill()
@@ -356,6 +376,7 @@
             startDate: this.startDate,
             endDate: this.endDate,
             contrPage: this.contrPage,
+            creator:this.createPersion
           })
           .toPromise()
           .then((response) => {

+ 87 - 0
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -434,6 +434,26 @@
                     v-model="deptBudgetList.reImperfectGrain" type="number" @mousewheel.native.prevent
                     placeholder="请输入不完善粒占比" maxlength="40" size="small" />
                 </ws-form-item>
+                <!-- <ws-form-item v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3" label="水分增价(元/公斤)" span="1" prop="imperfectGrain">
+                  <ws-input v-if='statusTypetext != "复检"'
+                    v-model="deptBudgetList.waterPriceIncrease" type="number" @input="deductionchange"
+                    placeholder="请输入水分增价" maxlength="40" size="small" />
+                </ws-form-item>
+                <ws-form-item v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3" label="水分扣价(元/公斤)" span="1" prop="imperfectGrain">
+                  <ws-input v-if='statusTypetext != "复检"'
+                    v-model="deptBudgetList.waterPriceDeduction" type="number" @input="deductionchange"
+                    placeholder="请输入水分扣价" maxlength="40" size="small" />
+                </ws-form-item>
+                <ws-form-item v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3" label="质量增价(元/公斤)" span="1" prop="imperfectGrain">
+                  <ws-input v-if='statusTypetext != "复检"'
+                    v-model="deptBudgetList.qualityPriceIncrease" type="number" @input="deductionchange"
+                    placeholder="请输入质量增价" maxlength="40" size="small" />
+                </ws-form-item>
+                <ws-form-item v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3" label="质量扣价(元/公斤)" span="1" prop="imperfectGrain">
+                  <ws-input v-if='statusTypetext != "复检"'
+                    v-model="deptBudgetList.qualityPriceDeduction" type="number" @input="deductionchange"
+                    placeholder="请输入质量扣价" maxlength="40" size="small" />
+                </ws-form-item> -->
               </ws-info-table>
               <ws-info-table v-if="zjJurisdiction&&statusTypetext == '初检'||statusTypetext != '初检'">
                 <ws-form-item label="净重单价(元/公斤)" span="1" prop="tidalGrainPrice"
@@ -649,6 +669,10 @@ export default {
         reJiaorenli: '',
         bulkDensity: '',
         reBulkDensity: '',
+        waterPriceIncrease:0,
+        waterPriceDeduction:0,
+        qualityPriceIncrease:0,
+        qualityPriceDeduction:0,
         reMemo: '',
         storageTagNo: '',
         mildewGrain: '',
@@ -784,6 +808,11 @@ export default {
     }
   },
   methods: {
+    deductionchange(){
+      if(this.deptBudgetList.tidalGrainPrice&&this.deptBudgetList.waterPriceIncreas&&this.deptBudgetList.waterPriceDeduction&&this.deptBudgetList.qualityPriceIncrease&&this.deptBudgetList.qualityPriceDeduction){
+        this.deptBudgetList.tidalGrainPrice=this.deptBudgetList.tidalGrainPrice-this.deptBudgetList.waterPriceIncrease-this.deptBudgetList.waterPriceDeduction-this.deptBudgetList.qualityPriceIncrease-this.deptBudgetList.qualityPriceDeduction
+      }
+    },
     shipInfoChange(e){
         for (let i = 0; i < this.shipInfoList.length; i++) {
           if(this.shipInfoList[i].shipName==this.deptBudgetList.shipName){
@@ -1264,6 +1293,10 @@ export default {
                   addressUrl: '',
                   tidalGrainPrice: 0,
                   buckleWeightRatio: 0,
+                  waterPriceIncrease:0,
+                  waterPriceDeduction:0,
+                  qualityPriceIncrease:0,
+                  qualityPriceDeduction:0,
                   natureOfGrainPurchase: '贸易粮',
                   buckleMiscellaneous: 0,
                   paramType: 1,
@@ -1449,6 +1482,10 @@ export default {
         buckleWeightRatio: 0,
         natureOfGrainPurchase: '贸易粮',
         buckleMiscellaneous: 0,
+        waterPriceIncrease:0,
+        waterPriceDeduction:0,
+        qualityPriceIncrease:0,
+        qualityPriceDeduction:0,
         paramType: 1,
         warehouseInOutDetail: {
           grade: '',
@@ -1978,6 +2015,10 @@ export default {
                       natureOfGrainPurchase: '贸易粮',
                       buckleMiscellaneous: 0,
                       paramType: 1,
+                      waterPriceIncrease:0,
+                      waterPriceDeduction:0,
+                      qualityPriceIncrease:0,
+                      qualityPriceDeduction:0,
                       warehouseInOutDetail: {
                         grade: '',
                         reGrade: '',
@@ -2061,6 +2102,10 @@ export default {
                       natureOfGrainPurchase: '贸易粮',
                       buckleMiscellaneous: 0,
                       paramType: 1,
+                      waterPriceIncrease:0,
+                      waterPriceDeduction:0,
+                      qualityPriceIncrease:0,
+                      qualityPriceDeduction:0,
                       warehouseInOutDetail: {
                         grade: '',
                         reGrade: '',
@@ -2690,6 +2735,36 @@ export default {
 
 
       }
+      // if (this.serviceManagementType==3&&this.zjJurisdiction&&this.statusTypetext=='初检') {
+      //   if (this.deptBudgetList.waterPriceIncrease>10||this.deptBudgetList.waterPriceIncrease<0) {
+      //     this.$message({
+      //       message: '水分增价输入错误',
+      //       type: 'warning',
+      //     })
+      //     return
+      //   }
+      //   if (this.deptBudgetList.waterPriceDeduction>10||this.deptBudgetList.waterPriceDeduction<0) {
+      //     this.$message({
+      //       message: '水分扣价输入错误',
+      //       type: 'warning',
+      //     })
+      //     return
+      //   }
+      //   if (this.deptBudgetList.qualityPriceIncrease>10||this.deptBudgetList.qualityPriceIncrease<0) {
+      //     this.$message({
+      //       message: '质量增价输入错误',
+      //       type: 'warning',
+      //     })
+      //     return
+      //   }
+      //   if (this.deptBudgetList.qualityPriceDeduction>10||this.deptBudgetList.qualityPriceDeduction<0) {
+      //     this.$message({
+      //       message: '质量扣价输入错误',
+      //       type: 'warning',
+      //     })
+      //     return
+      //   }
+      // }
        if (this.serviceManagementType==3&&this.qyJurisdiction&&this.statusTypetext=='初检'
       ||this.serviceManagementType==3&&this.statusTypetext!='初检'
       ||this.serviceManagementType==1) {
@@ -2915,6 +2990,10 @@ export default {
                           cost: '',
                           addressUrl: '',
                           tidalGrainPrice: 0,
+                          waterPriceIncrease:0,
+                          waterPriceDeduction:0,
+                          qualityPriceIncrease:0,
+                          qualityPriceDeduction:0,
                           buckleWeightRatio: 0,
                           natureOfGrainPurchase: '贸易粮',
                           buckleMiscellaneous: 0,
@@ -3366,6 +3445,10 @@ export default {
                           addressUrl: '',
                           tidalGrainPrice: 0,
                           buckleWeightRatio: 0,
+                          waterPriceIncrease:0,
+                          waterPriceDeduction:0,
+                          qualityPriceIncrease:0,
+                          qualityPriceDeduction:0,
                           natureOfGrainPurchase: '贸易粮',
                           buckleMiscellaneous: 0,
                           paramType: 1,
@@ -3646,6 +3729,10 @@ export default {
             addressUrl: '',
             tidalGrainPrice: 0,
             buckleWeightRatio: 0,
+            waterPriceIncrease:0,
+            waterPriceDeduction:0,
+            qualityPriceIncrease:0,
+            qualityPriceDeduction:0,
             natureOfGrainPurchase: '贸易粮',
             buckleMiscellaneous: 0,
             paramType: 1,

+ 1 - 1
src/views/profitable/cashout.vue

@@ -206,7 +206,7 @@
         warecontractList:[],
         dateRange: this.disabledDate(),
         feeDetailsDistributions:[{receiptDocDate:'',inWarehouseWeight:0,distributionMoney:0,warehouseName:'',goodsName:'',goodsSource:'',index:0}],
-        deptBudgetList:{purpose:"合同费用",type:'粮款',flag:'否'},
+        deptBudgetList:{purpose:"合同费用",type:'粮款',flag:'否',payee:'',accountNumber:'',bank:'',bankBranch:''},
         makeWordData: {},
         warehouseList:[],
         contractList:[],

+ 17 - 0
src/views/profitable/component/routers/route.js

@@ -400,6 +400,23 @@ const profitableRouter = {
       hidden:true,
     // 油费
     },
+    // 保证金
+    // {
+    //   path: 'earnestmoney',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/earnestmoney'),
+    //   name: 'earnestmoney',
+    //   meta: {
+    //     title: 'earnestmoney',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'lirunhesuan.feiyongguanli.view',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'保证金'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    // // 油费
+    // },
     {
       path: 'oilcost',
       component: () =>

+ 431 - 0
src/views/profitable/earnestmoney.vue

@@ -0,0 +1,431 @@
+//保证金
+<template>
+  <div class="container">
+    <el-row class="row_top">
+      <el-col :span="12">
+        <h2 class="bg-left title">保证金</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right"><el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6" height="10"
+            style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button></el-col>
+    </el-row>
+    <div class="center">
+      <el-row style='margin-bottom:10px;'>
+        <el-col :span="12">
+         <el-select v-model="contractNo" filterable clearable placeholder="选择合同" @change="selectcontractNo" >
+          <el-option  key="0" label="全部合同" value=""
+            style="color: #8890b1" />
+          <el-option v-for="item in contractNoList" :key="item.contractNo" :label="item.contractNo" :value="item.contractNo"
+            style="color: #8890b1" />
+        </el-select>
+        <el-select v-model="contractType" filterable clearable placeholder="选择类型" @change="selecttype" :value="searchType">
+          <el-option  key="type0" label="全部类型" value=""
+            style="color: #8890b1" />
+            <el-option  key="1" label="采购合同" value="1"
+            style="color: #8890b1" />
+            <el-option  key="2" label="销售合同" value="2"
+            style="color: #8890b1" />
+            <el-option  key="3" label="收购合同" value="3"
+            style="color: #8890b1" />
+            <el-option  key="4" label="代收合同" value="4"
+            style="color: #8890b1" />
+            <el-option  key="5" label="代储合同" value="5"
+            style="color: #8890b1" />
+        </el-select>
+        <el-input v-model="searchKeyWord" placeholder="可按照客户名称进行查找" clearable  maxlength="100" 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>
+        </el-col>
+        <el-col :span="12">
+          
+        </el-col>
+      </el-row>
+      <el-row style="margin-bottom: 10px">
+        <el-col :span="18">
+          <el-button style="margin-left: 10px" @click="typeChange('')" :type="searchType == '' ? 'primary' : ''">全部
+          </el-button>
+          <el-button @click="typeChange(1)" :type="searchType == 1 ? 'primary' : ''">收入</el-button>
+          <el-button @click="typeChange(2)" :type="searchType == 2 ? 'primary' : ''">支出</el-button>
+          <span>合计:{{money}}</span>
+          <el-button v-if="currectcontract.contractType==2" @click="payliangkuan()" type='primary'>抵粮款</el-button>
+        </el-col>
+        <el-col style="text-align: right" :span="6">
+
+        </el-col>
+      </el-row>
+      <div class="fromdata">
+        <el-table :data="tableData" stripe style="width: 100%">
+          <el-table-column type="index" label="序号">
+            <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 prop="contractNo" label="合同编号"></el-table-column>
+          <el-table-column prop="contractType" label="合同类型">
+            <template scope="scope">
+              <span v-if="scope.row.contractType==1">采购</span>
+              <span v-if="scope.row.contractType==2">销售</span>
+              <span v-if="scope.row.contractType==3">收购</span>
+              <span v-if="scope.row.contractType==4">代收</span>
+              <span v-if="scope.row.contractType==5">代储</span>
+  
+            </template>
+          </el-table-column>
+          <el-table-column prop="customer" label="客户"></el-table-column>
+          <el-table-column prop="money" label="收支类型">
+            <template slot-scope="scope">
+              <span v-if="scope.row.expensesType == 1">收入</span>
+              <span v-if="scope.row.expensesType == 2">支出</span>
+              <span v-if="scope.row.epenseName=='保证金抵粮款'">(抵)</span>
+              <span v-if="scope.row.epenseName=='保证金分配'">(分)</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="amountMoney" label="金额(元)"></el-table-column>
+          <el-table-column prop="agent" label="经办人"></el-table-column>
+          <el-table-column prop="createDate" label="收支时间"></el-table-column>
+        </el-table>
+      </div>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        style="text-align:center" :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
+    <el-dialog width='50%' :visible.sync="interestrateshow" title="保证金抵粮款" top="20vh">
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item label="合同编号">
+          <el-input disabled v-model="form.contractNo"></el-input>
+        </el-form-item>
+        <el-form-item label="可用金额(元)">
+          <el-input disabled v-model="form.money"></el-input>
+        </el-form-item>
+        <el-form-item label="抵粮款金额(元)">
+          <el-input placeholder="输入抵粮款金额" v-model="form.amountMoney"></el-input>
+        </el-form-item>
+      </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="interestrateshow=false">取消</el-button>
+          <el-button type="primary" @click="submit">确定</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+    import {
+    getboodinfo,
+    getwarehouse,
+    getcontractno,setfoodallowance
+  } from '@/model/profitable/index'
+  import {
+    getenabledinfo,
+  setenabledinfo
+} from '@/model/warehouse/index'
+
+  export default {
+    components: {},
+    data() {
+      return {
+        value: "",
+        tableData: [],
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        money:0,
+        form:{},
+        deptCircularPage: {},
+        taskTypeList:[],
+        warehouse:[],
+        interestrateshow:false,
+        searchType:"",
+        contractType:'',
+        searchKeyWord:"",
+        startDate:"",
+        endDate:"",
+        outtotal:0,
+        intotal:0,
+         foodExpenditure:0,
+        grainIncome:0,
+        expenseIncome:0,
+        expensesPay:0,
+        contractNo:'',
+        currentProfit:0,
+        warehouseName:'全部仓库',
+        allotmentofMoney:{},
+        contractNoList:[],
+        currectcontract:{}
+      }
+    },
+    activated() {
+      getcontractno({
+            // agreementType: '',
+            // goodsType: 1
+          })
+          .toPromise()
+          .then((response) => {
+            this.contractNoList = response
+          })
+          getboodinfo({
+            // warehouseType: 1,
+            compId: localStorage.getItem('ws-pf_compId'),
+            searchKeyWord:'',
+            currentPage: 1,
+            contractNo:'',
+            pageSize:10000 ,
+            contractType:'',
+            searchType:''
+          })
+          .toPromise()
+          .then(response => {
+            if(response.records.length>0){
+              var shouru=0
+              var zhichu=0
+              for (let i = 0; i < response.records.length; i++) {
+                if(response.records[i].expensesType==1){
+                  shouru+=response.records[i].amountMoney
+                }
+                if(response.records[i].expensesType==2){
+                  zhichu+=response.records[i].amountMoney
+                }
+                
+              }
+              this.money=shouru-zhichu
+            }
+          })
+        //  this.getPassYearFormatDate()
+      this.getList()
+    },
+    methods: {
+      payliangkuan(){
+        if(this.money<0){
+          this.$message({
+            message: '保证金余额不足!',
+            type: 'warning'
+          });
+          return
+        }
+        this.form.contractNo=this.contractNo
+        this.form.money=this.money
+        this.interestrateshow=true
+      },
+      typeChange(num){
+        this.searchType = num
+        this.getList()
+      },
+      returnsales(){
+        this.$router.go(-1)
+      },
+      submit(){
+        if(!this.form.amountMoney){
+          this.$message({
+            message: '抵粮款金额不能为空',
+            type: 'warning'
+          });
+          return
+        }
+        if(this.form.amountMoney>this.form.money||this.form.amountMoney<0||String(this.form.amountMoney).indeOf('.')!= -1 &&
+            String(this.deptBudgetList.weight).length -
+            (String(this.deptBudgetList.weight).indexOf('.') + 1) >
+            2){
+          this.$message({
+            message: '抵粮款金额输入错误',
+            type: 'warning'
+          });
+          return
+        }
+        this.$confirm('确定提交保证金变更信息', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+        setfoodallowance({amountMoney:this.form.amountMoney,contractNo:this.contractNo,}).toPromise()
+              .then((response) => {
+                this.$message({
+                  message: '提交成功,可在费用详情页面查看审核状态',
+                  type: 'success'
+                });
+                this.interestrateshow=false
+              })
+            })
+      },
+      getPassYearFormatDate () {
+          var nowDate = new Date()
+          var _date = new Date()
+          nowDate.setTime(nowDate.getTime()-24*60*60*1000*30)
+          var year = nowDate.getFullYear()
+          var year1 = _date.getFullYear()
+          var month = nowDate.getMonth() + 1
+          var month1 = _date.getMonth() + 1
+          var strDate = nowDate.getDate()
+          var strDate1 = _date.getDate()
+          if (month >= 1 && month <= 9) {
+            month = '0' + month
+          }
+           if (month1 >= 1 && month1 <= 9) {
+            month1 = '0' + month1
+          }
+        
+          if (strDate >= 0 && strDate <= 9) {
+            strDate = '0' + strDate
+          }
+           if (strDate1 >= 0 && strDate1 <= 9) {
+            strDate1 = '0' + strDate1
+          }
+          this.startDate = year + '-' + month +'-' + strDate
+          this.endDate = year1 + '-' + month1 +'-' + strDate1
+          this.value=[this.startDate,this.endDate]
+        },
+        selecttype(e){
+          // if(e=='全部仓库'){
+          //   this.warehouseName=''
+          // }else{
+          //   this.warehouseName=e
+          // }
+          this.getList()
+        },
+        selectcontractNo(e){
+          for (let i = 0; i < this.contractNoList.length; i++) {
+            if(this.contractNoList[i].contractNo==e){
+              this.currectcontract=this.contractNoList[i]
+            }
+            
+          }
+          // if(e=='全部仓库'){
+          //   this.warehouseName=''
+          // }else{
+          //   this.warehouseName=e
+          // }
+          this.getList()
+        },
+      getList() {
+          getboodinfo({
+            // warehouseType: 1,
+            compId: localStorage.getItem('ws-pf_compId'),
+            searchKeyWord:this.searchKeyWord,
+            currentPage: this.currentPage,
+            contractNo:this.contractNo,
+            pageSize:this.pageSize ,
+            contractType:this.contractType,
+            searchType:this.searchType
+          })
+          .toPromise()
+          .then(response => {
+            this.tableData = response.records
+             
+            
+           this.deptBudgetTotal = response.total
+          })
+      },
+      changeDate(){
+        if(this.value){
+          this.startDate = this.value[0]
+          this.endDate = this.value[1]
+        }
+        this.getList()
+      },
+      pickerOptions() {},
+      find() {
+        this.getList()
+
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .container {
+    background: #E8ECF6;
+  }
+
+  .center {
+    margin: 0 auto;
+    background: #ffffff;
+    height: calc(100vh - 13vh);
+    border-radius: 4px;
+    padding: 20px 0;
+
+    /deep/.el-table td,
+    /deep/.el-table th {
+      text-align: center;
+    }
+  }
+
+  .row_top {
+    background: #F6F7FC;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .bg-left {
+      padding-left: 30px;
+    }
+
+    .bg-right {
+      padding-right: 10px;
+      text-align: right;
+    }
+
+    .title {
+      position: relative;
+    }
+
+    .title::before {
+      content: '';
+      display: inline-block;
+      width: 5px;
+      height: 30px;
+      background: #5473e8;
+      position: absolute;
+      left: 0;
+    }
+  }
+
+  .datascreen {
+    display: flex;
+
+    .data_css {
+      width: 40%;
+    }
+
+    .input_css {
+      width: 50%;
+      margin: 0 10px;
+    }
+
+    .find {
+      margin-right: 10px;
+    }
+  }
+.findValue{
+  width:200px;
+}
+  .fromdata {
+    margin: 20px 0;
+    overflow-y: scroll;
+    height: 546px;
+  }
+  .top_info{
+    margin: 10px 0 0 10px;
+    min-width: 712px;
+    .info_css{
+      margin-right: 20px;
+    }
+  }
+  .bg-right{
+    padding-top:15px;
+  }
+
+</style>

+ 56 - 1
src/views/profitable/expensemanagementdetails.vue

@@ -160,8 +160,11 @@
               <el-button @click="look(scope.row)" type="primary">查看</el-button>
               <div v-hasPermission="`lirunhesuan.feiyongguanli.queshou`" style="display: inline-block">
                 <el-button v-if="
-                  scope.row.status == '待确认' && scope.row.expensesType == 1
+                  scope.row.status == '待确认' && scope.row.expensesType == 1&&scope.row.costType!=5
                 " @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>
+                <el-button v-if="
+                  scope.row.status == '待确认' && scope.row.expensesType == 1&&scope.row.costType==5
+                " @click="shoukuanqueren1(scope.row)" type="primary">确认</el-button>
               </div>
               <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
               <el-button v-if="
@@ -271,6 +274,21 @@
       <ws-upload :editable="false" ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
         :comp-id="compId" :appendix-ids="appendixIdss" :size-limit="size" />
     </WinseaContentModal>
+    <el-dialog
+  title="确认保证金抵粮款信息"
+  :visible.sync="dialogVisible"
+  width="30%"
+  :before-close="handleClose">
+  <div>
+    <ws-upload ref="upload1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
+    @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss1" :size-limit="size" />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="querenbazheng">确 定</el-button>
+    </span> 
+  </div>
+ 
+</el-dialog>
   </div>
 </template>
 <script>
@@ -300,6 +318,7 @@ export default {
       size: 100,
       expensesPurpose: '',
       recordList: [],
+      dialogVisible:false,
       compId: localStorage.getItem('ws-pf_compId'),
       dialogVisible1: false,
       deptCircularPage: {},
@@ -319,7 +338,9 @@ export default {
       intotal: 0,
       fujianshow: false,
       appendixIdss: [],
+      appendixIdss1: [],
       approveStatus: false,
+      currectdata:{},
       choiceObj: [],
       costChoice: [
         {
@@ -343,6 +364,7 @@ export default {
           id: 5
         }
       ],
+      addressUrl:'',
       flowToList:[],
       costNameList:[],
       moneyList:[],
@@ -356,6 +378,7 @@ export default {
   },
   methods: {
     xiala(){
+      
        //搜索框下拉数据
        getexenseinfo({
         compId: localStorage.getItem('ws-pf_compId'),
@@ -414,6 +437,34 @@ export default {
         })
 
     },
+    querenbazheng(){
+    if(this.addressUrl){
+      this.currectdata.addressUrl=this.currectdata.addressUrl+','+this.addressUrl
+    }
+    this.currectdata.flag=7
+  console.log(this.addressUrl,this.currectdata)
+    editexenseinfo(this.currectdata)
+      .toPromise()
+      .then((response) => {
+        this.$message({
+          message: '提交成功!',
+          type: 'success',
+        })
+        this.getList()
+        // this.$router.go(-1)
+      })
+    },
+    onChange() {
+        this.$refs.upload1
+          .handleSaveBill()
+          .then(async response => {
+            this.addressUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload1.clearFiles()
+          })
+      },
     handlerecord(row) {
       if (row.expensesType == 1) {
         this.title1 = '收款审核记录'
@@ -604,6 +655,10 @@ export default {
         })
       }
     },
+    shoukuanqueren1(row){
+      this.currectdata=row
+      this.dialogVisible=true
+    },
     aduit(row) {
       if (row.taskId) {
         if (row.approveStatus == '待内勤审核') {

+ 9 - 4
src/views/profitable/oilcost.vue

@@ -64,9 +64,14 @@
             </template>
           </el-table-column>
           <el-table-column v-if="strokeType == 1"  prop="createDate" width="120" label="申请时间"></el-table-column>
-          <el-table-column v-if="strokeType == 3"  prop="amountRequested" label="请款金额(元)">
+           <el-table-column v-if="strokeType == 3"  prop="amountRequested" label="请款金额(元)">
+             <template slot-scope="scope">
+              {{scope.row.amountRequested}}
+            </template>
           </el-table-column>
-          <el-table-column v-if="strokeType == 3"  prop="createDate" width="120" label="请款时间"></el-table-column>
+           <el-table-column v-if="strokeType == 3"  prop="createDate" label="请款时间"> <template slot-scope="scope">
+              {{scope.row.createDate}}
+            </template></el-table-column>
           <el-table-column prop="approveStatus" width="100" label="状态">
             <template slot-scope="scope">
               <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span><span v-else>{{scope.row.travelStatus}}</span>
@@ -92,8 +97,8 @@
               <el-button @click="look(scope.row)" type="primary">查看</el-button>
              
               <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
-              <el-button v-if='scope.row.approveStatus' @click="pass(scope.row)" type="primary">通过</el-button>
-              <el-button v-if='scope.row.approveStatus' @click="reject(scope.row)" type="primary">驳回</el-button>
+              <el-button v-if='scope.row.approveStatus&&scope.row.strokeType == 1' @click="pass(scope.row)" type="primary">通过</el-button>
+              <el-button v-if='scope.row.approveStatus&&scope.row.strokeType == 1' @click="reject(scope.row)" type="primary">驳回</el-button>
               <!-- <el-button v-if='scope.row.status=="已驳回"' @click="expenseedit(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>

+ 2 - 0
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -608,6 +608,8 @@
 					if(localStorage.getItem('supplygoodsstatus')&&localStorage.getItem('supplygoodsstatus')==0){
 						for (let i = 0; i < supplygoods.length; i++) {
 							this.goods=this.goods!=''?this.goods+',':''+supplygoods[i].goodsName
+							this.dataList1.goodsName =this.goods!=''?this.goods:''+supplygoods[i].goodsName
+							this.dataList.goodsName=this.goods!=''?this.goods:''+supplygoods[i].goodsName
 							this.dataList1.weight=Number(this.dataList1.weight)+Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
 							this.dataList.weight=Number(this.dataList.weight)+Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
 						}

+ 1 - 4
src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -34,9 +34,6 @@
             <el-col :span="8">
               <el-form-item label="发货地址" span="1" prop="netWeight">
                 <el-input type="text" class="row-item" v-model="fhaddress" disabled></el-input>
-                <!--  {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
-               }}{{ deptBudgetList.sendArea
-               }}{{ deptBudgetList.sendDetailedAddress }} -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -178,7 +175,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="车牌号:" span="1" prop="carNo" label-width="125px">
-                  <el-select :disabled="item.id" v-model="item.carNo" placeholder="请选择车牌号"
+                  <el-select :disabled="item.id?true:false" v-model="item.carNo" placeholder="请选择车牌号"
                     filterable clearable @clear="clear" class="row-item" @change="
                                (val) => {
                                  carNochange(val, item.tranCarIndex)