Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

# Conflicts:
#	src/views/home/index.vue

src/api/V2/charts/index.js

@@ -1,3 +1,4 @@
 
 // export const API_GET_GETCHARTSDATA = `/biInfoController/selectBiInfo`
 export const API_GET_GETCHARTSDATA = `/biInfoController/selectBiInfoNew`
+export const API_GET_CLEARCACHE = `/biInfoController/clearCache`

src/api/V2/profitable/index.js

@@ -63,4 +63,8 @@ export const API_EXPENSECHAT ='/expenseInfo/expenseChart'
 // 费用管理收支表
 export const API_EXPENSECHATLIST ='/expenseInfo/expenseList'
 // 当天提交的费用条数
-export const API_EXPENSECOUNT ='/expenseInfo/api/expenseCount'  
+export const API_EXPENSECOUNT ='/expenseInfo/api/expenseCount'
+// 采购账户信息
+export const API_PAYEEINFO ='/customerInfo/getPayeeInfo'
+// 收购账户信息
+export const API_BUYPAYEEINFO ='/identityAuthenticationInfo/getPayeeInfo'

src/layout/index/top/top-setting.vue

@@ -35,7 +35,9 @@
                       @change="changeVesslBankMethod" />
         </BaseCol>
       </BaseRow>
-
+      <BaseRow >
+       <button @click="clear()">清理后台缓存</button>
+      </BaseRow>
       <span class="version">{{$t('systemVersion')+ ' ' + systemVersion}}</span>
     </BaseCol>
   </BaseDrawer>
@@ -43,6 +45,8 @@
 
 <script>
 import { mapActions, mapGetters, mapState } from 'vuex';
+import { clearCache }
+  from '@/model/home/index'
 export default {
   props: {
     value: {
@@ -116,6 +120,12 @@ export default {
         typeId: 'shipMap',
         showFlag: val
       }])
+    },
+    clear(){
+       clearCache({
+        }).toPromise().then(res => {
+          this.$message.success('缓存清理成功')
+        })
     }
   }
 };

src/model/home/index.js

