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

public/static/payprint.html

@@ -156,7 +156,7 @@
             <div>No.</div>
           </div>
           <div class="header-top">
-            <div>开票日期：{{date}}</div>
+            <div>开票日期：{{printData.currentTime}}</div>
             <div class="number">{{100000000000000}}</div>
           </div>
           <table class="table">
@@ -164,7 +164,7 @@
               <td rowspan="4" class="col col-bgc">买方</td>
               <td class="col col-bgc">单位名称</td>
               <td class="col" colspan="3">{{printData.compName}}</td>
-              <td rowspan="4" class="col col-bgc">买方</td>
+              <td rowspan="4" class="col col-bgc">卖方</td>
               <td class="col col-bgc">姓名</td>
               <td class="col" colspan="3">{{printData.customerName}}</td>
             </tr>
@@ -172,19 +172,19 @@
               <td class="col col-bgc">税务登记号</td>
               <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
               <td class="col col-bgc">身份证号</td>
-              <td class="col" colspan="3">{{printData.customerNumberCard}}</td>
+              <td class="col" colspan="3">{{printData.identityAuthenticationInfo.customerNumberCard}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">化验单号</td>
               <td class="col" colspan="3">{{printData.paymentNo}}</td>
               <td class="col col-bgc">卡号</td>
-              <td class="col" colspan="3">{{printData.bankCard}}</td>
+              <td class="col" colspan="3">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">收货仓库</td>
               <td class="col" colspan="3">{{printData.warehouseName}}</td>
               <td class="col col-bgc">地址</td>
-              <td class="col" colspan="3">{{printData.compAddress}}</td>
+              <td class="col" colspan="3">{{printData.identityAuthenticationInfo.compAddress}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">货名</td>
@@ -201,17 +201,18 @@
             <tr class="row">
               <td class="col">{{printData.goodsName}}</td>
               <td class="col">{{printData.type}}</td>
-              <td class="col">{{printData.grade}}</td>
-              <td class="col">{{printData.waterContent}}</td>
-              <td class="col">{{printData.impurity}}</td>
+              <td class="col">{{printData.qualityInspectionManagement.grade}}</td>
+              <td class="col">{{printData.qualityInspectionManagement.waterContent}}</td>
+              <td class="col">{{printData.qualityInspectionManagement.impurity}}</td>
               <td class="col">{{printData.grossWeight}}</td>
               <td class="col">{{printData.tare}}</td>
-              <td class="col">{{printData.buckleMiscellaneous}}</td>
+              <td class="col">{{printData.qualityInspectionManagement.buckleWeightRatio}}</td>
               <td class="col">{{printData.netWeight}}</td>
               <td class="col">{{printData.pureWeight}}</td>
             </tr>
             <tr class="row">
-              <td class="col col-bgc">净重单价</td>
+              <td class="col col-bgc" v-if="printData.type == '潮粮'">净重单价</td>
+              <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
               <td class="col col-bgc">粮款</td>
               <td class="col col-bgc">称重补助</td>
               <td class="col col-bgc">运费补助</td>
@@ -223,7 +224,8 @@
               <td class="col col-bgc">质量扣款</td>
             </tr>
             <tr class="row">
-              <td class="col ">{{printData.tidalGrainPrice}}</td>
+              <td class="col " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
+              <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
               <td class="col ">{{printData.grainMoney}}</td>
               <td class="col ">{{printData.weighingSubsidy}}</td>
               <td class="col ">{{printData.freightSubsidy}}</td>
@@ -236,7 +238,7 @@
             </tr>
             <tr class="row">
               <td class="col col-bgc">其他扣款</td>
-              <td class="col col-bgc">纯重单价</td>
+              <td class="col col-bgc" v-if="printData.type == '潮粮'">纯重单价</td>
               <td class="col col-bgc">合计应付</td>
               <td class="col col-bgc">购粮性质</td>
               <td class="col col-bgc">车牌号</td>
@@ -244,9 +246,9 @@
             </tr>
             <tr class="row">
               <td class="col ">{{printData.otherDeduction}}</td>
-              <td class="col ">{{printData.solidGrainPrice}}</td>
+              <td class="col " v-if="printData.type == '潮粮'">{{printData.solidGrainPrice}}</td>
               <td class="col ">{{printData.calculationPayable}}</td>
-              <td class="col ">{{printData.natureOfGrainPurchase}}</td>
+              <td class="col ">{{printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
               <td class="col ">{{printData.carNo}}</td>
               <td class="col " colspan="5">{{printData.remarks}}</td>
             </tr>
@@ -261,12 +263,12 @@
 
           <div class="bottom">
             <div class="bottom-row1">
-              <div>质检：{{printData.qualityInspector}}</div>
-              <div>毛检：{{printData.secretaryWeigher}}</div>
-              <div>皮检：{{printData.skinInspector}}</div>
+              <div>质检：{{printData.qualityInspectionManagement.qualityInspector}}</div>
+              <div>毛检：{{printData.weighingManagement.secretaryWeigher}}</div>
+              <div>皮检：{{printData.weighingManagement.skinInspector}}</div>
               <div>结算：{{printData.settlementClerk}}</div>
-              <div>付款：{{printData.actualPayment}}</div>
-              <div>复点：{{}}</div>
+              <div>付款：{{printData.cashier}}</div>
+              <div>复点：{{printData.qualityInspector}}</div>
             </div>
             <div class="bottom-row2">
               <div class="left">

src/api/V2/houseSelfCollect/index.js

@@ -34,6 +34,8 @@ export const API_POST_INSPECT_ADD = '/qualityInspectionManagement/api/addQuality
 export const API_GET_INSPECT_GETBINNUMBER = '/warehouseBaseInfo/getWarehouse'
 //客户下拉
 export const API_GET_INSPECT_GETCUSTOMER = '/identityAuthenticationInfo/identityAuthenticationInfoCustomer'
+//获取二维码
+export const API_GET_INSPECT_GETQRCODE = '/identityAuthenticationInfo/generateQRCodeImage'
 //质检列表
 export const API_GET_INSPECT_GETINSPECTLIST = '/qualityInspectionManagement/selectQualityInspection'
 //质检查看

src/model/houseSelfCollect/index.js

@@ -18,6 +18,7 @@ import {
   API_POST_INSPECT_ADD,
   API_GET_INSPECT_GETBINNUMBER,
   API_GET_INSPECT_GETCUSTOMER,
+  API_GET_INSPECT_GETQRCODE,
   API_GET_INSPECT_GETINSPECTLIST,
   API_GET_INSPECT_GETINSPECTLOOK,
   API_GET_INSPECT_GETINSPECTLOOKUNITPRICE,
@@ -79,6 +80,8 @@ export const inspectAdd = appRx.post(API_POST_INSPECT_ADD, errorCatcher, errorHa
 export const getbinNumber = appRx.get(API_GET_INSPECT_GETBINNUMBER, errorCatcher, errorHandle, filter)
 //客户下拉
 export const getcustomer = appRx.get(API_GET_INSPECT_GETCUSTOMER, errorCatcher, errorHandle, filter)
+//获取二维码
+export const getQRCode = appRx.get(API_GET_INSPECT_GETQRCODE, errorCatcher, errorHandle, filter)
 //质检列表
 export const getinspectList = appRx.get(API_GET_INSPECT_GETINSPECTLIST, errorCatcher, errorHandle, filter)
 //质检查看

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -3,7 +3,7 @@
   <div >
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <el-button type="primary" @click="newAcquisition('','','新增')">新增</el-button>
+        <el-button type="primary" @click="newAcquisition('','','新增')" v-hasPermission=" `acquisitionManagement.acquisitionCustomer.add`">新增</el-button>
          <div>
         <el-select v-model="selectVal" placeholder="请选择" @change="warehouseChange" style="margin:0 20px">
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
@@ -50,9 +50,9 @@
         <el-table-column label="操作" width="300">
           <template slot-scope="scope">
             <el-button size="mini" @click="newAcquisition(scope.$index, scope.row,'查看')">查看</el-button>
-            <el-button v-if="scope.row.status!='审核中'" size="mini" @click="newAcquisition(scope.$index, scope.row,'编辑')">编辑</el-button>
+            <el-button v-if="scope.row.status!='审核中'" size="mini" @click="newAcquisition(scope.$index, scope.row,'编辑')" v-hasPermission=" `acquisitionManagement.acquisitionCustomer.edit`">编辑</el-button>
             <el-button v-if="scope.row.status=='审核中'" size="mini" :disabled="!userJurisdictionAudit" @click="newAcquisition(scope.$index, scope.row,'审核中')">审核中</el-button>
-            <el-button size="mini" :disabled="!userJurisdiction" type="danger" @click="delRow(scope.$index, scope.row)">删除</el-button>
+            <el-button size="mini" :disabled="!userJurisdiction" type="danger" @click="delRow(scope.$index, scope.row)" v-hasPermission=" `acquisitionManagement.acquisitionCustomer.delete`">删除</el-button>
             <el-button size="mini" @click="print(scope.$index, scope.row)">打印</el-button>
           </template>
         </el-table-column>

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -32,7 +32,7 @@
             </el-form-item>
           </div>
           <div class="grid-content">
-            <el-form-item label="干粮收购价格">
+            <el-form-item label="干粮收购价格（元/公斤）">
               <el-input v-model="baseInfoForm.dryGrainPrice" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
@@ -374,10 +374,8 @@
         })
       },
       goodsChange(e) {
-        console.log(e)
       },
       changeBaseWater(val) {
-        console.log('val', val)
         for (let i = 0; i < this.priceList.length; i++) {
           for (let k = 0; k < this.priceList[i].detailList.length; k++) {
             if (this.priceList[i].detailList[k].type == 2) {
@@ -387,7 +385,6 @@
         }
       },
       changeMinWater(val) {
-        console.log('val', val)
         for (let i = 0; i < this.priceList.length; i++) {
           for (let k = 0; k < this.priceList[i].detailList.length; k++) {
             if (this.priceList[i].detailList[k].type == 1) {
@@ -397,7 +394,6 @@
         }
       },
       changeMaxWater(val) {
-        console.log('val', val)
         for (let i = 0; i < this.priceList.length; i++) {
           for (let k = 0; k < this.priceList[i].detailList.length; k++) {
             if (this.priceList[i].detailList[k].type == 3) {
@@ -455,7 +451,6 @@
       reduce(item, item1, index) {
         item.index--
         item.detailList.splice(index, 2);
-        console.log(item, index)
       },
       // 设置分界索引排序
       makeSpliceIndex(item, item1) {
@@ -469,7 +464,6 @@
       },
       // 复选框变化监听
       changeLevel(val, index) {
-        console.log("val", val)
         let _data = this.priceList
         for (let i = 0; i < _data.length; i++) {
           let _childData = _data[i].checkList
@@ -485,10 +479,7 @@
           if (i == 2) this.checkList3 = _data[i].checkList
           if (i == 3) this.checkList4 = _data[i].checkList
         }
-        console.log("-------------------------")
-        // console.log([...new Set(this.checkList)])
         this.checkList = [...new Set([...this.checkList1, ...this.checkList2, ...this.checkList3, ...this.checkList4])]
-        console.log(this.checkList)
       },
       // 算价格纠正精度不准
       accMul(arg1, arg2) {
@@ -507,7 +498,6 @@
       keepTwoDecimal(num) {
         var result = parseFloat(num);
         if (isNaN(result)) {
-          console.log('传递参数错误，请检查！');
           return false;
         }
         result = Math.round(result * 100) / 100;
@@ -716,7 +706,6 @@
           }
           return false
         }
-        console.log(this.priceList.length)
         if (this.checkList.length != 4) {
           this.$message.error('粮价设置为4个等级！');
           return false
@@ -787,7 +776,6 @@
             isValidate = this.validate()
             if (isValidate) {
               purchasePriceAdd(this.baseInfoForm).toPromise().then((response) => {
-                console.log(response)
                 // this.tableData = response.records
                 this.isCountShow = false
               })
@@ -798,8 +786,6 @@
             isValidate = this.validate()
             if (isValidate) {
               purchasePriceEdit(this.baseInfoForm).toPromise().then((response) => {
-                console.log(response)
-                // this.tableData = response.records
                 this.isCountShow = false
               })
             }
@@ -808,8 +794,6 @@
             isValidate = this.validate()
             if (isValidate) {
               purchasePriceEdit(this.baseInfoForm).toPromise().then((response) => {
-                console.log(response)
-                // this.tableData = response.records
                 let that = this
                   this.$confirm(`是否确定通过？`, {
                     cancelButtonText: '取消',
@@ -911,9 +895,7 @@
                 })
               }
             }
-            console.log(_obj)
             this.splitPriceList.push(_obj)
-            console.log(this.splitPriceList)
           }
         }
       },
@@ -966,8 +948,6 @@
       },
       // 计算价格
       calculatePrice(_waterMin) {
-        console.log(_waterMin)
-        console.log("this.splitPriceList", this.splitPriceList)
         let prcieList = []
         let totalPrice = []
         let _price = 0
@@ -980,13 +960,8 @@
               // 未设置分界
               if (_waterMin >= _list[k].priceStart && _waterMin < _list[k].priceEnd && !this.splitPriceList[i]
                 .haveSplit) {
-                console.log(basePrice)
-                console.log(this.keepTwoDecimal(basePrice))
-                console.log(this.keepTwoDecimal(((parseFloat(this.baseInfoForm.waterBase) - _waterMin) / 0.5) * _list[k]
-                  .betweenPrice))
                 _price = basePrice + (parseFloat(this.baseInfoForm.waterBase) - _waterMin) / 0.5 * _list[k]
                   .betweenPrice;
-                console.log(_price)
                 prcieList.push(this.keepTwoDecimal(_price))
               } else if (_waterMin >= _list[k].priceStart && _waterMin < _list[k].priceEnd) {
                 // 当前区间段价格+其他区间段价格
@@ -1006,7 +981,6 @@
                 .haveSplit) {
                 _price = basePrice - (_waterMin - parseFloat(this.baseInfoForm.waterBase)) / 0.5 * _list[k]
                   .betweenPrice;
-                console.log(_price)
                 prcieList.push(this.keepTwoDecimal(_price))
               } else if (_waterMin > _list[k].priceStart && _waterMin <= _list[k].priceEnd) {
                 // 当前段价格+其他段价格

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -9,7 +9,8 @@
       <div>No.</div>
     </div>
     <div class="header-top">
-      <div>开票日期：{{printData.compName}}</div>
+      <div>开票日期：{{printData.currentTime}}</div>
+      <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
       <div class="number">{{100000000000000}}</div>
     </div>
     <table class="table">
@@ -17,7 +18,7 @@
         <td rowspan="4" class="col col-bgc">买方</td>
         <td class="col col-bgc">单位名称</td>
         <td class="col" colspan="3">{{ printData.compName}}</td>
-        <td rowspan="4" class="col col-bgc">买方</td>
+        <td rowspan="4" class="col col-bgc">卖方</td>
         <td class="col col-bgc">姓名</td>
         <td class="col" colspan="3">{{ printData.customerName}}</td>
       </tr>
@@ -25,19 +26,19 @@
         <td class="col col-bgc">税务登记号</td>
         <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
         <td class="col col-bgc">身份证号</td>
-        <td class="col" colspan="3">{{ printData.customerNumberCard}}</td>
+        <td class="col" colspan="3">{{ printData.identityAuthenticationInfo.customerNumberCard}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">化验单号</td>
         <td class="col" colspan="3">{{ printData.paymentNo}}</td>
         <td class="col col-bgc">卡号</td>
-        <td class="col" colspan="3">{{ printData. bankCard}}</td>
+        <td class="col" colspan="3">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">收货仓库</td>
         <td class="col" colspan="3">{{printData.warehouseName}}</td>
         <td class="col col-bgc">地址</td>
-        <td class="col" colspan="3">{{printData.compAddress}}</td>
+        <td class="col" colspan="3">{{printData.identityAuthenticationInfo.compAddress}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">货名</td>
@@ -54,17 +55,18 @@
       <tr class="row">
         <td class="col">{{ printData.goodsName}}</td>
         <td class="col">{{ printData.type}}</td>
-        <td class="col">{{ printData.grade}}</td>
-        <td class="col">{{ printData.waterContent}}</td>
-        <td class="col">{{ printData.impurity}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.grade}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.waterContent}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.impurity}}</td>
         <td class="col">{{ printData.grossWeight}}</td>
         <td class="col">{{ printData.tare}}</td>
-        <td class="col">{{ printData.buckleMiscellaneous}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.buckleWeightRatio}}</td>
         <td class="col">{{ printData.netWeight}}</td>
         <td class="col">{{ printData.pureWeight}}</td>
       </tr>
       <tr class="row">
-        <td class="col col-bgc">净重单价</td>
+        <td class="col col-bgc"  v-if="printData.type == '潮粮'">净重单价</td>
+         <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
         <td class="col col-bgc">粮款</td>
         <td class="col col-bgc">称重补助</td>
         <td class="col col-bgc">运费补助</td>
@@ -76,7 +78,8 @@
         <td class="col col-bgc">质量扣款</td>
       </tr>
       <tr class="row">
-        <td class="col ">{{ printData.tidalGrainPrice}}</td>
+        <td class="col " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
+        <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
         <td class="col ">{{ printData.grainMoney}}</td>
         <td class="col ">{{ printData.weighingSubsidy}}</td>
         <td class="col ">{{ printData.freightSubsidy}}</td>
@@ -89,19 +92,19 @@
       </tr>
       <tr class="row">
         <td class="col col-bgc">其他扣款</td>
-        <td class="col col-bgc">纯重单价</td>
+        <td class="col col-bgc" v-if="printData.type == '潮粮'">纯重单价</td>
         <td class="col col-bgc">合计应付</td>
         <td class="col col-bgc">购粮性质</td>
         <td class="col col-bgc">车牌号</td>
-        <td class="col col-bgc" colspan="5">记事</td>
+        <td class="col col-bgc" colspan="6">记事</td>
       </tr>
       <tr class="row">
         <td class="col ">{{ printData.otherDeduction}}</td>
-        <td class="col ">{{ printData.solidGrainPrice}}</td>
+        <td class="col " v-if="printData.type == '潮粮'">{{ printData.solidGrainPrice}}</td>
         <td class="col ">{{ printData.calculationPayable}}</td>
-        <td class="col ">{{ printData.natureOfGrainPurchase}}</td>
+        <td class="col ">{{ printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
         <td class="col ">{{ printData.carNo}}</td>
-        <td class="col " colspan="5">{{ printData.remarks}}</td>
+        <td class="col " colspan="6">{{ printData.remarks}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">实付金额</td>
@@ -114,11 +117,11 @@
 
     <div class="bottom">
       <div class="bottom-row1">
-        <div>质检：{{ printData.qualityInspector}}</div>
-        <div>毛检：{{ printData.skinInspector}}</div>
-        <div>皮检：{{ printData.qualityInspector}}</div>
+        <div>质检：{{ printData.qualityInspectionManagement.qualityInspector}}</div>
+        <div>毛检：{{ printData.weighingManagement.secretaryWeigher}}</div>
+        <div>皮检：{{ printData.weighingManagement.skinInspector}}</div>
         <div>结算：{{ printData.settlementClerk}}</div>
-        <div>付款：{{ printData.qualityInspector}}</div>
+        <div>付款：{{ printData.cashier}}</div>
         <div>复点：{{ printData.qualityInspector}}</div>
       </div>
       <div class="bottom-row2">
@@ -143,7 +146,8 @@
     props: {
       printData: {
         type: Object
-      }
+      },
+      billingDate:"",
     },
     data() {
       return {
@@ -151,9 +155,17 @@
       }
     },
     activated() {
-
+      let date = new Date()
+     
+      console.log( date.getFullYear())
     },
     methods: {
+      date(){
+        let date = new Date()
+       let datas = date.getDate
+        console.log(new Data())
+        return datas
+      },
       printSmall() {
         window.location.href =
           '../../../../../static/payprint.html?type=1&dataList=' +

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

@@ -21,7 +21,7 @@ const houseSelfCollectRouter = {
       meta: {
         title: 'customerManagement',
         shortcutEntrance: 'houseSelfCollect',
-        module: 'procurement.procurementOrder.delete',
+        module: 'acquisitionManagement.acquisitionCustomer.view',
         permissicon: [],
         keepAlive: true
       }
@@ -35,7 +35,7 @@ const houseSelfCollectRouter = {
           meta: {
             title: 'customerManagementAdd',
             shortcutEntrance: 'houseSelfCollect',
-            module: 'procurement.procurementOrder.delete',
+            module: 'acquisitionManagement.acquisitionCustomer.add',
             permissicon: [],
             keepAlive: true
           },
@@ -79,7 +79,7 @@ const houseSelfCollectRouter = {
       meta: {
         title: 'inspectionManagement',
         shortcutEntrance: 'houseSelfCollect',
-        module: 'procurement.procurementOrder.delete',
+        module: 'acquisitionManagement.acquisitionQuality.view',
         permissicon: [],
         keepAlive: true
       }
@@ -93,7 +93,7 @@ const houseSelfCollectRouter = {
       meta: {
         title: 'weighingManagement',
         shortcutEntrance: 'houseSelfCollect',
-        module: 'procurement.procurementOrder.delete',
+        module: 'acquisitionManagement.acquisitionWeight.view',
         permissicon: [],
         keepAlive: true
       }
@@ -134,7 +134,7 @@ const houseSelfCollectRouter = {
       meta: {
         title: 'inspectInfo',
         shortcutEntrance: 'inspectInfo',
-        module: 'procurement.procurementOrder.delete',
+        module: 'acquisitionManagement.acquisitionQuality.view',
         permissicon: [],
         keepAlive: true
       },
@@ -148,7 +148,7 @@ const houseSelfCollectRouter = {
       meta: {
         title: 'weightCheck',
         shortcutEntrance: 'weightCheck',
-        module: 'procurement.procurementOrder.delete',
+        module: 'acquisitionManagement.acquisitionWeight.view',
         permissicon: [],
         keepAlive: true
       },

src/views/houseSelfCollect/customerManagement.vue

@@ -19,8 +19,8 @@
     <div class="seach">
       <div class="search-right">
         <!-- <ws-button @click="getCustomer()">获取客户</ws-button> -->
-        <el-dialog title="客户扫码" :visible.sync="customerDialogVisible" width="30%">
-          <div id="qrcode"></div>
+        <el-dialog title="客户扫码" :visible.sync="customerDialogVisible" width="320px">
+          <img style="width:300px;height:300px" :src="qrcode"/>
         </el-dialog>
         <!-- <ws-button @click="createCustomer()">创建新客户</ws-button> -->
         <el-dialog title="创建新客户" :visible.sync="creatNewCustomerDialogVisible" width="50%">
@@ -66,6 +66,7 @@
   import {
     getCustomerManage,
     getCustomerDelete,
+    getQRCode
   } from '@/model/houseSelfCollect/index'
   import QRCode from 'qrcodejs2'
   import customerManagementAdd from './customerManagementAdd.vue'
@@ -84,6 +85,7 @@
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
+        qrcode:""
       }
     },
     activated() {
@@ -96,16 +98,16 @@
       //获取客户
       getCustomer() {
         this.customerDialogVisible = true
-        this.$nextTick(function() {
-          document.getElementById('qrcode').innerHTML = ''
-          let qrcode = new QRCode('qrcode', {
-            width: 150,
-            height: 150,
-            text: 'https://www.baidu.com',
-            colorDark: '#109dff',
-            colorLight: '#d9d9d9',
+        if(!this.qrcode||this.qrcode == ""){
+          getQRCode({
+            compId: sessionStorage.getItem('ws-pf_compId')
           })
-        })
+          .toPromise()
+          .then((response) => {
+           this.qrcode = response
+          })
+        }
+        
       },
       //创建客户
       createCustomer(row, num) {

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -16,7 +16,7 @@
         <ws-info-table>
           <div style="display: flex; width: 100%; text-align: center">
             <div style="width: 330px; margin: 0 auto">
-              <div class="unload-img">上传身份证正面</div>
+              <div class="unload-img">上传身份证人像面</div>
               <el-upload class="avatar-uploader avatar-uploader1" action="https://www.zthymaoyi.com/upload/admin"
                 :show-file-list="false" :on-success="upLoadSuccess1" :disabled="disabled">
                 <img v-if="imageUrl1" :src="imageUrl1" class="avatar">
@@ -25,7 +25,7 @@
             </div>
             <div style="width: 330px; margin: 0 auto">
 
-              <div class="unload-img">上传身份证反面</div>
+              <div class="unload-img">上传身份证国徽面</div>
               <el-upload class="avatar-uploader avatar-uploader2" action="https://www.zthymaoyi.com/upload/admin"
                 :show-file-list="false" :on-success="upLoadSuccess2" :disabled="disabled">
                 <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
@@ -69,14 +69,12 @@
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="开户支行" span="1" prop="bankDepositBranch">
-            <!-- <ws-input v-model="customerList.bankDepositBranch" placeholder="请输入开户支行" maxlength="100" size="small"
-              :disabled="disabled" /> -->
-
-                <ws-select v-model="customerList.bankDepositBranch" placeholder="请输入开户支行"
-                :disabled="disabled">
-                <ws-option v-for="item in bankList" :key="item" :label="item"
-                  :value="item" />
-              </ws-select>
+            <ws-input v-if="bankInput" v-model="customerList.bankDepositBranch" placeholder="请输入开户支行" maxlength="100" size="small"
+              :disabled="disabled" />
+            <ws-select v-else v-model="customerList.bankDepositBranch" placeholder="请输入开户支行" :disabled="disabled">
+              <ws-option v-for="item in bankList" :key="item" :label="item" :value="item" />
+            </ws-select>
+            <el-button type="primary" @click="bankInputChange" >{{bankText}}</el-button>
           </ws-form-item>
           <ws-form-item label="收款人姓名" span="1" prop="payeeName">
             <ws-input v-model="customerList.payeeName" placeholder="请输入收款人姓名" maxlength="15" size="small"
@@ -163,6 +161,8 @@
         sendDisabled: false,
         verifyCode: "",
         bankList:[],
+        bankInput:false,
+        bankText:"手动填写"
       }
     },
     activated() {
@@ -187,6 +187,15 @@
       }
     },
     methods: {
+      bankInputChange(){
+        this.bankInput = !this.bankInput
+        if(this.bankInput){
+          this.bankText = "自动识别"
+        }
+        else{
+          this.bankText = "手动填写"
+        }
+      },
       handleRemove(file, index) {
         if (index == 1) {
           this.identityUp = ''
@@ -240,7 +249,6 @@
               phone: this.customerList.customerPhone
             })
             .toPromise().then((response) => {
-              console.log(response)
               if (response == 'ok') {
                 that.sendDisabled = true
                 let sec = 60
@@ -450,7 +458,6 @@
           })
           .toPromise()
           .then((response) => {
-            debugger
             this.customerList.compId = sessionStorage.getItem('ws-pf_compId')
             this.customerList.cardAddressUrl = this.identity.toString()
             this.customerList.payeeAddressUrl = this.bank.toString()

src/views/houseSelfCollect/inspectInfo.vue

@@ -239,7 +239,6 @@
           this.imgUrl = dataURL;
           if (this.imgUrl !== "") {
             let b = this.dataURLtoFile(this.imgUrl, "printImg")
-            console.log(b)
             let formdata = new FormData();
             formdata.append("file", b);
             axios({
@@ -556,7 +555,6 @@
              getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
                 .toPromise()
                 .then((response) => { 
-                  console.log(response,'干粮')
                   this.$set(this.inspect,'dryGrainPrice',response)
                 })
           }

src/views/houseSelfCollect/inspectionManagement.vue

@@ -3,7 +3,7 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button type="primary" @click="inspectInfo(1)">添加</ws-button>
+        <ws-button type="primary" @click="inspectInfo(1)" v-hasPermission="`acquisitionManagement.acquisitionQuality.add`">添加</ws-button>
       </template>
       <template slot="right">
         <ws-select
@@ -78,10 +78,10 @@
       <el-table-column prop="status" label="状态"></el-table-column>
       <el-table-column width="400" label="操作">
         <template slot-scope="scope">
-          <el-button @click="inspectInfo(scope.row, 2)">查看</el-button>
-          <el-button @click="inspectInfo(scope.row, 3)">编辑</el-button>
-          <el-button @click="del(scope.row)" type="danger">删除</el-button>
-          <el-button @click="print(scope.row)">打印</el-button>
+          <el-button @click="inspectInfo(scope.row, 2)" v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
+          <el-button @click="inspectInfo(scope.row, 3)" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">编辑</el-button>
+          <el-button @click="del(scope.row)" type="danger" v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
+          <el-button @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionQuality.print`">打印</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -272,16 +272,6 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          // for (let i = 0; i < response.length; i++) {
-          //   this.warehouseList.push({
-          //     valueKey: i,
-          //     value: response[i].warehouseName,
-          //     id:response[i].id
-          //   })
-          // }
-          // this.searchTypeText = response[0].warehouseName
-          // this.id = response[0].id
-          // console.log(response)
           this.inspect = response.records
           this.deptBudgetTotal = response.total
         })

src/views/houseSelfCollect/paymentManagement.vue

@@ -148,31 +148,10 @@
         width="350"
       >
         <template scope="scope">
-          <el-button
-            type="danger"
-            v-if="!scope.row.approveStatus && scope.row.status != '已驳回'"
-            @click="del(scope.row)"
-            >删除</el-button
-          >
-          <el-button
-            v-if="!scope.row.approveStatus && scope.row.status != '已驳回'"
-            @click="settlement(1, scope.row)"
-            >结算</el-button
-          >
-          <el-button
-            v-if="scope.row.approveStatus || scope.row.status == '已驳回'"
-            @click="settlement(2, scope.row)"
-            >查看</el-button
-          >
-          <el-button
-            v-if="
-              scope.row.approveStatus ||
-              scope.row.status == '已驳回' ||
-              userJurisdiction
-            "
-            @click="print(scope.row)"
-            >打印</el-button
-          >
+          <el-button  type="danger" v-if="!scope.row.approveStatus && scope.row.status != '已驳回'" @click="del(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.delete`">删除</el-button>
+          <el-button v-if="!scope.row.approveStatus && scope.row.status != '已驳回'" @click="settlement(1, scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.add`">结算</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 v-if=" scope.row.approveStatus || scope.row.status == '已驳回' || userJurisdiction " @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">打印</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -318,7 +297,6 @@ export default {
     //上传付款截图
     handleAvatarSuccess(e) {
       this.imageUrl = e.url
-      console.log(e, 'dkltgoidrhfglkhs')
     },
     printSmall() {
       window.location.href =
@@ -447,9 +425,6 @@ export default {
       this.payments.paymentScreenshot = this.imageUrl
       this.payments.cashier = sessionStorage.getItem('ws-pf_staffName')
       this.payments.paymentManagementList = this.modification
-      console.log(this.payments,"付款")
-      
-
       this.$confirm('确定提交付款信息？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -563,8 +538,10 @@ export default {
         .then((response) => {
           this.isShowPrint = true
           this.printData = response
-          console.log('printData', response)
+          let date = new Date()
+           this.printData.currentTime = date.getFullYear() +"年"+ date.getMonth() +"月"+ date.getDay()+"日"
         })
+     
     },
     examine() {
       if (this.modification.length == 0) {
@@ -594,12 +571,13 @@ export default {
     selectInit(row) {
       //在这里一定要记得类型匹配的上。
       if (row.status != '已驳回') {
-        if (row.taskId == null) {
+        if (row.taskId == null&&row.status != '已通过'&&row.status!='部分付款') {
           return false
         } else {
-          return true
+           return true
         }
-      } else {
+      } 
+      else {
         return true
       }
     },
@@ -607,19 +585,6 @@ export default {
     handleSelectionChange(val) {
       this.modification = val
     },
-    // handleRowClick(row) {
-    //   if (row.approveStatus == null) {
-    //     this.$refs.warehouseList.toggleRowSelection(row)
-    //     return true
-    //   } else if (row.approveStatus != null) {
-    //     if (row.taskId == null) {
-    //       return false
-    //     } else {
-    //       this.$refs.warehouseList.toggleRowSelection(row)
-    //       return true
-    //     }
-    //   }
-    // },
     warehouseChange(e) {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].id == this.warehouseNameKey) {

src/views/houseSelfCollect/settlement.vue

@@ -596,7 +596,8 @@ export default {
           return chineseStr;
         },
     print() {
-       if (!this.paymentList.buckleWeightRatio) {
+      if(this.paymentList.type == "潮粮"){
+        if (!this.paymentList.buckleWeightRatio) {
           this.$message({
             message: '扣重比不能为空',
             type: 'warning',
@@ -610,7 +611,7 @@ export default {
           })
           return
         }
-
+      }
         if (this.paymentList.weighingSubsidy < 0 || this.paymentList.weighingSubsidy > 100000) {
           this.$message({
             message: '称重补助范围应在0-100000内',
@@ -703,6 +704,7 @@ export default {
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
              this.printData= response
+             console.log(this.printData,"打印")
          })
          this.isShowPrint = true
            

src/views/houseSelfCollect/weighingManagement.vue

@@ -94,25 +94,10 @@
       <el-table-column prop="status" label="状态"></el-table-column>
       <el-table-column width="300" prop="contractNo1" label="操作">
         <template slot-scope="scope">
-          <el-button
-            @click="weightCheck(scope.row, 1)"
-            v-if="
-              scope.row.status == '已称毛重' || scope.row.status == '已质检'
-            "
-            >毛重</el-button
-          >
+          <el-button @click="weightCheck(scope.row, 1)" v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' " v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`" >毛重</el-button >
           <!-- scope.row.paymentManagement.status == '待结算' && -->
-          <el-button
-          :disabled = "scope.row.allow == 2"
-            @click="weightCheck(scope.row, 2)"
-            v-if="
-              scope.row.status == '已称毛重' || scope.row.status == '已称皮重' 
-            "
-            >皮重</el-button
-          >
-          <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重'"
-            >打印</el-button
-          >
+          <el-button :disabled = "scope.row.allow == 2" @click="weightCheck(scope.row, 2)"  v-if="scope.row.status == '已称毛重' || scope.row.status == '已称皮重' " v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
+          <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
         </template>
       </el-table-column>
     </el-table>
@@ -275,7 +260,6 @@ export default {
           this.warehouseId = this.warehouseList[0].warehouseId
           this.purchasePriceList = this.warehouseList[0].warehouseList
          this.getList()
-          
         })
     },
     getList() {
@@ -302,7 +286,6 @@ export default {
           }
           this.weighingList = response.records
           this.deptBudgetTotal = response.total
-
         })
         .catch((response) => {
           // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/houseSelfCollect/weightCheck.vue

@@ -168,7 +168,6 @@
       <el-button type="primary" @click="printSmall">打印小票</el-button>
       <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
-      
     </el-dialog>
   </div>
 </template>
@@ -380,12 +379,11 @@ export default {
               .then((response) => {
                 for (let i = 0; i < this.purchasePriceList.length; i++) {
                   if (
-                    this.weighingList.goodsName ==
-                    this.purchasePriceList[i].goodsName
+                    this.weighingList.goodsName == this.purchasePriceList[i].goodsName
                   ) {
                     //累计售粮超上限不能完成毛检保存
                     let count = this.purchasePriceList[i].saleLimit - response
-                    if (count - this.weighingList.grossWeight < 0) {
+                    if (count - this.weighingList.grossWeight/1000 < 0) {
                       this.$alert(
                         '该客户累计销售' +
                           this.weighingList.goodsName +

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1624,15 +1624,18 @@ export default {
         .toPromise()
         .then((response) => {
           this.warehouseNameList = response
+          getwarehousename({
+            compId: this.compId,
+            warehouseType: 2,
+          })
+            .toPromise()
+            .then((response) => {
+              for(var i=0;i<response.length;i++){
+                this.warehouseNameList.push(response[i])
+              }
+            })
         })
-      getwarehousename({
-        compId: this.compId,
-        warehouseType: 2,
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseNameList1 = response
-        })
+      
       //经办人
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.112:8090/',
+        target: 'http://192.168.1.103:9100/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',