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

src/views/houseSelfCollect/paymentManagement.vue

@@ -7,30 +7,15 @@
         <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>
@@ -43,38 +28,27 @@
       <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="primary"  @click="screen()">全部</ws-button>-->
         <ws-button
           :type="searchType == 0 ? 'primary' : ''"
           @click="screen(1)"
           v-if="isShowAdopt"
-          >待审核</ws-button
-        >
-         <ws-button
+        >待审核</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
-        >
+          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
@@ -119,127 +93,54 @@
       @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 }}
-          </span>
+          <span v-if="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 == '待结算'
-            "
-            @click="settlement(1, scope.row)"
-            v-hasPermission="`acquisitionManagement.acquisitionPay.add`"
-            >结算</el-button
-          >
+          <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
+            <el-button
+              v-if="
+                    (!scope.row.approveStatus ||
+                      scope.row.approveStatus == '待结算') &&
+                    scope.row.status == '待结算'
+                  "
+              @click="settlement(1, scope.row)"
+            >结算</el-button>
+          </span>
+
           <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 ||
@@ -247,8 +148,7 @@
             "
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
-            >打印</el-button
-          >
+          >打印</el-button>
           <el-button
             type="danger"
             v-if="
@@ -258,24 +158,20 @@
             "
             @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">{{
+            <ws-form-item label="未付金额（元）" prop="amountNotPayable">
+              {{
               payments.amountNotPayable
-            }}</ws-form-item>
+              }}
+            </ws-form-item>
             <ws-form-item label="本次付款金额（元）" prop="money">
               <ws-input
                 type="number"
@@ -287,16 +183,9 @@
               />
             </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"
@@ -317,12 +206,7 @@
       </div>
     </el-dialog>
     <!-- 付款截图 -->
-    <el-dialog
-      width="50%"
-      :visible.sync="showPayImgs"
-      :append-to-body="true"
-      title="付款截图"
-    >
+    <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>
@@ -346,15 +230,9 @@
         :visible.sync="isShowPrint"
         :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>
@@ -371,7 +249,7 @@ import {
   getpaymentexamine,
   getCustomerLook,
   paymentCommit,
-  getJurisdiction,
+  getJurisdiction
 } from '@/model/houseSelfCollect/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import paymentPrint from './component/paymentPrint.vue'
@@ -390,8 +268,8 @@ export default {
           '打印身份证（正反面）',
           '打印银行卡（正反面）',
           '打印结算凭证',
-          '打印发票',
-        ],
+          '打印发票'
+        ]
       },
       row: {},
       isShowPrintType: false,
@@ -403,7 +281,7 @@ export default {
         customerName: '',
         customerNumberCard: '',
         bankCard: '',
-        bankDeposit: '',
+        bankDeposit: ''
       },
       identity: [],
       //分页
