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

src/api/V2/houseSelfCollect/index.js

@@ -79,4 +79,6 @@ export const API_POST_PAYMENT_PAYMENTSUBMIT = '/paymentManagement/api/payMoney'
 //付款结算修改
 export const API_POST_PAYMENT_SETTLEMENTEDIT = '/paymentManagement/api/editCollect'
 //付款结算修改
-export const API_GET_INSPECT_GETDRYGRAINPRICE = '/purchasePrice/dryGrainPrice'
+export const API_GET_INSPECT_GETDRYGRAINPRICE = '/purchasePrice/dryGrainPrice'
+//付款权限查询
+export const API_GET_INSPECT_GETJURISDICTION = '/paymentManagement/selectTaskId'

src/model/houseSelfCollect/index.js

@@ -41,7 +41,8 @@ import {
   API_POST_PAYMENT_SETTLEMENTEDIT,
   API_GET_CUSTOMER_CODE,
   API_GET_CUSTOMER_CODEJY,
-  API_GET_INSPECT_GETDRYGRAINPRICE
+  API_GET_INSPECT_GETDRYGRAINPRICE,
+  API_GET_INSPECT_GETJURISDICTION
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -124,4 +125,6 @@ export const paymentCommit = appRx.post(API_POST_PAYMENT_PAYMENTSUBMIT, errorCat
 //付款结算修改
 export const settlementEdit = appRx.post(API_POST_PAYMENT_SETTLEMENTEDIT, errorCatcher, errorHandle, filter)
 //质检干粮单价查看
-export const getDryGrainPrice = appRx.get(API_GET_INSPECT_GETDRYGRAINPRICE, errorCatcher, errorHandle, filter)
+export const getDryGrainPrice = appRx.get(API_GET_INSPECT_GETDRYGRAINPRICE, errorCatcher, errorHandle, filter)
+//付款权限查询
+export const getJurisdiction  = appRx.get(API_GET_INSPECT_GETJURISDICTION, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/inspectionManagement.vue

@@ -73,10 +73,15 @@
           <span class="water-right">{{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span> 
         </template>
       </el-table-column>
-       <el-table-column prop="buckleMiscellaneous" label="扣杂">
+       <el-table-column prop="buckleMiscellaneous" label="扣杂"  width="120">
          <template scope="scope">
-           <div v-if="scope.row.paramType == 1"> <span>{{scope.row.buckleMiscellaneous}} | {{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span></div>
+           <div v-if="scope.row.paramType == 1">
+           <span class="water-left">{{scope.row.buckleMiscellaneous}} </span> 
+          <span class="water-line">|</span> 
+          <span class="water-right">{{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span> 
+           <!-- <div v-if="scope.row.paramType == 1"> <span>{{scope.row.buckleMiscellaneous}} | {{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span></div> -->
          <!-- <div v-else>{{scope.row.reBuckleMiscellaneous}}</div> -->
+         </div>
         </template>
        </el-table-column>
        <el-table-column prop="type" label="类型"></el-table-column>
@@ -116,8 +121,9 @@
         <template slot-scope="scope">
           <el-button @click="inspectInfo(scope.row, 2)" v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
           <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'&& scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.initial`">初检</el-button>
-           <el-button @click="inspectInfo(scope.row, 5)" v-if="scope.row.confirm!='1' && scope.row.status=='已复检'" v-hasPermission="`acquisitionManagement.acquisitionQuality.con`">确认</el-button>
-           <el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.again`">复检</el-button>
+          <div v-show="scope.row.confirm !='1' && scope.row.status == '已复检'" style="display: inline-block;">
+           <el-button @click="inspectInfo(scope.row, 5)" v-hasPermission="`acquisitionManagement.acquisitionQuality.con`">确认</el-button></div>
+           <el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.confirm !='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.again`">复检</el-button>
             <!-- <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">初检</el-button>
             <el-button @click="inspectInfo(scope.row, 5)" v-if="scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">确认</el-button>
             <el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.status!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">复检</el-button> -->

src/views/houseSelfCollect/paymentManagement.vue

@@ -2,51 +2,86 @@
 <template>
   <div>
     <div class="mask" v-show="isShowPrintType"></div>
-      <div class="print-type" v-show="isShowPrintType">
-        <div class="print-type-content">
-          <div class="print-type-title"> 打印凭证</div>
-          <div class="print-type-checkbox">
+    <div class="print-type" v-show="isShowPrintType">
+      <div class="print-type-content">
+        <div class="print-type-title">打印凭证</div>
+        <div class="print-type-checkbox">
           <el-checkbox-group v-model="ruleForm.type">
-            <el-checkbox label="打印身份证（正反面）" name="type" class="label-width" @change="selectType"></el-checkbox>
-            <el-checkbox label="打印银行卡（正反面）" name="type" class="label-width" @change="selectType"></el-checkbox>
+            <el-checkbox
+              label="打印身份证（正反面）"
+              name="type"
+              class="label-width"
+              @change="selectType"
+            ></el-checkbox>
+            <el-checkbox
+              label="打印银行卡（正反面）"
+              name="type"
+              class="label-width"
+              @change="selectType"
+            ></el-checkbox>
             <el-checkbox
               label="打印结算凭证"
               name="type"
               class="label-width"
               @change="selectType($event)"
             ></el-checkbox>
-            <el-checkbox label="打印发票" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
+            <el-checkbox
+              label="打印发票"
+              name="type"
+              class="label-width"
+              @change="selectType($event)"
+            ></el-checkbox>
           </el-checkbox-group>
-          </div>
-        </div>
-        <div class="bottom-btn">
-          <el-button @click="typePrintClick">确定</el-button>
-          <el-button @click="typePrintCannelClick">取消</el-button>
         </div>
       </div>
+      <div class="bottom-btn">
+        <el-button @click="typePrintClick">确定</el-button>
+        <el-button @click="typePrintCannelClick">取消</el-button>
+      </div>
+    </div>
     <BaseHeaderLayout :leftSpan="16">
       <template slot="left">
         <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button> -->
-        <ws-button :type="searchType == 0 ? 'primary' : ''" @click="screen(1)" v-if="isShowAdopt" >待审核</ws-button >
-        <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)">待结算</ws-button>
-        <ws-button :type="searchType == -1 ? 'primary' : ''" @click="screen(-1)"  >全部</ws-button>
-        <ws-button type="primary" @click="reject" v-if="isShowAdopt">驳回</ws-button>
-        <ws-button type="primary" @click="adopt" v-if="isShowAdopt">通过</ws-button>
+        <ws-button
+          :type="searchType == 0 ? 'primary' : ''"
+          @click="screen(1)"
+          v-if="isShowAdopt"
+          >待审核</ws-button
+        >
+         <ws-button
+          :type="searchType == 0 ? 'primary' : ''"
+          @click="screen(7)"
+         v-hasPermission="`acquisitionManagement.acquisitionPay.pay`"
+          >待付款</ws-button
+        >
+        <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)"
+          >待结算</ws-button
+        >
+        <ws-button :type="searchType == -1 ? 'primary' : ''" @click="screen(-1)"
+          >全部</ws-button
+        >
+        <ws-button type="primary" @click="reject" v-if="isShowAdopt"
+          >驳回</ws-button
+        >
+        <ws-button type="primary" @click="adopt" v-if="isShowAdopt"
+          >通过</ws-button
+        >
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
         <ws-button
           type="primary"
           @click="payment"
           v-hasPermission="`acquisitionManagement.acquisitionPay.pay`"
-        >付款</ws-button>
+          >付款</ws-button
+        >
       </template>
       <template slot="right">
         <el-select
           v-model="warehouseNameKey"
           placeholder="请选择仓库"
           @change="warehouseChange"
-          style="margin:0 10px"
+          style="margin: 0 10px"
         >
           <el-option
             v-for="item in warehouseList"
@@ -68,11 +103,7 @@
           <img
             width="16"
             height="16"
-            style="
-              vertical-align: text-top;
-              position: relative;
-              top: 0px;
-            "
+            style="vertical-align: text-top; position: relative; top: 0px"
             src="../../../public/img/sousuo.png"
             alt
           />
@@ -85,74 +116,166 @@
       ref="paymentList"
       border
       height="780"
+      @row-click="handleRowClick"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
+      <el-table-column
+        :selectable="selectInit"
+        type="selection"
+        width="55"
+      ></el-table-column>
       <el-table-column type="index" label="序号" width="50">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="paymentNo" width="150" label="编号"></el-table-column>
-      <el-table-column class="table_td" prop="customerName" label="客户"></el-table-column>
-      <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
-      <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
-      <el-table-column class="table_td" width="80" prop="type" label="类型"></el-table-column>
-      <el-table-column class="table_td" prop="tidalGrainPrice" width="140" label="净重单价（元/公斤）"></el-table-column>
-      <el-table-column class="table_td" prop="unitDeduction" width="130" label="扣单价（元/公斤）"></el-table-column>
-      <el-table-column class="table_td" prop="solidGrainPrice" width="140" label="纯重单价（元/公斤）"></el-table-column>
-      <el-table-column class="table_td" prop="netWeight" width="120" label="净重（公斤）"></el-table-column>
-      <el-table-column class="table_td" prop="pureWeight" width="120" label="纯重（公斤）"></el-table-column>
-      <el-table-column class="table_td" prop="amountIngPayable" label="应付款(元)"></el-table-column>
-      <el-table-column class="table_td" prop="amountEdPayable" label="已付款(元)">
+      <el-table-column
+        class="table_td"
+        prop="paymentNo"
+        width="150"
+        label="编号"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="customerName"
+        label="客户"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="carNo"
+        label="车牌号"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="goodsName"
+        label="货名"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        width="80"
+        prop="type"
+        label="类型"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="tidalGrainPrice"
+        width="140"
+        label="净重单价（元/公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="unitDeduction"
+        width="130"
+        label="扣单价（元/公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="solidGrainPrice"
+        width="140"
+        label="纯重单价（元/公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="netWeight"
+        width="120"
+        label="净重（公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="pureWeight"
+        width="120"
+        label="纯重（公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="amountIngPayable"
+        label="应付款(元)"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="amountEdPayable"
+        label="已付款(元)"
+      >
         <template slot-scope="scope">
-          <div @click="showPayImg(scope.row)">{{scope.row.amountEdPayable}}</div>
+          <div @click="showPayImg(scope.row)">
+            {{ scope.row.amountEdPayable }}
+          </div>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="updateDate" label="更新时间" width="140"></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="updateDate"
+        label="更新时间"
+        width="140"
+      ></el-table-column>
       <el-table-column class="table_td" prop="status" label="状态">
         <template scope="scope">
           <span v-if="scope.row.approveStatus">
-            {{
-            scope.row.approveStatus
-            }}
+            {{ scope.row.approveStatus }}
           </span>
           <span v-else>{{ scope.row.status }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="350">
+      <el-table-column
+        class="table_td"
+        prop="collectionEdPayable"
+        label="操作"
+        width="350"
+      >
         <template scope="scope">
           <el-button
-            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
+            v-if="
+              (!scope.row.approveStatus ||
+                scope.row.approveStatus == '待结算') &&
+              scope.row.status == '待结算'
+            "
             @click="settlement(1, scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.add`"
-          >结算</el-button>
+            >结算</el-button
+          >
           <el-button
             v-if="scope.row.approveStatus || scope.row.status == '已驳回'"
             @click="settlement(2, scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.view`"
-          >查看</el-button>
+            >查看</el-button
+          >
           <el-button
-            v-if="scope.row.approveStatus || (scope.row.status != '待结算'&& !scope.row.approveStatus) "
+            v-if="
+              scope.row.approveStatus ||
+              (scope.row.status != '待结算' && !scope.row.approveStatus)
+            "
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
-          >打印</el-button>
+            >打印</el-button
+          >
           <el-button
             type="danger"
-            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
+            v-if="
+              (!scope.row.approveStatus ||
+                scope.row.approveStatus == '待结算') &&
+              scope.row.status == '待结算'
+            "
             @click="del(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 付款弹窗 -->
-    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true" title="付款">
+    <el-dialog
+      width="40%"
+      :visible.sync="paymentForm"
+      :append-to-body="true"
+      title="付款"
+    >
       <div class="tanchuang">
         <ws-form>
           <ws-info-table>
-            <ws-form-item label="未付金额（元）" prop="amountNotPayable">{{ payments.amountNotPayable }}</ws-form-item>
+            <ws-form-item label="未付金额（元）" prop="amountNotPayable">{{
+              payments.amountNotPayable
+            }}</ws-form-item>
             <ws-form-item label="本次付款金额（元）" prop="money">
               <ws-input
                 type="number"
@@ -164,9 +287,16 @@
               />
             </ws-form-item>
             <ws-form-item label="付款日期" prop=" paymentDate">
-              <el-date-picker v-model="payments.paymentDate" type="date" placeholder="选择日期"></el-date-picker>
+              <el-date-picker
+                v-model="payments.paymentDate"
+                type="date"
+                placeholder="选择日期"
+              ></el-date-picker>
             </ws-form-item>
-            <ws-form-item label="上传截图" prop=" paymentScreenshot"></ws-form-item>
+            <ws-form-item
+              label="上传截图"
+              prop=" paymentScreenshot"
+            ></ws-form-item>
             <div class="upLoad">
               <el-upload
                 class="avatar-uploader"
@@ -187,11 +317,16 @@
       </div>
     </el-dialog>
     <!-- 付款截图 -->
-    <el-dialog width="50%" :visible.sync="showPayImgs" :append-to-body="true" title="付款截图">
-      <div v-for="(item,index) in payImg" :key="index" class="pay_img">
+    <el-dialog
+      width="50%"
+      :visible.sync="showPayImgs"
+      :append-to-body="true"
+      title="付款截图"
+    >
+      <div v-for="(item, index) in payImg" :key="index" class="pay_img">
         <img :src="item" alt class="img" />
       </div>
-      <div style="text-align:center;margin:10px auto;">
+      <div style="text-align: center; margin: 10px auto">
         <el-button @click="showPayImgs = false" type="primary">关闭</el-button>
       </div>
     </el-dialog>
@@ -209,11 +344,17 @@
         class="table-content"
         center
         :visible.sync="isShowPrint"
-        :title="printData.compName+'结算凭证'"
+        :title="printData.compName + '结算凭证'"
       >
-        <paymentPrint :printData="printData" :customerInfo="customerList" :showType="ruleForm.type"></paymentPrint>
+        <paymentPrint
+          :printData="printData"
+          :customerInfo="customerList"
+          :showType="ruleForm.type"
+        ></paymentPrint>
         <div style="text-align: center">
-          <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
+          <el-button type="primary" @click="isShowPrint = false"
+            >关闭</el-button
+          >
           <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
           <el-button type="primary" @click="printBig">打印单据</el-button>
         </div>
@@ -229,7 +370,8 @@ import {
   auditpayment,
   getpaymentexamine,
   getCustomerLook,
-  paymentCommit
+  paymentCommit,
+  getJurisdiction,
 } from '@/model/houseSelfCollect/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import paymentPrint from './component/paymentPrint.vue'
@@ -248,8 +390,8 @@ export default {
           '打印身份证（正反面）',
           '打印银行卡（正反面）',
           '打印结算凭证',
-          '打印发票'
-        ]
+          '打印发票',
+        ],
       },
       row: {},
       isShowPrintType: false,
@@ -261,7 +403,7 @@ export default {
         customerName: '',
         customerNumberCard: '',
         bankCard: '',
-        bankDeposit: ''
+        bankDeposit: '',
       },
       identity: [],
       //分页
@@ -285,13 +427,13 @@ export default {
       userJurisdiction: true,
       payments: {
         amountNotPayable: 0,
-        paymentDate: ''
+        paymentDate: '',
       },
       showPayImgs: false,
       isShowAdopt: false,
       //上传截图路径
       imageUrl: '',
-      payImg: []
+      payImg: [],
     }
   },
   activated() {
@@ -326,10 +468,10 @@ export default {
       //  this.isShowPrint = true
       getCustomerLook({
         id: this.row.identityAuthenticationInfo.id,
-        authenticationStatusKey: 7
+        authenticationStatusKey: 7,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.customerList = response
           this.identity = this.customerList.cardAddressUrl.split(',')
           this.bank = this.customerList.payeeAddressUrl.split(',')
@@ -339,7 +481,7 @@ export default {
           this.imageUrl4 = this.bank[1]
           getpaymentexamine({ id: this.row.id })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.printData = response
               this.isShowPrint = true
               // if(this.printData.solidGrainPrice){
@@ -356,6 +498,19 @@ export default {
             })
         })
     },
+    handleRowClick(row) {
+      if (row.approveStatus == null) {
+        this.$refs.paymentList.toggleRowSelection(row)
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
+        } else {
+          this.$refs.paymentList.toggleRowSelection(row)
+          return true
+        }
+      }
+    },
     handlepass() {
       var that = this
       if (this.modification.length == 0) {
@@ -364,7 +519,7 @@ export default {
         this.$confirm(`审核通过后，任务将发送给财务，是否确定通过？`, {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
-          type: 'warning'
+          type: 'warning',
         }).then(() => {
           that.audit(this.modification[0], 0, true, 2)
         })
@@ -375,7 +530,7 @@ export default {
       if (!row.paymentScreenshot) {
         this.$message({
           message: '暂无付款截图！',
-          type: 'warning'
+          type: 'warning',
         })
         return
       } else {
@@ -387,21 +542,21 @@ export default {
       let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
       _wareHouse = JSON.parse(_wareHouse)
       selectWarehouseSelf({
-        compId: sessionStorage.getItem('ws-pf_compId')
+        compId: sessionStorage.getItem('ws-pf_compId'),
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.warehouseList = response
-           if (_wareHouse) {
+          if (_wareHouse) {
             this.warehouseNameKey = _wareHouse.id
             this.warehouseName = _wareHouse.warehouseName
           } else {
-          this.warehouseNameKey = this.warehouseList[0].id
+            this.warehouseNameKey = this.warehouseList[0].id
             if (this.warehouseName) {
               this.warehouseNameKey = this.WAREHOUSE[3].payname
             } else {
               this.WAREHOUSE[3].payname = this.warehouseList[0].id
-              this.warehouseName =  this.warehouseList[0].warehouseName
+              this.warehouseName = this.warehouseList[0].warehouseName
             }
           }
           this.getList()
@@ -431,41 +586,61 @@ export default {
     getList() {
       this.payments = {
         amountNotPayable: 0,
-        paymentDate: ''
+        paymentDate: '',
       }
       var searchParam = ''
       if (this.searchType != -1) {
         searchParam = this.searchType
       }
+
       getpayment({
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchKeyWord: this.searchKeyWord,
         searchType: searchParam,
         warehouseName: this.warehouseName,
-        managementType: 1
+        managementType: 1,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.paymentList = response
           this.deptBudgetTotal = response.total
         })
-        this.isShowAdopt = true
-    //  getpayment({
-    //      currentPage: 1,
-    //     pageSize: 99999,
-    //     warehouseName: this.warehouseName,
-    //     managementType : 1 
-    //   })
-    //     .toPromise()
-    //     .then((response) => {
-    //       for(let i = 0 ; i < response.length ; i++){
-    //         if(response[i].taskId){
-    //           this.isShowAdopt = true
-    //           return
-    //         }
-    //       }
-    //     })
+
+      getJurisdiction({
+        managementType: 1,
+        warehouseName: this.warehouseName,
+        compId: sessionStorage.getItem('ws-pf_compId'),
+      })
+        .toPromise()
+        .then((response) => {
+          this.isShowAdopt = response
+        })
+
+      //   getJurisdiction({
+      //  managementType:1,
+      //  warehouseName:this.warehouseName,
+      //  compId:sessionStorage.getItem('ws-pf_compId'),
+      // })
+      //   .toPromise()
+      //   .then(response => {
+      //       console.log(response)
+      //   })
+      //  getpayment({
+      //      currentPage: 1,
+      //     pageSize: 99999,
+      //     warehouseName: this.warehouseName,
+      //     managementType : 1
+      //   })
+      //     .toPromise()
+      //     .then((response) => {
+      //       for(let i = 0 ; i < response.length ; i++){
+      //         if(response[i].taskId){
+      //           this.isShowAdopt = true
+      //           return
+      //         }
+      //       }
+      //     })
     },
     del(row) {
       this.$confirm(
@@ -474,13 +649,13 @@ export default {
         {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning'
+          type: 'warning',
         }
       )
         .then(() => {
           delpayment({ id: row.id })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.$message.success('删除成功')
               this.getList()
             })
@@ -500,7 +675,7 @@ export default {
       if (row.goodsName)
         this.$router.push({
           path: 'settlement',
-          query: { type: index, id: row.id }
+          query: { type: index, id: row.id },
         })
     },
     payment() {
@@ -521,28 +696,28 @@ export default {
       if (!this.payments.money) {
         this.$message({
           message: '付款金额不能为空',
-          type: 'warning'
+          type: 'warning',
         })
         return
       }
       if (this.payments.money > this.payments.amountNotPayable) {
         this.$message({
           message: '付款金额不能超过未付金额',
-          type: 'warning'
+          type: 'warning',
         })
         return
       }
       if (!this.payments.paymentDate) {
         this.$message({
           message: '付款日期不能为空',
-          type: 'warning'
+          type: 'warning',
         })
         return
       }
       if (!this.imageUrl) {
         this.$message({
           message: '请上传付款截图 ',
-          type: 'warning'
+          type: 'warning',
         })
         return
       }
@@ -552,16 +727,16 @@ export default {
       this.$confirm('确定提交付款信息？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
         .then(() => {
           //付款提交
           paymentCommit(this.payments)
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.$notify.success({
                 title: '成功',
-                message: '付款成功'
+                message: '付款成功',
               })
               this.paymentForm = false
               this.getList()
@@ -578,7 +753,7 @@ export default {
         this.$confirm('是否确定驳回？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning'
+          type: 'warning',
         })
           .then(() => {
             this.audit(this.modification[0], 0, false, '', '')
@@ -593,10 +768,10 @@ export default {
         if (status == true && item.status == '已驳回') {
           auditpayment({
             compId: sessionStorage.getItem('ws-pf_compId'),
-            id: item.id
+            id: item.id,
           })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.audit(
                 this.modification[index + 1],
                 index + 1,
@@ -610,10 +785,10 @@ export default {
             taskId: item.taskId,
             approved: status,
             auditMind: reason != undefined ? '已驳回' : '34',
-            needReapply: status2 != undefined ? true : false
+            needReapply: status2 != undefined ? true : false,
           })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.audit(
                 this.modification[index + 1],
                 index + 1,
@@ -622,7 +797,7 @@ export default {
                 reason
               )
             })
-            .catch(req => {
+            .catch((req) => {
               this.$message.warning(req.message)
             })
         }
@@ -644,7 +819,7 @@ export default {
         this.$confirm('是否确定通过？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning'
+          type: 'warning',
         })
           .then(() => {
             this.audit(this.modification[0], 0, true)
@@ -662,7 +837,7 @@ export default {
       } else {
         getpaymentexamine({ id: row.id })
           .toPromise()
-          .then(response => {
+          .then((response) => {
             this.printData = response
             this.isShowPrint = true
             // if(this.printData.solidGrainPrice){
@@ -686,7 +861,7 @@ export default {
         this.$confirm('审核通过后，任务将发送给财务，是否确定通过？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning'
+          type: 'warning',
         })
           .then(() => {})
           .catch(() => {
@@ -717,7 +892,10 @@ export default {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].id == this.warehouseNameKey) {
           this.warehouseName = this.warehouseList[i].warehouseName
-          sessionStorage.setItem('houseSelfCollect_house',JSON.stringify(this.warehouseList[i]))
+          sessionStorage.setItem(
+            'houseSelfCollect_house',
+            JSON.stringify(this.warehouseList[i])
+          )
           this.WAREHOUSE[3].payname = this.warehouseList[i].id
         }
       }
@@ -732,8 +910,8 @@ export default {
       this.currentPage = val
       console.log(`当前页: ${val}`)
       this.getList()
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -880,15 +1058,15 @@ table {
   z-index: 99;
   opacity: 0.3;
 }
-.print-type-title{
-    text-align: center;
-    font-size: 18px;
-    margin: 20px;
+.print-type-title {
+  text-align: center;
+  font-size: 18px;
+  margin: 20px;
 }
-.bottom-btn{
+.bottom-btn {
   margin: 20px;
 }
-.print-type-checkbox{
- padding-left: 20px;
+.print-type-checkbox {
+  padding-left: 20px;
 }
 </style>

src/views/warehouse/warehouseManagementDelivery.vue

@@ -1038,7 +1038,7 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.deliveryType) {
+      if (!this.deptBudgetList.inOutType) {
         this.$message({
           message: '出库类型不能为空！',
           type: 'warning',

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -1208,8 +1208,8 @@ export default {
           return
         }
         if (
-          this.dataList.warehouseInOutDetail.bulkDensity < 1 ||
-          this.dataList.warehouseInOutDetail.bulkDensity > 40 ||
+          this.dataList.warehouseInOutDetail.bulkDensity > 1000 ||
+          this.dataList.warehouseInOutDetail.bulkDensity < 0||
           (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
             '.'
           ) != -1 &&

src/views/warehouse/warehouseManagementPut.vue

@@ -1762,7 +1762,7 @@ export default {
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.statusFlag = 1
               let _data = JSON.parse(sessionStorage.getItem('winseaview-userInfo'))
-                this.dataList.backOffice  = _data.content.showCompName+'-' +_data.content.staffName
+                this.deptBudgetList.backOffice  = _data.content.showCompName+'-' +_data.content.staffName
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {

src/views/warehouse/warehouselocation.vue

@@ -45,7 +45,7 @@
                 </ws-select>
               <div :class='{"forbidden":forbidden1==true}' @click='add'><i class="el-icon-arrow-right"></i></div>
           </div>
-          <span v-if='warehouseList.records>0'>合计：{{count}}元</span>
+          <span v-if='deptBudgetTotal>0'>合计：{{count}}元</span>
         </div>
       </el-col>
       <el-col :span="12" class="bg-right">
@@ -399,7 +399,7 @@ this.cangid=this.$route.query.cangId
             })
             return
         }
-        editinventory({applUrl:this.applUrl,expenseName:this.expenseName,amount:this.amount,warehouseId:this.cangid,warehouseName:this.warehouseName}).toPromise()
+        editinventory({id:this.id,applUrl:this.applUrl,expenseName:this.expenseName,amount:this.amount,warehouseId:this.cangid,warehouseName:this.warehouseName}).toPromise()
         .then((response) => {
             this.$notify.success({
                 title: '成功',