@@ -10,6 +10,7 @@ import { API_GET_NOTICE_QUERY_NOTICENUMBER } from '@/api/V2/notice'
 
 import {
   API_GET_GETCHARTSDATA,
+  API_GET_CLEARCACHE
 } from '@/api/V2/charts'
 import {
   API_GET_ANNOUNCEMENTISSUE_QUERY_QUERYHOMEPAGE,
@@ -27,4 +28,5 @@ export const getCurrentUserInfo = appRx.get(API_GET_GETCURRENTUSERINFO, errorCat
 
 export const getStaffHomeShowList = appRx.get(API_GET_GETSTAFFHOMESHOWLIST, errorCatcher, errorHandle, filter)
 export const gChartsData = appRx.get(API_GET_GETCHARTSDATA, errorCatcher, errorHandle, filter)
+export const clearCache = appRx.get(API_GET_CLEARCACHE, errorCatcher, errorHandle, filter)
 export const getAdminId = appRx.post(API_GET_ADMINID, errorCatcher, errorHandle, filter)

src/model/profitable/index.js

@@ -33,7 +33,9 @@ import {
   API_GET_CONTRACTCHART,
   API_GET_WAREHOUSECHART,
   API_DEL_ONE_ALLOCATIONINFO,
-  API_EXPENSECOUNT
+  API_EXPENSECOUNT,
+  API_PAYEEINFO,
+  API_BUYPAYEEINFO
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -101,3 +103,7 @@ export const getexpensechat= appRx.get(API_EXPENSECHAT, errorCatcher, errorHandl
 export const getexpensechatlist= appRx.get(API_EXPENSECHATLIST, errorCatcher, errorHandle, filter)
 // 当天提交的费用条数
 export const getexpensecount= appRx.get(API_EXPENSECOUNT, errorCatcher, errorHandle, filter)
+// 采购账户信息
+export const getpayeeinfo= appRx.get(API_PAYEEINFO, errorCatcher, errorHandle, filter)
+// 收购账户信息
+export const getbuypayeeinfo= appRx.get(API_BUYPAYEEINFO, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -77,13 +77,11 @@
                       :value="item.binNumber" />
                   </el-select>
                 </ws-form-item>
-
                 <ws-form-item label="货名" span="1"
                   prop="inOutTaskNo">
                   <el-select :disabled='disablednotarize || goodsdisabled' v-model="deptBudgetList.goodsName" clearable
                     filterable placeholder="请选择" class="typeselect" @change="goodsNameChange">
-                    <el-option v-for="item in goodnameList" :key="'huoming' + item.id" :label="item.goodsName"
-                      :value="item.goodsName" />
+                    <el-option v-for="item in goodnameList" :key="'huoming' + item.id" :label="item.goodsName" :value="item.goodsName" />
                   </el-select>
                 </ws-form-item>
                 <ws-form-item label="类型" span="1" prop="type" v-if="zjJurisdiction && statusTypetext == '初检'">
@@ -91,13 +89,10 @@
                     <ws-option v-for="item in typeList" :key="'leixin' + item" :label="item" :value="item" />
                   </ws-select>
                 </ws-form-item>
-
                 <ws-form-item v-if='serviceManagementType == 3 && zjJurisdiction && statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="仓位号" span="1"
                   prop="inOutTaskNo">
-                  <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.binNumber"
-                    placeholder="请选择仓位号" class="typeselect" @change="binNumberChange">
-                    <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber"
-                      :value="item.binNumber" />
+                  <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.binNumber" placeholder="请选择仓位号" class="typeselect" @change="binNumberChange">
+                    <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber" :value="item.binNumber" />
                   </el-select>
                 </ws-form-item>
                 <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="serviceManagementType == 3 && qyJurisdiction && statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'">
@@ -422,11 +417,11 @@
           </el-button>
           <el-table highlight-current-row @cell-click='listclick' :data="inspect" style="width: 100%; margin-top: 20px"
             ref="inspect" border>
-            <el-table-column prop="qualityNo" width="100" label="业务编号"></el-table-column>
+            <el-table-column prop="qualityNo" width="130" label="业务编号"></el-table-column>
             <el-table-column prop="carNumber" label="车牌号">
               <template slot-scope="scope">
                 <span  v-if='serviceManagementType == 1||serviceManagementType == 3&&statusTypetext == "初检"&&qyJurisdiction||serviceManagementType == 3&&statusTypetext != "初检"'>
-                  {{scopr.row.carNumber}}
+                  {{scope.row.carNumber}}
                 </span>
                 <span v-else>
                   
@@ -1936,7 +1931,7 @@ export default {
       if (this.reader) {
         this.reader.cancel()
       }
-      if(this.serviceManagementType==3&&this.zjJurisdiction&&this.statusTypetext=='初检'&&!this.deptBudgetList.id){
+      if(this.serviceManagementType==3&&this.zjJurisdiction&&this.statusTypetext=='初检'&&!this.deptBudgetList.id&&!this.qyJurisdiction){
          this.$message({
             message: '请选择待初检数据',
             type: 'warning',
@@ -2605,7 +2600,7 @@ export default {
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 1
               if (this.serviceManagementType==3&&this.statusTypetext=='初检') {
-                this.deptBudgetList.brazer = this.qyJurisdiction ? 1 : 0
+                this.deptBudgetList.brazer = this.qyJurisdiction&&!this.zjJurisdiction ? 1 : 0
               }
               
               if (this.statusTypetext == '初检') {

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -950,6 +950,7 @@
         this.pListTotal = this.pListTop.concat(this.pListBottom)
         if (this.information == '毛重') {
           this.index = 0
+          console.log(this.mList)
           this.carList = this.mList
           this.carList1 = this.mListTotal
           if (this.mList.length != 0) {
@@ -963,6 +964,7 @@
           }
         } else {
           this.index = 1
+          console.log(this.pList)
           this.carList = this.pList
           this.carList1 = this.pListTotal
           if (this.pList.length != 0) {

src/views/profitable/cashout.vue

@@ -31,7 +31,7 @@
             </ws-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="合同费用"' label="合同编号" span="1" prop="contractNo" class="readonly">
-            <el-select v-model="deptBudgetList.contractNo" placeholder="选择合同" class="typeselect" @change="selectcontract">
+            <el-select v-model="deptBudgetList.contractNo" filterable clearable placeholder="选择合同" class="typeselect" @change="selectcontract">
               <el-option v-for="item in contractList" :key="item.id" :label="item.contractNo" :value="item.contractNo"
                 style="color: #8890b1" />
             </el-select>
@@ -84,7 +84,7 @@
           <ws-option v-for="item in datesList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select> -->
-         <ws-select :disabled='disabled' v-model="moneys" placeholder="费用分配金额">
+         <ws-select :disabled='disabled' v-model="moneys" v-if='mode!="暂不分配"' placeholder="费用分配金额">
           <ws-option v-for="item in moneysList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
@@ -408,7 +408,7 @@
         this.deptBudgetList.agent=localStorage.getItem('ws-pf_staffName')
         if(this.deptBudgetList.purpose=='合同费用'&&this.deptBudgetList.type=='非粮款'||this.deptBudgetList.purpose=='库点费用'){
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
-            if(!this.feeDetailsDistributions[i].distributionMoney){
+            if(!this.feeDetailsDistributions[i].distributionMoney&&this.mode!="暂不分配"){
               this.$message({
                 message: '分配金额不能为空!',
                 type: 'warning',

src/views/profitable/cashoutaduit.vue

@@ -51,13 +51,14 @@
             </el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
-          <div>
+          <div v-if='srcList.length>0'>
             <span v-for='item in srcList'><el-image
               style="width: 100px; height: 100px;border:1px solid #000;display:inline-block;margin:10px;"
               :src="item"
                :preview-src-list="srcList"></el-image></span>
              
           </div>
+          <div v-else>暂无附件</div>
         </el-form-item>
         </el-form>
         <!-- <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
@@ -278,9 +279,14 @@
           this.deptBudgetList=response
           this.deptBudgetList.taskId=this.$route.query.taskId 
           if(response.addressUrl){
-            var arr=[]
-            var srcs=response.addressUrl.split(',')
-            this.srcList=srcs
+            this.srcList=[]
+            // var srcs=response.addressUrl.split(',')
+          var arr=response.addressUrl.split(',')
+          for (let i = 0; i < arr.length; i++) {
+            if(arr[i]!=''){
+              this.srcList.push()
+            }
+          }
           }
         })
 

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

@@ -13,20 +13,20 @@ const profitableRouter = {
   },
   children: [
       // 盈收概览
-    {
-      path: 'earningsLook',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/earningsLook'),
-      name: 'earningsLook',
-      meta: {
-        title: 'earningsLook',
-        shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },  
+    // {
+    //   path: 'earningsLook',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/earningsLook'),
+    //   name: 'earningsLook',
+    //   meta: {
+    //     title: 'earningsLook',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   }
+    // },  
       // 合同利润
       {
         path: 'contractprofits',
@@ -345,36 +345,36 @@ const profitableRouter = {
       },
       hidden:true,
     }, 
-      // 收支明细
-      {
-        path: 'inOutDetailed',
-        component: () =>
-          import(/* webpackChunkName: "applDetail" */ '@/views/profitable/inOutDetailed'),
-        name: 'inOutDetailed',
-        meta: {
-          title: 'inOutDetailed',
-          shortcutEntrance: 'profitable',
-          module: 'contractManagement.exContract.exContractInfo.view',
-          permissicon: [],
-          keepAlive: true
-          // module: 'procurement.sparepart.applDetail'
-        }
-      }, 
+      // // 收支明细
+      // {
+      //   path: 'inOutDetailed',
+      //   component: () =>
+      //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/inOutDetailed'),
+      //   name: 'inOutDetailed',
+      //   meta: {
+      //     title: 'inOutDetailed',
+      //     shortcutEntrance: 'profitable',
+      //     module: 'contractManagement.exContract.exContractInfo.view',
+      //     permissicon: [],
+      //     keepAlive: true
+      //     // module: 'procurement.sparepart.applDetail'
+      //   }
+      // }, 
        // 合同外费用
-       {
-        path: 'contractOtherMoney',
-        component: () =>
-          import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractOtherMoney'),
-        name: 'contractOtherMoney',
-        meta: {
-          title: 'contractOtherMoney',
-          shortcutEntrance: 'profitable',
-          module: 'contractManagement.exContract.exContractInfo.view',
-          permissicon: [],
-          keepAlive: true
-          // module: 'procurement.sparepart.applDetail'
-        }
-      }, 
+      //  {
+      //   path: 'contractOtherMoney',
+      //   component: () =>
+      //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractOtherMoney'),
+      //   name: 'contractOtherMoney',
+      //   meta: {
+      //     title: 'contractOtherMoney',
+      //     shortcutEntrance: 'profitable',
+      //     module: 'contractManagement.exContract.exContractInfo.view',
+      //     permissicon: [],
+      //     keepAlive: true
+      //     // module: 'procurement.sparepart.applDetail'
+      //   }
+      // }, 
   ],
 
 };

src/views/profitable/contractprofitsdetails.vue

@@ -73,7 +73,12 @@
           </el-table-column>
           <el-table-column prop="buyer" label="买方"></el-table-column>
           <el-table-column prop="seller" label="卖方"></el-table-column>
-          <el-table-column prop="surplus" label="剩余（吨）"></el-table-column>
+          <el-table-column prop="surplus" label="剩余（吨）">
+             <template slot-scope="scope">
+              <span v-if='scope.row.agreementType=="销售合同"'>-</span>
+              <span v-else>{{scope.row.surplus}}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="profit" label="利润（万元）">
           </el-table-column>
           <el-table-column prop="status" label="状态"></el-table-column>

src/views/profitable/expensemanagementdetails.vue

@@ -19,7 +19,7 @@
             <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" align="right" unlink-panels range-separator="至"
               start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" class="data_css" @change="changeDate" >
             </el-date-picker>
-            <el-input placeholder="可按费用名称查找" class="input_css" v-model="searchKeyWord"></el-input>
+            <el-input placeholder="可按费用名称或经办人查找" class="input_css" v-model="searchKeyWord" clearable></el-input>
             <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
                 src="../../../public/img/sousuo.png" alt="" /></el-button>
           </div>
@@ -149,12 +149,12 @@
       <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}"
 >
         <div style='width:100%;justify-content: space-between;' class='flex'>
-          <div style='width:33.333%;text-align:center;'>{{item.operateUser}}</div>
-          <div style='width:33.333%;text-align:center;'>{{item.dealMsg}}</div>
-          <div style='width:33.333%;text-align:center;'>{{item.operateDate}}</div>
+          <div style='width:33.333%;text-align:left;'>{{item.operateUser}}</div>
+          <div style='width:33.333%;text-align:center;'>{{item.dealMsg!='请款'?item.approveResult==1?'通过':'驳回':item.dealMsg}}</div>
+          <div style='width:33.333%;text-align:right;'>{{item.operateDate}}</div>
         </div>
-        <div v-if='index<recordList.length-1' style='width:100%;text-align:center;'>{{item.verifyRemark}}</div>
-        <div v-else style='width:100%;text-align:center;'>{{item.verifyRemark}}</div>
+        <div v-if='index<recordList.length-1' style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
+        <div v-else style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
       </div>
     </el-dialog>
     <WinseaContentModal v-model="fujianshow" :title="title"
@@ -334,7 +334,15 @@
         this.$router.push({name:'expenseallotaduit',query:{id:row.id}})
       },
       payment(row){
-        this.$router.push({name:'payment',query:{id:row.id}})
+        if(localStorage.getItem('ws-pf_roleName')=='出纳'){
+          this.$router.push({name:'payment',query:{id:row.id}})
+        }else{
+          this.$message({
+            message: '暂无此权限!',
+            type: 'warning',
+          })
+        }
+        
       },
       allot(row){
         this.$router.push({name:'expenseallot',query:{id:row.id}})

src/views/profitable/expensemanagentlook.vue

@@ -45,13 +45,14 @@
             </el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
-          <div>
+          <div v-if='srcList.length>0'>
             <span v-for='item in srcList'><el-image
               style="width: 100px; height: 100px;border:1px solid #000;display:inline-block;margin:10px;"
               :src="item"
                :preview-src-list="srcList"></el-image></span>
              
           </div>
+          <div v-else>暂无附件</div>
         </el-form-item>
         </el-form>
         <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
@@ -144,7 +145,13 @@
         .toPromise()
         .then((response) => {
           this.deptBudgetList=response
-          this.srcList=response.addressUrl.split(',')
+          this.srcList=[]
+          var arr=response.addressUrl.split(',')
+          for (let i = 0; i < arr.length; i++) {
+            if(arr[i]!=''){
+              this.srcList.push()
+            }
+          }
         })
 
       },

src/views/profitable/payment.vue

@@ -10,9 +10,10 @@
         </el-button></el-col>
     </el-row>
     <div class="center">
-     <div style='margin:0 auto 10px;width:90%;'>基本信息</div>
-      <div>
-        <el-form label-position="left">
+     
+      <div  style='margin:0 auto 10px;width:90%;display:flex;'>
+        <el-form class='left-form' label-position="left">
+          <div style='margin:0 auto 10px;'>基本信息</div>
           <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
             <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="1"
@@ -58,22 +59,39 @@
               :src="item"
                :preview-src-list="srcList"></el-image></span>
               -->
-              <el-upload ref='uploadfiles' :file-list='srcList' action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
-            :on-success="handlefujian" :on-remove="handleRemove" class="photo2">
-            <i class="el-icon-plus"></i>
-          </el-upload>
+              <el-upload ref='uploadfiles' :file-list='srcList' action="https://www.zthymaoyi.com/upload/admin" 
+              list-type="picture-card" :on-success="handlefujian" :on-remove="handleRemove" class="photo2">
+                <i class="el-icon-plus"></i>
+              </el-upload>
           </div>
         </el-form-item>
         </el-form>
-        <div style='width:90%;margin:10px auto;text-align:right;'>
+        <div style='width:50%;'>
+          <div style='margin:0 auto 10px;width:90%;'>账户信息</div>
+            <el-form label-position="left">
+            <el-form-item  label-width='100px' label="收款方" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.customerType=="企业客户"?payeeinfo.compName:payeeinfo.customerName}}
+            </el-form-item>
+            <el-form-item  label-width='100px' label="账号" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankCard}}
+            </el-form-item>
+            <el-form-item  label-width='100px' label="开户行" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankDeposit}}
+            </el-form-item>
+            <el-form-item  label-width='100px' label="开户支行" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankDepositBranch}}
+            </el-form-item>
+             </el-form>
+        </div>
+      </div>
+      <div style='width:90%;margin:10px auto;text-align:right;'>
         <el-button class="bg-bottom" type="primary" size="small" @click="submit()">提交
         </el-button></div>
-      </div>
     </div>
   </div>
 </template>
 <script>
-  import {lookexenseinfo,expensepayment} from '@/model/profitable/index'
+  import {lookexenseinfo,expensepayment,getpayeeinfo} from '@/model/profitable/index'
   import {woekflowhandle,} from '@/model/tasksport/index'
   export default {
     components: {},
@@ -88,6 +106,7 @@
         deptBudgetList:{},
         makeWordData: {},
         srcList:[],
+        payeeinfo:{},
         textarea:'',
         valueData: [{
             date: 10
@@ -112,12 +131,22 @@
           this.deptBudgetList=response
           var arr=response.addressUrl.split(',')
           for (let i = 0; i < arr.length; i++) {
-          this.srcList.push({url:arr[i]})
-            
+            if(arr[i]!=''){
+              this.srcList.push({url:arr[i]})
+            }
+          }
+          if(localStorage.getItem('ws-pf_roleName')=='出纳'){
+            if(this.deptBudgetList.expensesPurpose==1){
+              getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:response.contractNo}).toPromise()
+              .then((response1) => {
+                this.payeeinfo=response1
+                console.log(this.payeeinfo)
+              })
+            }          
           }
-          this.paymentScreenshot=response.addressUrl.split(',')
+          this.paymentScreenshot=this.srcList
         })
-
+        
       },
       handlefujian(file) {
         // console.log(file)
@@ -236,12 +265,15 @@
     text-align:center;
 
   }
+  /deep/.el-form.left-form{
+    width:50%;
+    margin:10px auto;
+  }
   /deep/.el-form{
-    width:90%;
+    width: 90%;
     margin:10px auto;
   }
-  
   /deep/.el-form-item {
-    width: 50%;
+    // width: 50%;
 }
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -178,8 +178,8 @@
         currentPage: 1,
         primary: '1',
         pageSize: 10,
-        searchType: 1,
-        searchTypeText: '待审核',
+        searchType: '',
+        searchTypeText: '全部任务',
         searchKeyWord: '',
         inOutType:'',
         inOutTypeList:[

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -200,7 +200,7 @@
 					</el-form-item>
 					<!--重量（吨）-->
 					<el-form-item label="重量（吨）">
-						<el-input disabled  @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
+						<el-input  @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!-- 品级 -->

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -172,14 +172,12 @@
           <el-form-item
             label="重量（吨）"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
           >
             <el-input
               v-model="dataList.weight"
               placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!-- 品级 -->
@@ -211,7 +209,6 @@
               placeholder="请输入容重"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
@@ -219,7 +216,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="水分（%）<="
             span="1"
-            style="margin-left: 350px; margin-top: -40px"
           >
             <el-input
               @input="waterContentchange"
@@ -227,7 +223,6 @@
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
@@ -235,7 +230,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="单价(元/吨)"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
             v-show="Pricetype"
           >
             <el-input
@@ -244,7 +238,6 @@
               placeholder="请输入单价"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->
@@ -421,7 +414,6 @@
           <el-form-item
             label="重量（吨）"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
           >
             <el-input
               @input="weightchange"
@@ -429,7 +421,6 @@
               placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!-- 品级 -->
@@ -463,7 +454,6 @@
               placeholder="请输入容重"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
@@ -471,7 +461,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="水分（%）<="
             span="1"
-            style="margin-left: 350px; margin-top: -40px"
           >
             <el-input
               @input="waterContentchange"
@@ -480,7 +469,6 @@
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
@@ -488,7 +476,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="单价(元/吨)"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
             v-show="Pricetype"
           >
             <el-input
@@ -498,7 +485,6 @@
               placeholder="请输入单价"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->
@@ -642,14 +628,12 @@
           <el-form-item
             label="重量（吨）"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
           >
             <el-input
               v-model="dataList.weight"
               placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!-- 品级 -->
@@ -682,7 +666,6 @@
               placeholder="请输入容重"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
@@ -690,7 +673,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="水分（%）<="
             span="1"
-            style="margin-left: 350px; margin-top: -40px"
           >
             <el-input
               :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
@@ -698,7 +680,6 @@
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
@@ -706,7 +687,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="单价(元/吨)"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
             v-show="Pricetype"
           >
             <el-input
@@ -715,7 +695,6 @@
               placeholder="请输入单价"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->

src/views/warehousenew/component/router/index.js

@@ -26,20 +26,20 @@ const warehouseManagementRouter = {
         // module: 'procurement.sparepart.applDetail'
       }
     },
-    {
-      path: 'costmanagement',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/costmanagement'),
-      name: 'warehouseManagementList',
-      meta: {
-        title: 'costmanagement',
-        shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.costControl.View',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-    },
+    // {
+    //   path: 'costmanagement',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/costmanagement'),
+    //   name: 'warehouseManagementList',
+    //   meta: {
+    //     title: 'costmanagement',
+    //     shortcutEntrance: 'warehouseManagementList',
+    //     module: 'warehouseManagement.costControl.View',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    // },
     {
       path: 'warehouselocation',
       component: () =>

src/views/warehousenew/warehousingOrder.vue

@@ -147,18 +147,38 @@
         :visible.sync="aduitshow"
         width="50%"
         :before-close="handleClose">
-        <div>
-          <el-form ref="form" :model="form" label-width="120px">
+        <div style='display:flex;'>
+          <div style='width:50%;'>
+            <el-form ref="form" :model="form" label-width="120px">
             <el-form-item label="合计金额">
               <el-input disabled v-model="form.name"></el-input>
             </el-form-item>
             <el-form-item label="附件">
-          <el-upload ref='uploadfiles' :file-list='dataList' action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+              <el-upload ref='uploadfiles' :file-list='dataList' action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
             :on-success="handlefujian" :on-remove="handleRemove" class="photo2">
-            <i class="el-icon-plus"></i>
-          </el-upload>
-        </el-form-item>
-          </el-form>
+              <i class="el-icon-plus"></i>
+              </el-upload>
+            </el-form-item>
+            </el-form> 
+          </div>
+          
+          <div style='width:50%;'>
+          <div style='margin:0 0 10px;width:90%;'>账户信息</div>
+            <el-form label-position="left">
+            <el-form-item  label-width='100px' label="收款方" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.customerType=="企业客户"?payeeinfo.compName:payeeinfo.customerName}}
+            </el-form-item>
+            <el-form-item  label-width='100px' label="账号" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankCard}}
+            </el-form-item>
+            <el-form-item  label-width='100px' label="开户行" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankDeposit}}
+            </el-form-item>
+            <el-form-item  label-width='100px' label="开户支行" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankDepositBranch}}
+            </el-form-item>
+             </el-form>
+        </div>
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="aduitshow = false">取消</el-button>
@@ -208,13 +228,11 @@
               <el-input  v-model="form.distributionIng"></el-input>
             </el-form-item>
               </el-row>