@@ -427,13 +305,13 @@ export default {
       userJurisdiction: true,
       payments: {
         amountNotPayable: 0,
-        paymentDate: '',
+        paymentDate: ''
       },
       showPayImgs: false,
       isShowAdopt: false,
       //上传截图路径
       imageUrl: '',
-      payImg: [],
+      payImg: []
     }
   },
   activated() {
@@ -468,10 +346,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(',')
@@ -481,7 +359,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){
@@ -519,7 +397,7 @@ export default {
         this.$confirm(`审核通过后，任务将发送给财务，是否确定通过？`, {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
-          type: 'warning',
+          type: 'warning'
         }).then(() => {
           that.audit(this.modification[0], 0, true, 2)
         })
@@ -530,7 +408,7 @@ export default {
       if (!row.paymentScreenshot) {
         this.$message({
           message: '暂无付款截图！',
-          type: 'warning',
+          type: 'warning'
         })
         return
       } else {
@@ -542,10 +420,10 @@ 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) {
             this.warehouseNameKey = _wareHouse.id
@@ -586,7 +464,7 @@ export default {
     getList() {
       this.payments = {
         amountNotPayable: 0,
-        paymentDate: '',
+        paymentDate: ''
       }
       var searchParam = ''
       if (this.searchType != -1) {
@@ -599,10 +477,10 @@ export default {
         searchKeyWord: this.searchKeyWord,
         searchType: searchParam,
         warehouseName: this.warehouseName,
-        managementType: 1,
+        managementType: 1
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.paymentList = response
           this.deptBudgetTotal = response.total
         })
@@ -610,10 +488,10 @@ export default {
       getJurisdiction({
         managementType: 1,
         warehouseName: this.warehouseName,
-        compId: sessionStorage.getItem('ws-pf_compId'),
+        compId: sessionStorage.getItem('ws-pf_compId')
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.isShowAdopt = response
         })
 
@@ -649,13 +527,13 @@ export default {
         {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning',
+          type: 'warning'
         }
       )
         .then(() => {
           delpayment({ id: row.id })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$message.success('删除成功')
               this.getList()
             })
@@ -675,7 +553,7 @@ export default {
       if (row.goodsName)
         this.$router.push({
           path: 'settlement',
-          query: { type: index, id: row.id },
+          query: { type: index, id: row.id }
         })
     },
     payment() {
@@ -696,28 +574,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
       }
@@ -727,16 +605,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()
@@ -753,7 +631,7 @@ export default {
         this.$confirm('是否确定驳回？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning',
+          type: 'warning'
         })
           .then(() => {
             this.audit(this.modification[0], 0, false, '', '')
@@ -768,10 +646,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,
@@ -785,10 +663,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,
@@ -797,7 +675,7 @@ export default {
                 reason
               )
             })
-            .catch((req) => {
+            .catch(req => {
               this.$message.warning(req.message)
             })
         }
@@ -819,7 +697,7 @@ export default {
         this.$confirm('是否确定通过？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning',
+          type: 'warning'
         })
           .then(() => {
             this.audit(this.modification[0], 0, true)
@@ -837,7 +715,7 @@ export default {
       } else {
         getpaymentexamine({ id: row.id })
           .toPromise()
-          .then((response) => {
+          .then(response => {
             this.printData = response
             this.isShowPrint = true
             // if(this.printData.solidGrainPrice){
@@ -861,7 +739,7 @@ export default {
         this.$confirm('审核通过后，任务将发送给财务，是否确定通过？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning',
+          type: 'warning'
         })
           .then(() => {})
           .catch(() => {
@@ -910,8 +788,8 @@ export default {
       this.currentPage = val
       console.log(`当前页: ${val}`)
       this.getList()
-    },
-  },
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -232,7 +232,7 @@
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
             <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.inOutType"
-              placeholder="请选择出库类型" class="typeselect" @change="selectstorageType">
+              placeholder="请选择出库类型" class="typeselect" @change="selectstorageType1">
               <el-option v-for="item in storageType" :key="item.constKey" v-if="
                   (dataList.taskTypeKey == 1 &&
                     item.constValue != '移库出库') ||
@@ -447,7 +447,8 @@
           taskTypeKey: '1'
         },
         dataList1: {
-          taskTypeKey: '1'
+          taskTypeKey: '1',
+          inOutType:''
         },
         historyList: [],
         pickerBeginDateBefore: {
@@ -1414,10 +1415,16 @@
           }
         }
       },
-      selectstorageType1(e) {debugger
+      selectstorageType1(e) {
         switch (e) {
           case '采购入库':
             this.flag = 0
+            break
+              case '暂存入库':
+            this.flag = 0
+            break
+              case '贸易服务入库':
+            this.flag = 0
             break
           case '退库':
             this.flag = 2

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -216,7 +216,6 @@ export default {
     
     //编辑
     edits(row) {
-            debugger
       if (row.inOutFlag == 2) {
         this.$store.dispatch('app/setdeptBudgetList', row)
         this.$router.push({