更新

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/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 = ''

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/',