-
-
           </el-form>
         </div>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="distributionshow = false">取消</el-button>
-          <el-button type="primary" @click="distributionsubmit">确定</el-button>
+          <el-button @click="handleClose1">取消</el-button>
+          <el-button type="primary" @click="distributionsubmit">提交</el-button>
         </span>
       </el-dialog>
                   <el-dialog
@@ -265,8 +283,8 @@
           </el-form>
         </div>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="marginshow = false">取消</el-button>
-          <el-button type="primary" @click="marginsubmit">确定</el-button>
+          <el-button @click="handleClose2">取消</el-button>
+          <el-button type="primary" @click="marginsubmit">提交</el-button>
         </span>
       </el-dialog>
       <!-- <el-dialog
@@ -333,6 +351,7 @@
   getExpense,
   workflowhandle
 } from '@/model/warehouse/index'
+  import {getpayeeinfo,getbuypayeeinfo} from '@/model/profitable/index'
   import {
     downloadFile
   } from '@/utils/batchDown'
@@ -360,11 +379,13 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
     },
     data() {
       return {
+        
         currectdata:{},
         //弹出框
         dialogViewSpareMoney: false,
         dialogApproveFormVisible: false,
         dataList:[],
+        payeeinfo:{},
         // 船舶类型
         monetaryKey: null,
         form:{
@@ -606,6 +627,13 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             });
             return
         }
