前端 sdy

src/api/V2/houseSelfCollect/index.js

@@ -24,6 +24,10 @@ export const API_POST_PURCHASEPRICE_ALLOWEDIT = '/purchasePrice/purchasePriceAll
 export const API_GET_WAREHOUSESELF = '/warehouseBaseInfo/selectWarehouseSelf'
 //客户修改
 export const API_POST_CUSTOMER_EDIT = '/identityAuthenticationInfo/api/editIdentityAuthenticationInfo'
+//客户获取验证码
+export const API_GET_CUSTOMER_CODE = '/commonUser/sendVerifyCode'
+//客户验证码校验
+export const API_GET_CUSTOMER_CODEJY = '/commonUser/loginVerifyCode'
 //质检添加
 export const API_POST_INSPECT_ADD = '/qualityInspectionManagement/api/addQualityInspection'
 //质检仓位下拉
@@ -74,3 +78,4 @@ export const API_POST_PAYMENT_PAYMENTSUBMIT = '/paymentManagement/api/payMoney'
 export const API_POST_PAYMENT_SETTLEMENTEDIT = '/paymentManagement/api/editCollect'
 
 
+

src/model/houseSelfCollect/index.js

@@ -38,7 +38,9 @@ import {
   API_POST_PAYMENT_DEL,
   API_POST_PAYMENT_AUDIT,
   API_POST_PAYMENT_PAYMENTSUBMIT,
-  API_POST_PAYMENT_SETTLEMENTEDIT
+  API_POST_PAYMENT_SETTLEMENTEDIT,
+  API_GET_CUSTOMER_CODE,
+  API_GET_CUSTOMER_CODEJY
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -66,6 +68,10 @@ export const purchasePriceAllowEdit = appRx.post(API_POST_PURCHASEPRICE_ALLOWEDI
 export const selectWarehouseSelf = appRx.get(API_GET_WAREHOUSESELF, errorCatcher, errorHandle, filter)
 //客户查看
 export const CustomerEdit = appRx.post(API_POST_CUSTOMER_EDIT, errorCatcher, errorHandle, filter)
+// 获取验证码
+export const GetCustomerCode = appRx.get(API_GET_CUSTOMER_CODE, errorCatcher, errorHandle, filter)
+// 验证码校验
+export const GetCustomerCodeJY = appRx.get(API_GET_CUSTOMER_CODEJY, errorCatcher, errorHandle, filter)
 //质检添加
 export const inspectAdd = appRx.post(API_POST_INSPECT_ADD, errorCatcher, errorHandle, filter)
 //仓位下拉

src/views/contractManagement/purchaseContract.vue

@@ -430,9 +430,6 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-    handleClose1() {
-      this.accesscard = false
-    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
@@ -558,9 +555,6 @@ export default {
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
     history(row) {
       console.log(row)
       billoperatehis({ id: row.id })

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -7,7 +7,7 @@
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
           </el-option>
         </el-select>
-        <el-checkbox v-model="checked" @change="allowEdit" :disabled="!userJurisdictionAllow">允许手动编辑重量</el-checkbox>
+        <el-checkbox v-model="checked" @change="allowEdit">允许手动编辑重量</el-checkbox>
       </div>
       <el-button type="primary" @click="newAcquisition('','','新增')">新增</el-button>
     </div>
@@ -184,9 +184,9 @@
         }).toPromise().then((response) => {
           console.log(response)
           this.warehouseList = response
-          if(this.userJurisdiction){
-            this.warehouseList.unshift({warehouseName:response[0].flag})
-          }
+          // if(this.userJurisdiction){
+          //   this.warehouseList.unshift({warehouseName:response[0].flag})
+          // }
           console.log(this.warehouseList)
           this.selectVal = this.warehouseList[0].id
           if (this.warehouseList[0].allowEdit == 1) {

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -58,7 +58,7 @@
       <el-row class="row3">
         <div class="top">
           <div class="title">粮价设置</div>
-          <el-button v-if="priceList.length<4" class="btn" @click="newSetPrice" :disabled="!isEdit">新增</el-button>
+          <el-button v-if="checkList.length<4" class="btn" @click="newSetPrice" :disabled="!isEdit">新增</el-button>
         </div>
         <div class="content" v-for="(item,index) in priceList" :key="index">
           <div class="top">
@@ -228,7 +228,13 @@
         },
         index: 0,
         type: '',
-        isEdit: true
+        isEdit: true,
+        isSHowNewBtn: true,
+        checkList: [],
+        checkList1: [],
+        checkList2: [],
+        checkList3: [],
+        checkList4: []
       }
     },
     activated() {
@@ -259,6 +265,26 @@
       switch (this.$route.query.type) {
         case "新增":
           this.submitName = "提交"
+          this.baseInfoForm = {
+            warehouseId: '',
+            warehouseName: '',
+            compId: '',
+            goodsNameKey: '',
+            goodsName: '',
+            waterBase: '',
+            deductWeight: '',
+            waterMin: '',
+            waterMax: '',
+            saleLimit: '',
+            statusFlag: '',
+            status: '',
+            workflowId: '',
+            approveStatus: '',
+            passDate: '',
+            dryGrainPrice: '',
+            details: [],
+            detailPrints: []
+          }
           this.baseInfoForm.warehouseId = this.$route.query.warehouseId
           this.baseInfoForm.warehouseName = this.$route.query.warehouseName
           this.baseInfoForm.compId = this.$route.query.compId
@@ -366,19 +392,25 @@
         }
       },
       // 设置表格颜色
-tableRowClassName ({ row, rowIndex }) {
-      if ((rowIndex + 1) % 2 === 0) {
-        return 'double';
-      } else {
-        return 'single';
-      }
-    }, getRowClass ({ rowIndex }) {
-      if (rowIndex == 0) {
-        return 'background:#ebeaef'
-      } else {
-        return ''
-}
-      //   return '';
+      tableRowClassName({
+        row,
+        rowIndex
+      }) {
+        if ((rowIndex + 1) % 2 === 0) {
+          return 'double';
+        } else {
+          return 'single';
+        }
+      },
+      getRowClass({
+        rowIndex
+      }) {
+        if (rowIndex == 0) {
+          return 'background:#ebeaef'
+        } else {
+          return ''
+        }
+        //   return '';
       },
       // 增加分界
       add(item, item1, index) {
@@ -433,7 +465,15 @@ tableRowClassName ({ row, rowIndex }) {
               }
             }
           }
+          if (i == 0) this.checkList1 = _data[i].checkList
+          if (i == 1) this.checkList2 = _data[i].checkList
+          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) {
@@ -496,6 +536,17 @@ tableRowClassName ({ row, rowIndex }) {
       // 删除价格组
       delSetPrice(item, index) {
         let that = this
+        this.checkList1 = []
+        this.checkList2 = []
+        this.checkList3 = []
+        this.checkList4 = []
+        for (let i = 0; i < item.checkList.length; i++) {
+          for (let j = 0; j < this.checkList.length; j++) {
+            if (item.checkList[i] == this.checkList[j]) {
+              this.checkList.splice(j, 1)
+            }
+          }
+        }
         this.$confirm(
             '确认删除本组设置？',
             '提示', {
@@ -559,52 +610,60 @@ tableRowClassName ({ row, rowIndex }) {
         }
       },
       //打印
-      print() {debugger
+      print() {
         localStorage.setItem('pricePrintList', JSON.stringify(this.baseInfoForm.detailPrints));
         window.location.href = "../../../static/print.html?name=" + this.baseInfoForm.goodsName
       },
       validate() {
         let that = this
-        function _baseWaterValidate(min, max, saveNum, point, type) {
-          let _val1 = parseFloat(that.baseInfoForm.waterBase)
+
+        function _baseWaterValidate(min, max, saveNum, point, type, inputVal) {
+          let _val1 = inputVal
           let _pointVal1 = _val1.toString().split(".")[1]
-          let _tobeVal1 = _val1 % saveNum
+          if (_pointVal1 == undefined) _pointVal1 = 0
+          if (typeof(_pointVal1) == "string") _pointVal1 = _pointVal1.length
+          let _tobeVal1 = _val1 % point
           if (type == "waterBase") {
-            if (_val1 < max && _val1 > min && _pointVal1 < point && _tobeVal1 == 0) {
+
+            if (_val1 <= max && _val1 >= min && _pointVal1 <= saveNum && _tobeVal1 == 0) {
               return false
             }
           }
           if (type == "deductWeight") {
-            if (_val1 < max && _val1 > min && _pointVal1 < point) {
+
+            if (_val1 <= max && _val1 >= min && _pointVal1 <= saveNum) {
               return false
             }
           }
           if (type == "saleLimit") {
-
-            if (_val1 < max && _val1 > min && Number.isInteger(this.baseInfoForm.saleLimit)) {
+            if (_val1 <= max && _val1 >= min) {
+              // Number.isInteger(that.baseInfoForm.saleLimit)
               return false
             }
           }
           return true
         }
-        if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase") || this.baseInfoForm.waterBase == '') {
-          if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase")) {
+        if (this.baseInfoForm.waterBase == '' || _baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this
+            .baseInfoForm.waterBase))) {
+          if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this.baseInfoForm.waterBase))) {
             that.$message.error('水分基准输入错误,最多保留1位小数，基准水分须可被0.5整除！');
           } else {
             this.$message.error('基准水分不能为空！');
           }
           return false
         }
-        if (_baseWaterValidate(0, 2, 2, '', 'deductWeight') || this.baseInfoForm.deductWeight == '') {
-          if (_baseWaterValidate(0, 2, 2, '', 'deductWeight')) {
+        if (this.baseInfoForm.deductWeight == '' || _baseWaterValidate(0, 3, 2, '', 'deductWeight', parseFloat(this
+            .baseInfoForm.deductWeight))) {
+          if (_baseWaterValidate(0, 3, 2, '', 'deductWeight', parseFloat(this.baseInfoForm.deductWeight))) {
             that.$message.error('扣重比输入错误！');
           } else {
             this.$message.error('扣重比不能为空！');
           }
           return false
         }
-        if (_baseWaterValidate(0, 1000, 4, '', 'deductWeight') || this.baseInfoForm.dryGrainPrice == '') {
-          if (_baseWaterValidate(0, 1000, 4, '', 'deductWeight')) {
+        if (this.baseInfoForm.dryGrainPrice == '' || _baseWaterValidate(0, 1000, 4, '', 'deductWeight', parseFloat(this
+            .baseInfoForm.dryGrainPrice))) {
+          if (_baseWaterValidate(0, 1000, 4, '', 'deductWeight', parseFloat(this.baseInfoForm.dryGrainPrice))) {
             that.$message.error('干粮收购价输入错误！');
           } else {
             this.$message.error('干粮收购价格不能为空！');
@@ -612,42 +671,48 @@ tableRowClassName ({ row, rowIndex }) {
           return false
         }
 
-        if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase") || this.baseInfoForm.waterMin == '') {
-          if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase")) {
-            that.$message.error('干粮水分输入错误!');
-          } else {
-            this.$message.error('干粮水分不能为空！');
+        if (this.baseInfoForm.waterMin == '' || _baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this
+            .baseInfoForm.waterMin))) {
+          if (this.baseInfoForm.waterMin == '') {
+            this.$message.error('干粮水分不能为空！')
+          }
+          return false
+          if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this.baseInfoForm.waterMin))) {
+            that.$message.error('干粮水分输入错误!')
           }
           return false
         }
-        if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase") || this.baseInfoForm.waterMax == '') {
-          if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase")) {
+        if (this.baseInfoForm.waterMax == '' || _baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this
+            .baseInfoForm.waterMax))) {
+          if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this.baseInfoForm.waterMax))) {
             that.$message.error('水分上限输入错误!');
           } else {
             this.$message.error('水分上限不能为空！');
           }
           return false
         }
-        if (_baseWaterValidate(100, 100000, '', '', "saleLimit") || this.baseInfoForm.saleLimit == '') {
-          if (_baseWaterValidate(100, 100000, '', '', "saleLimit")) {
+        if (this.baseInfoForm.saleLimit == '' || _baseWaterValidate(100, 100000, '', '', "saleLimit", parseFloat(this
+            .baseInfoForm.saleLimit))) {
+          if (_baseWaterValidate(100, 100000, '', '', "saleLimit", parseFloat(this.baseInfoForm.saleLimit))) {
             that.$message.error('销售上限输入错误!');
           } else {
             this.$message.error('销售上限不能为空！');
           }
           return false
         }
-        console.log(this.priceList.length)
-        if (this.priceList.length != 4) {
-          this.$message.error('粮价设置为4个等级！');
-          return false
-        }
+        // console.log(this.priceList.length)
+        // if (this.priceList.length != 4) {
+        //   this.$message.error('粮价设置为4个等级！');
+        //   return false
+        // }
         for (let i = 0; i < this.priceList.length; i++) {
           let _item = this.priceList[i]
-          if (_baseWaterValidate(0, 50, 2, '', "deductWeight") || _item.basicUnitPrice == '') {
-            if (_baseWaterValidate(0, 50, 2, '', "deductWeight")) {
-              that.$message.error('基准单价输入错误！');
-            } else {
+          if (_item.basicUnitPrice == '' || _baseWaterValidate(0, 50, 2, '', "deductWeight", parseFloat(_item
+              .basicUnitPrice))) {
+            if (_item.basicUnitPrice == '') {
               this.$message.error('基准单价不能为空！');
+            } else {
+              that.$message.error('基准单价输入错误！');
             }
             return false
           }
@@ -658,20 +723,21 @@ tableRowClassName ({ row, rowIndex }) {
           for (let j = 0; j < _item.detailList.length; j++) {
             let _item1 = _item.detailList[j]
             if (_item1.type == 4) {
-              if (_baseWaterValidate(0, 100, 3, '', 'deductWeight') || _item1.jfprice == "") {
-                if (_baseWaterValidate(0, 100, 3, '', 'deductWeight')) {
-                  that.$message.error('降幅输入错误！');
-                } else {
+              if (_item1.jfprice == "" || _baseWaterValidate(0, 100, 3, '', 'deductWeight', parseFloat(_item1
+                .jfprice))) {
+                if (_item1.jfprice == "") {
                   this.$message.error('降幅价格不能为空！');
+                } else {
+                  that.$message.error('降幅输入错误！');
                 }
                 return false
               }
             } else {
-              if (_baseWaterValidate(0, 100, 1, 0.5, "waterBase") || _item1.water == "") {
-                if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase")) {
-                  that.$message.error('分界值输入错误！');
+              if (_item1.water == "" || _baseWaterValidate(0, 100, 1, 0.5, "waterBase", parseFloat(_item1.water))) {
+                if (_item1.water == "") {
+                  this.$message.error('分界水分不能为空！')
                 } else {
-                  this.$message.error('分界水分不能为空！');
+                  that.$message.error('分界值输入错误！');
                 }
                 return false
               }
@@ -691,7 +757,7 @@ tableRowClassName ({ row, rowIndex }) {
             this.isCountShow = false;
             break;
           case "新增":
-          isValidate=this.validate()
+            isValidate = this.validate()
             if (isValidate) {
               purchasePriceAdd(this.baseInfoForm).toPromise().then((response) => {
                 console.log(response)
@@ -701,7 +767,7 @@ tableRowClassName ({ row, rowIndex }) {
             }
             break;
           case "编辑":
-          isValidate=this.validate()
+            isValidate = this.validate()
             if (isValidate) {
               purchasePriceEdit(this.baseInfoForm).toPromise().then((response) => {
                 console.log(response)
@@ -1231,19 +1297,24 @@ tableRowClassName ({ row, rowIndex }) {
     font-weight: 500;
     color: #262626;
   }
+
   .double {
     background: #FEFBF6 !important;
   }
+
   .single {
     background: #F7FBFF !important;
   }
-  .bottom-btn{
+
+  .bottom-btn {
     display: flex;
-    .left{
+
+    .left {
       color: red;
     }
+
     margin: 20px 0;
-        justify-content: space-around;
-        align-items: center;
+    justify-content: space-around;
+    align-items: center;
   }
 </style>

src/views/houseSelfCollect/customerManagement.vue

@@ -44,8 +44,8 @@
       <el-table-column prop="authenticationStatus" label="状态"></el-table-column>
       <el-table-column prop="address" label="操作" width="300">
         <template slot-scope="scope">
-          <el-button size="mini" @click="createCustomer(scope.row, 2)">查看</el-button>
-          <el-button size="mini" @click="createCustomer(scope.row, 3)" v-show="isEdit">编辑</el-button>
+          <el-button size="mini" @click="createCustomer(scope.row, 2)" v-show="scope.row.authenticationStatus!='已删除'">查看</el-button>
+          <el-button size="mini" @click="createCustomer(scope.row, 3)" v-show="scope.row.authenticationStatus!='已删除'" :disabled="!scope.row.isEdit">编辑</el-button>
           <el-button size="mini" type="danger" @click="handleDelete(scope.row, '')">删除</el-button>
         </template>
       </el-table-column>
@@ -80,7 +80,6 @@
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
-        isEdit:true
       }
     },
     activated() {
@@ -168,9 +167,9 @@
             this.customertList = response.records
             for(let i=0;i<response.records.length;i++){
               if(response.records[i].compId==sessionStorage.getItem('ws-pf_compId')){
-                this.isEdit = true
+                response.records[i].isEdit = true
               }else{
-                 this.isEdit = false
+                 response.records[i].isEdit = false
               }
             }
             this.deptBudgetTotal = response.total

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -85,33 +85,16 @@
             <ws-input v-model="customerList.customerPhone" placeholder="请输入手机号" maxlength="100" size="small"
               :disabled="disabled" />
           </ws-form-item>
-          <!-- 验证码 -->
-          <!-- <el-form-item prop="veriCode" :label="$t('login.register08')">
-          <el-input v-model="form.name"></el-input>
-             <div style="display: flex; justify-content: space-between">
-            <el-input
-              v-model="form.name"
-              :disabled="disabledFlag"
-              class="code_style"
-              :placeholder="$t('login.registerVerif08')"
-            />
-            <div>
-              <ws-button
-                v-show="verification"
-                type="primary"
-                @click="toSend"
-                >{{ $t('login.sendVerification') }}</ws-button
-              >
-              <ws-button v-show="!verification" class="retry" disabled
-                >{{ $t('login.retry') }}({{ count }})s</ws-button
-              >
-            </div>
-          </div>
-        </el-form-item> -->
           <ws-form-item label="联系地址" span="1" prop="compAddress">
             <ws-input v-model="customerList.compAddress" placeholder="请输入联系地址" maxlength="100" size="small"
               :disabled="disabled" />
           </ws-form-item>
+          <ws-form-item label="验证码" label-width="0px" span="1" prop="compAddress">
+            <el-button type="primary" class="veriCode" @click="toSend()" v-if="!sendDisabled">获取验证码</el-button>
+            <el-button type="warning" class="veriCode" v-if="sendDisabled">{{sendText}}</el-button>
+
+            <ws-input v-model="verifyCode" placeholder="请输入验证码" maxlength="100" size="small" :disabled="disabled" />
+          </ws-form-item>
         </ws-info-table>
         <div class="but">
           <el-button type="primary" @click="commit" v-if="switchType == 1 || switchType == 3">提交</el-button>
@@ -128,7 +111,9 @@
     getCustomerLook,
     CustomerEdit,
     getIdentity,
-    getBank
+    getBank,
+    GetCustomerCode,
+    GetCustomerCodeJY
   } from '@/model/houseSelfCollect/index'
 
   export default {
@@ -170,17 +155,20 @@
         identityLow: 'low',
         bankUps: 'bankUp',
         bankLows: 'bankLow',
+        sendText: '',
+        sendDisabled: false,
+        verifyCode: ""
       }
     },
     activated() {
       this.switchType = this.$route.query.types
       if (this.$route.query.types == null) {
         this.switchType = 1
-        this.imageUrl1=""
-        this.imageUrl2=""
-        this.imageUrl3=""
-        this.imageUrl4=""
-        this.customerList={}
+        this.imageUrl1 = ""
+        this.imageUrl2 = ""
+        this.imageUrl3 = ""
+        this.imageUrl4 = ""
+        this.customerList = {}
       }
       let id = this.$route.query.id
       if (this.switchType == 2) {
@@ -241,41 +229,30 @@
       },
       // 发送验证码
       toSend() {
-        if (this.registerForm.linkmanPhone) {
-          if (validUserCellPhone(this.registerForm.linkmanPhone)) {
-            this.disabledFlag = false
-            clearInterval(this.timer)
-            this.timer = null
-            const TIME_COUNT = 60
-            if (!this.timer) {
-              this.count = TIME_COUNT
-              this.verification = false
-              let data = {
-                mobilePhone: this.registerForm.linkmanPhone,
-              }
-              sendRegisterCode(data)
-                .toPromise()
-                .then((res) => {
-                  this.timer = setInterval(() => {
-                    if (this.count > 0 && this.count <= TIME_COUNT) {
-                      this.count--
-                    } else {
-                      this.verification = true
-                      clearInterval(this.timer)
-                      this.timer = null
-                    }
-                  }, 1000)
-                })
-                .catch((err) => {
-                  this.verification = true
-                })
-            }
-          } else {
-            EventBus.$emit('error', this.$t('login.registerVerif09'))
-          }
-        } else {
-          EventBus.$emit('error', this.$t('login.registerVerif05'))
+        let that = this;
+        if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.customerList.customerPhone)) {
+          GetCustomerCode({
+              phone: this.customerList.customerPhone
+            })
+            .toPromise().then((response) => {
+              console.log(response)
+              if (response == 'ok') {
+                that.sendDisabled = true
+                let sec = 60
+                let interval = setInterval(() => {
+                  sec--;
+                  that.sendText = sec + 'S后重发'
+                  if (sec <= 0) {
+                    that.sendDisabled = false
+                    that.sendText = "获取验证码"
+                    clearInterval(interval)
+                  }
+                }, 1000)
+              } else {}
+            })
         }
+
+
       },
       cancel() {
         this.$router.push({
@@ -283,7 +260,6 @@
         })
       },
       upLoadSuccess1(e) {
-        debugger
         this.identityUp = 'up'
         this.identity[0] = e.url
         this.imageUrl1 = e.url
@@ -353,54 +329,63 @@
           })
       },
       commit() {
-        this.customerList.compId = sessionStorage.getItem('ws-pf_compId')
-        this.customerList.cardAddressUrl = this.identity.toString()
-        this.customerList.payeeAddressUrl = this.bank.toString()
-        this.customerList.customerTypeFlag = 1
-        this.customerList.customerType = '个人'
-        if (this.switchType == 1) {
-          this.$confirm('确定提交客户信息？', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning',
-            })
-            .then(() => {
-              customerAdd(this.customerList)
-                .toPromise()
-                .then((response) => {
-                  // this.customerList.id = response
-                  // customerIdentity(this.customerList)
-                  //   .toPromise()
-                  //   .then((response) => {
-                  //     this.$message.success('添加成功')
-                  //     this.$router.push({ path: 'customerManagement' })
-                  //   })
-                  this.$router.go(-1)
+        // 验证码校验
+        GetCustomerCodeJY({
+            phone: this.customerList.customerPhone,
+            verifyCode: this.verifyCode
+          })
+          .toPromise()
+          .then((response) => {
+            debugger
+            this.customerList.compId = sessionStorage.getItem('ws-pf_compId')
+            this.customerList.cardAddressUrl = this.identity.toString()
+            this.customerList.payeeAddressUrl = this.bank.toString()
+            this.customerList.customerTypeFlag = 1
+            this.customerList.customerType = '个人'
+            if (this.switchType == 1) {
+              this.$confirm('确定提交客户信息？', '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning',
                 })
-            })
-            .catch(() => {
-              return false
-            })
-        } else if (this.switchType == 3) {
-          this.$confirm('确定修改客户信息？', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning',
-            })
-            .then(() => {
-              CustomerEdit(this.customerList)
-                .toPromise()
-                .then((response) => {
-                  this.$message.success('修改成功')
-                  this.$router.push({
-                    path: 'customerManagement'
-                  })
+                .then(() => {
+                  customerAdd(this.customerList)
+                    .toPromise()
+                    .then((response) => {
+                      // this.customerList.id = response
+                      // customerIdentity(this.customerList)
+                      //   .toPromise()
+                      //   .then((response) => {
+                      //     this.$message.success('添加成功')
+                      //     this.$router.push({ path: 'customerManagement' })
+                      //   })
+                      this.$router.go(-1)
+                    })
                 })
-            })
-            .catch(() => {
-              return false
-            })
-        }
+                .catch(() => {
+                  return false
+                })
+            } else if (this.switchType == 3) {
+              this.$confirm('确定修改客户信息？', '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning',
+                })
+                .then(() => {
+                  CustomerEdit(this.customerList)
+                    .toPromise()
+                    .then((response) => {
+                      this.$message.success('修改成功')
+                      this.$router.push({
+                        path: 'customerManagement'
+                      })
+                    })
+                })
+                .catch(() => {
+                  return false
+                })
+            }
+          })
       },
       getList(ids) {
         getCustomerLook({
@@ -416,10 +401,10 @@
             this.bank = this.customerList.payeeAddressUrl.split(',')
             // this.bankImgUp[0].url = this.bank[0]
             // this.bankImgLow[0].url = this.bank[1]
-            this.imageUrl1=this.identity[0]
-                this.imageUrl2=this.identity[1]
-                    this.imageUrl3=this.bank[0]
-                        this.imageUrl4=this.bank[1]
+            this.imageUrl1 = this.identity[0]
+            this.imageUrl2 = this.identity[1]
+            this.imageUrl3 = this.bank[0]
+            this.imageUrl4 = this.bank[1]
           })
       },
     },
@@ -441,9 +426,11 @@
   .avatar-uploader4 {
     background: url('../../../public/img/banklow.png');
   }
-/deep/.el-upload{
-  height: 200px;
-}
+
+  /deep/.el-upload {
+    height: 200px;
+  }
+
   .avatar-uploader {
     background-size: 100% 100%;
   }
@@ -470,8 +457,8 @@
   }
 
   .avatar {
-      width: 330px;
-      height: 103%;
+    width: 330px;
+    height: 103%;
     display: block;
   }
 
@@ -571,4 +558,8 @@
   .unload-img {
     margin: 20px 0;
   }
+
+  .veriCode {
+    margin-right: 20px;
+  }
 </style>

src/views/houseSelfCollect/inspectInfo.vue

@@ -590,7 +590,8 @@
           })
         //客户
         getcustomer({
-            compId: sessionStorage.getItem('ws-pf_compId')
+            compId: sessionStorage.getItem('ws-pf_compId'),
+            authenticationStatusKey:7
           })
           .toPromise()
           .then((response) => {

src/views/houseSelfCollect/inspectionManagement.vue

@@ -249,6 +249,8 @@ export default {
         pageSize: this.pageSize,
         searchKeyWord: (this.searchKeyWord).toUpperCase(),
         warehouseName: this.warehouseName,
+        managementType:1
+        
       })
         .toPromise()
         .then((response) => {

src/views/houseSelfCollect/weighingManagement.vue

@@ -268,6 +268,7 @@ export default {
         pageSize: this.pageSize,
         searchKeyWord: this.searchKeyWord,
         warehouseName: this.warehouseName,
+        managementType:1
       })
         .toPromise()
         .then((response) => {

src/views/outboundManagement/weighing.vue

@@ -56,8 +56,7 @@
 							<ws-input v-model="weighingList.tare" placeholder="未获取到皮重" maxlength="100" size="small"
 								disabled />
 						</ws-form-item>
-
-						<el-button type="primary" v-if="this.types == 2 || this.types == 3">重新获取</el-button>
+						<el-button type="primary" v-if="this.types == 2 || this.types == null">重新获取</el-button>
 						<!-- <div class="formItem"> -->
 							<ws-form-item label="净重（公斤）" span="1" prop="netWeight" v-if="this.types == 1">
 								<ws-input v-model="weighingList.netWeight" placeholder="请输入净重" maxlength="100"
@@ -68,7 +67,7 @@
 							<el-form-item label="上传磅单" v-if="this.types == 1">
 							</el-form-item>
 							<el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
-								:on-success="handlePictureCardPreview1" :on-remove="handleRemove" class="photo2"
+								:on-success="(res, file) => {handlePictureCardPreview1(res)}" :on-remove="(value) => {handleRemove(value)}" class="photo2"
 								v-if="this.types == 1">
 								<i class="el-icon-plus"></i>
 							</el-upload>
@@ -106,6 +105,7 @@
 					storageNumber: '',
 					buckleMiscellaneous: 0,
 					compId: sessionStorage.getItem('ws-pf_compId'),
+					warehouseName: '',
 				},
 				disabled: false,
 				disabled1: false,
@@ -163,7 +163,8 @@
 				}
 			},
 			handlePictureCardPreview1(file) {
-				this.weighingList.addressUrl = file.url
+				this.weighingList.addressUrl += file.url + ','
+				this.addressUrls.push(file.url)
 			},
 			cancel() {
 				this.weighingList = {}
@@ -261,7 +262,7 @@
 								})
 						} else if (this.types == null) {
 							this.weighingList.warehouseId = this.warehouseId
-							tareAdd(this.weighingList)
+							tareAdd(this.weighingList,this.warehouseName)
 								.toPromise()
 								.then((response) => {
 									this.$notify.success({

src/views/outboundManagement/weighingManagement.vue

@@ -39,22 +39,19 @@
 			<el-table-column prop="storageNumber" label="囤位号"></el-table-column>
 			<el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
 			<el-table-column prop="grossDate" label="称重时间">
-				<!-- <template slot-scope="scope">
-          		<span v-if="scope.row.grossDate == null">
+				<template slot-scope="scope">
+				{{scope.row.grossDate}}
+				<span v-if="scope.row.grossDate == null">
             		{{scope.row.tareDate}}
           		</span>
-        	</template> -->
+				</template>
 			</el-table-column>
 			<el-table-column prop="addressUrl" label="附件">
 				<template slot-scope="scope">
 					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 						src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
 					<span v-if="scope.row.addressUrlArray != null">
-						{{
-              scope.row.addressUrlArray.length == 0
-                ? ''
-                : scope.row.addressUrlArray.length
-            }}
+						{{scope.row.addressUrlArray.length == 0? '': scope.row.addressUrlArray.length}}
 					</span>
 				</template>
 			</el-table-column>
@@ -75,8 +72,10 @@
 		</div>
 		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
 			@on-cancel="handleClose">
-			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+			<p>查看附件</p>
+			<div style="display: inline-block; margin: 5px" v-for="item in appendixIdss">
+				<img width="100" height="100" :src="item" alt="" />
+			</div>
 		</WinseaContentModal>
 	</div>
 </template>
@@ -91,7 +90,6 @@
 	} from 'base-core-lib'
 	import WsUpload from '@/components/WsUpload'
 	export default {
-
 		components: {
 			WsUpload,
 		},
@@ -114,6 +112,7 @@
 				warehouseId: '',
 				accessoryTFs: false,
 				appendixIdss: [],
+				addressUrls: [],
 				compId: sessionStorage.getItem('ws-pf_compId'),
 			}
 		},
@@ -235,11 +234,11 @@
 							}
 						}
 						for (var i = 0; i < response.records.length; i++) {
-							var arr = new Array() 
-							this.addressUrls[i] = new Array() 
+							var arr = new Array()
+							this.addressUrls[i] = new Array()
 							if (this.weighingList.records[i].addressUrl !=
 								null) {
-								arr = this.weighingList.records[i].addressUrl.split(',') 
+								arr = this.weighingList.records[i].addressUrl.split(',')
 								this.addressUrls[i] = arr
 							}
 						}
@@ -258,7 +257,7 @@
 				} else {
 					this.accessoryTFs = true
 				}
-				this.appendixIdss = row.addressUrl
+				this.appendixIdss = row.addressUrlArray
 			},
 			handleClose() {
 				this.dialogViewSpareMoney = false