+        if(currectData.length==0){
+          this.$message({
+              message: '请选择一条数据！',
+              type: 'warning'
+            });
+            return
+        }
         // console.log(currectData)
         var arr1=currectData
         for (let i = 0; i < arr1.length; i++) {
@@ -631,6 +659,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             _this.form.distributionEd=response.distributionMoney
             _this.form.distributionCan=response.accumulatedPrepayment-response.recoveryPrepayments-response.distributionMoney
             _this.form.distributionNot=arr1[i].amountNotPayable
+            this.currectdata=currectData
+            this.marginshow=true
           }).catch(() => {
            this.$message({
               message: '无可分配金额',
@@ -639,8 +669,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             return
           })
         }
-        this.currectdata=currectData
-        this.marginshow=true
+        
       },
       distribution(){
         let _this= this
@@ -663,6 +692,14 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             });
             return
         }
+        
+        if(currectData.length==0){
+          this.$message({
+              message: '请选择一条数据！',
+              type: 'warning'
+            });
+            return
+        }
         // console.log(currectData)
         var arr1=currectData
         for (let i = 0; i < arr1.length; i++) {
@@ -879,12 +916,18 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             });
             return
           }
-          paymoney({flag:3,money:this.form.distributionIng,warehousingOrderList:arr2}).toPromise()
+          this.$confirm('确定提交分配金额?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            paymoney({flag:3,money:this.form.distributionIng,warehousingOrderList:arr2}).toPromise()
           .then((response) => {
             this.$message({
               message: '分配成功',
               type: 'success'
             });
+            this.form.distributionIng=''
             this.marginshow=false
             this.getList()
           }).catch(() => {
@@ -893,6 +936,13 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
               type: 'warning'
             });
           })
+          }).catch(() => {
+            // this.$message({
+            //   type: 'info',
+            //   message: '已取消删除'
+            // });          
+          });
+          
       },
       distributionsubmit(){
         var arr2=this.currectdata
@@ -910,12 +960,18 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             });
             return
           }
-          paymoney({flag:2,money:this.form.distributionIng,warehousingOrderList:arr2}).toPromise()
+          this.$confirm('确定提交分配金额?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            paymoney({flag:2,money:this.form.distributionIng,warehousingOrderList:arr2}).toPromise()
           .then((response) => {
             this.$message({
               message: '分配成功',
               type: 'success'
             });
+            this.form.distributionIng=''
             this.distributionshow=false
             this.getList()
           }).catch(() => {
@@ -924,12 +980,19 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
               type: 'warning'
             });
           })
+          }).catch(() => {
+            // this.$message({
+            //   type: 'info',
+            //   message: '已取消删除'
+            // });          
+          });
+          
       },
       payment(item){
         if(localStorage.getItem('ws-pf_roleName')=='出纳'){
           this.money=0
           var moneyarr=this.multipleSelection1[item.id]
-          console.log(moneyarr)
+          // console.log(moneyarr)
           for (let i = 0; i < this.multipleSelection1[item.id].length; i++) {
           if(this.multipleSelection1[item.id][i].warehouseName==item.warehouseName){
             if(this.multipleSelection1[item.id][i].addressUrl){
@@ -949,13 +1012,31 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           this.form.name=this.money
           this.currectdata=item
           if(moneyarr&&moneyarr.length>0){
-            this.aduitshow=true
+            if(item.inType=='采购入库'){
+              getpayeeinfo({compId: localStorage.getItem('ws-pf_compId'),contractNo:item.contractNo}).toPromise()
+              .then((response) => {
+                this.payeeinfo=response
+                this.aduitshow=true
+              })
+            }else if(item.inType=='收购入库'){
+              getbuypayeeinfo({compId: localStorage.getItem('ws-pf_compId'),customerName:item.customer}).toPromise()
+              .then((response) => {
+                this.payeeinfo=response
+                this.aduitshow=true
+              })
+            }
+            
           }else{
             this.$message({
                 message: '至少勾选一条待付款的条目',
                 type: 'warning'
               })
           }
+        }else{
+          this.$message({
+                message: '暂无此权限！',
+                type: 'warning'
+              })
         }
       },
       aduit(row){
@@ -1221,9 +1302,11 @@ multiFilter(array, filters) {
         this.aduitshow = false
       },
       handleClose1() {
+        this.form.distributionIng=''
         this.distributionshow = false
       },
       handleClose2() {
+        this.form.distributionIng=''
         this.marginshow = false
       },
       handleSizeChange(val) {
@@ -1348,4 +1431,7 @@ multiFilter(array, filters) {
 
     .audit_opinion {}
   }
+  /deep/.el-form{
+    width:90%;
+  }
 </style>