bug修复

src/pages/manage/list/agent/electricRate.vue

@@ -19,7 +19,7 @@
             </div>
           </el-form-item>
 
-          <el-form-item label="缴费单位" required>
+          <el-form-item label="缴费单位" prop="paymentUnit">
             <el-input v-model="form.paymentUnit" />
           </el-form-item>
         </el-col>
@@ -37,7 +37,7 @@
               @input="(val) => checkName(val, form, 'customerName')"></el-input>
           </el-form-item>
 
-          <el-form-item label="户号" required>
+          <el-form-item label="户号" prop="houseId">
             <el-input v-model="form.houseId" />
           </el-form-item>
         </el-col>
@@ -48,7 +48,7 @@
         </el-col>
         <el-col :span="10" :offset="1">
           <el-form-item label="缴费金额" prop="paymentMoney">
-            <el-input :value="form.paymentMoney" maxlength="15"
+            <el-input v-model="form.paymentMoney" maxlength="15"
               @input="val => ismoney(val, form, 'paymentMoney')"></el-input>
           </el-form-item>
           <el-form-item label="支取密码" required>
@@ -198,7 +198,7 @@ export default {
             trigger: 'blur'
           }
         ],
-        extendDepomonthlyWithholdingsitTarget: [
+        monthlyWithholding: [
           {
             required: true,
             message: '请选择每月代扣',

src/pages/manage/list/agent/telRate.vue

@@ -25,7 +25,7 @@
           <el-form-item label="缴费号码" prop="paymentNum">
             <el-input v-model="form.paymentNum" maxlength="30"></el-input>
           </el-form-item>
-          <el-form-item label="每月代扣" prop="monthlyWithholding" required>
+          <el-form-item label="每月代扣" prop="monthlyWithholding">
             <el-radio-group v-model.trim="form.monthlyWithholding">
               <el-radio :label="142">是</el-radio>
               <el-radio :label="143">否</el-radio>
@@ -191,7 +191,7 @@ export default {
             trigger: 'blur'
           }
         ],
-        extendDepomonthlyWithholdingsitTarget: [
+        monthlyWithholding: [
           {
             required: true,
             message: '请选择每月代扣',
@@ -321,7 +321,7 @@ export default {
         return
       }
       if (!this.form.voucherNumber) {
-        messageCard('请填写凭证号码')
+        messageCard('请填写账号')
         return
       }
 

src/pages/manage/list/agent/waterRate.vue

@@ -49,10 +49,10 @@
               @input="(val) => checkName(val, form, 'customerName')"></el-input>
           </el-form-item>
 
-          <el-form-item label="户号" required>
+          <el-form-item label="户号" prop="houseId">
             <el-input v-model="form.houseId" />
           </el-form-item>
-          <el-form-item label="每月代扣" prop="monthlyWithholding" required>
+          <el-form-item label="每月代扣" prop="monthlyWithholding">
             <el-radio-group v-model.trim="form.monthlyWithholding">
               <el-radio :label="142">是</el-radio>
               <el-radio :label="143">否</el-radio>
@@ -177,7 +177,7 @@ export default {
             trigger: 'blur'
           }
         ],
-        extendDepomonthlyWithholdingsitTarget: [
+        monthlyWithholding: [
           {
             required: true,
             message: '请选择每月代扣',

src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue

@@ -86,7 +86,7 @@
     </el-row>
 
     <div class="text-center m-t-20">
-      <el-button @click="$history.back()" v-throttle>返回</el-button>
+      <el-button @click="$router.back()" v-throttle>返回</el-button>
       <el-button @click="next" type="primary" class="submitBtn" v-throttle>下一步</el-button>
     </div>
   </div>

src/pages/manage/list/corporateLoans/detail.vue

@@ -129,7 +129,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="贷款期限" prop="loanTerm">
-            <el-select v-model="bankLoanApplication.loanTerm" placeholder="请选择" @change="maturityDateCalc">
+            <el-select v-model="bankLoanApplication.loanTerm" placeholder="请选择">
               <el-option v-for="(item, i) in Util.loanTerms" :key="i" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -244,21 +244,25 @@ export default {
     // 放款
     async loanSubmit () {
       if (!this.loanDate) return this.$message.error('请选择放款日期！')
-      const { data } = await loanDisbursement({
-        companyLoanId: this.id,
-        loanDate: this.loanDate,
-      })
+      try {
+        const { data } = await loanDisbursement({
+          companyLoanId: this.id,
+          loanDate: this.loanDate,
+        })
 
-      const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,768'
-      await addOperation({
-        parentId: preId,
-        lcJudgmentRuleReq: [{ answerId: 838, emptyOne: '', emptyTwo: '', operationIds: preId + ',838', type: '' },],
-        projectId: +sessionStorage.getItem('projectId'),
-        startTime: sessionStorage.getItem('startTime')
-      })
-      this.$message[data.status === 200 ? 'success' : 'error'](data.message)
-      this.loanVisible = false
-      this.getDetail()
+        this.$message[data.status === 200 ? 'success' : 'error'](data.message)
+        if (data.status === 200) {
+          const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,768'
+          await addOperation({
+            parentId: preId,
+            lcJudgmentRuleReq: [{ answerId: 838, emptyOne: '', emptyTwo: '', operationIds: preId + ',838', type: '' },],
+            projectId: +sessionStorage.getItem('projectId'),
+            startTime: sessionStorage.getItem('startTime')
+          })
+          this.loanVisible = false
+          this.getDetail()
+        }
+      } catch (e) { }
     },
   },
 }

src/pages/manage/list/corporateLoans/loan.vue

@@ -12,7 +12,9 @@
       <el-table-column prop="applicationNumber" label="贷款编号" align="center" />
       <el-table-column prop="loanDate" label="放款日期" align="center" />
       <el-table-column prop="loanAmount" label="贷款金额(万)" align="center" />
-      <el-table-column prop="loanAmount" label="放款金额(万)" align="center" />
+      <el-table-column prop="loanAmount" label="放款金额(万)" align="center">
+        <template slot-scope="scope">{{ scope.row.loanDate ? scope.row.loanAmount : '' }}</template>
+      </el-table-column>
       <el-table-column prop="loanAmount" label="放款状态" align="center">
         <template slot-scope="scope">{{ scope.row.loanDate ? '已放款' : '待放款' }}</template>
       </el-table-column>

src/pages/manage/list/foreignExchange/puchasing.vue

@@ -30,8 +30,8 @@
           </el-form-item>
           <el-form-item label="钞汇" prop="goldLogo">
             <el-select v-model.trim="form.goldLogo" placeholder="请选择" ref="goldLogo">
-              <el-option v-for="item in getSelectList.banknoteRemittanceList" :label="item.options" :value="item.itemId"
-                :key="item.itemId"> </el-option>
+              <el-option v-for="item in goldLogos" :label="item.options" :value="item.itemId" :key="item.itemId">
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="购汇用途" prop="buyForeignPurpose">
@@ -93,7 +93,6 @@ export default {
     if (sessionStorage.getItem('foreignExchangePuchasingBankCard')) {
       this.cardNumberJudge = true
       const { voucherNumber, goldLogo } = this.dataFlow
-      this.form.goldLogo = goldLogo
       this.form.voucherNumber = voucherNumber
     }
 
@@ -150,6 +149,16 @@ export default {
           }
         ],
       },
+      goldLogos: [
+        {
+          itemId: 150,
+          options: '现汇（参考牌价712.34）'
+        },
+        {
+          itemId: 151,
+          options: '现钞（参考牌价712.34）'
+        },
+      ],
       submited: 0
     }
   },

src/pages/manage/list/personalLoans/detail.vue

@@ -62,7 +62,9 @@
         </el-col>
         <el-col :span="10" :offset="1">
           <el-form-item label="薪酬">
-            <el-input v-model="basicForm.salary" />
+            <el-input v-model="basicForm.salary">
+              <template slot="append">万/年</template>
+            </el-input>
           </el-form-item>
           <el-form-item label="工龄">
             <el-input v-model="basicForm.totalWorkYears" />
@@ -120,7 +122,7 @@
           </el-form-item>
           <el-form-item label="起息日期" prop="interestStartDate">
             <el-date-picker v-model="form.interestStartDate" type="date" placeholder="选择日期" format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd" @change="maturityDateCalc"></el-date-picker>
+              value-format="yyyy-MM-dd" :clearable="false" @change="maturityDateCalc"></el-date-picker>
           </el-form-item>
           <el-form-item label="计息方式">
             <el-input value="按年浮动计息" disabled />
@@ -435,8 +437,19 @@ export default {
       if (this.id) {
         // 查看及展期
         const { data } = await personalBasicFind(this.id)
-        this.basicForm = data.data
-        if (data.data.bankPersonalLoanContractInfo) this.form = data.data.bankPersonalLoanContractInfo
+        const form = data.data
+        if (form.idType) form.idType = +form.idType
+        if (form.gender) form.gender = +form.gender
+        this.idNumberJudge = true
+        this.basicForm = form
+
+        // 贷款合同
+
+        const contract = data.data.bankPersonalLoanContractInfo
+        if (contract) {
+          if (contract.loanTerm) contract.loanTerm = +contract.loanTerm
+          this.form = contract
+        }
       } else if (sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) {
         // 新增
         sessionStorage.removeItem('nomUsefulPhrasesOpenCard2')
@@ -496,44 +509,46 @@ export default {
               ...basicForm,
             })
 
-            // 判分
-            const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767'
-            const rule = [
-              { answerId: 847, emptyOne: 125, emptyTwo: basicForm.phoneNumber, operationIds: preId + ',847', type: 3 },
-              { answerId: 859, emptyOne: 125, emptyTwo: basicForm.applicationDate, operationIds: preId + ',859', type: 3 },
-            ]
+            if (data.status === 200) {
+              // 判分
+              const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767'
+              const rule = [
+                { answerId: 847, emptyOne: 125, emptyTwo: basicForm.phoneNumber, operationIds: preId + ',847', type: 3 },
+                { answerId: 859, emptyOne: 125, emptyTwo: basicForm.applicationDate, operationIds: preId + ',859', type: 3 },
+              ]
 
-            basicForm.position && rule.push({ answerId: 848, emptyOne: 125, emptyTwo: basicForm.position, operationIds: preId + ',848', type: 3 })
-            basicForm.salary && rule.push({ answerId: 849, emptyOne: 125, emptyTwo: basicForm.salary, operationIds: preId + ',849', type: 3 })
-            basicForm.currentWorkYears && rule.push({ answerId: 850, emptyOne: 125, emptyTwo: basicForm.currentWorkYears, operationIds: preId + ',850', type: 3 })
-            basicForm.totalWorkYears && rule.push({ answerId: 851, emptyOne: 125, emptyTwo: basicForm.totalWorkYears, operationIds: preId + ',851', type: 3 })
-            basicForm.propertyOwner && rule.push({ answerId: 852, emptyOne: 125, emptyTwo: basicForm.propertyOwner, operationIds: preId + ',852', type: 3 })
-            basicForm.propertyCertificateNo && rule.push({ answerId: 853, emptyOne: 125, emptyTwo: basicForm.propertyCertificateNo, operationIds: preId + ',853', type: 3 })
-            basicForm.coOwnership && rule.push({ answerId: 854, emptyOne: 125, emptyTwo: basicForm.coOwnership, operationIds: preId + ',854', type: 3 })
-            basicForm.location && rule.push({ answerId: 855, emptyOne: 125, emptyTwo: basicForm.location, operationIds: preId + ',855', type: 3 })
-            basicForm.propertyRightNature && rule.push({ answerId: 856, emptyOne: 125, emptyTwo: basicForm.propertyRightNature, operationIds: preId + ',856', type: 3 })
-            basicForm.area && rule.push({ answerId: 857, emptyOne: 125, emptyTwo: basicForm.area, operationIds: preId + ',857', type: 3 })
-            basicForm.usagePeriod && rule.push({ answerId: 858, emptyOne: 125, emptyTwo: basicForm.usagePeriod, operationIds: preId + ',858', type: 3 })
-            await addOperation({
-              parentId: preId,
-              lcJudgmentRuleReq: rule,
-              projectId: +sessionStorage.getItem('projectId'),
-              startTime: sessionStorage.getItem('startTime')
-            })
+              basicForm.position && rule.push({ answerId: 848, emptyOne: 125, emptyTwo: basicForm.position, operationIds: preId + ',848', type: 3 })
+              basicForm.salary && rule.push({ answerId: 849, emptyOne: 125, emptyTwo: basicForm.salary, operationIds: preId + ',849', type: 3 })
+              basicForm.currentWorkYears && rule.push({ answerId: 850, emptyOne: 125, emptyTwo: basicForm.currentWorkYears, operationIds: preId + ',850', type: 3 })
+              basicForm.totalWorkYears && rule.push({ answerId: 851, emptyOne: 125, emptyTwo: basicForm.totalWorkYears, operationIds: preId + ',851', type: 3 })
+              basicForm.propertyOwner && rule.push({ answerId: 852, emptyOne: 125, emptyTwo: basicForm.propertyOwner, operationIds: preId + ',852', type: 3 })
+              basicForm.propertyCertificateNo && rule.push({ answerId: 853, emptyOne: 125, emptyTwo: basicForm.propertyCertificateNo, operationIds: preId + ',853', type: 3 })
+              basicForm.coOwnership && rule.push({ answerId: 854, emptyOne: 125, emptyTwo: basicForm.coOwnership, operationIds: preId + ',854', type: 3 })
+              basicForm.location && rule.push({ answerId: 855, emptyOne: 125, emptyTwo: basicForm.location, operationIds: preId + ',855', type: 3 })
+              basicForm.propertyRightNature && rule.push({ answerId: 856, emptyOne: 125, emptyTwo: basicForm.propertyRightNature, operationIds: preId + ',856', type: 3 })
+              basicForm.area && rule.push({ answerId: 857, emptyOne: 125, emptyTwo: basicForm.area, operationIds: preId + ',857', type: 3 })
+              basicForm.usagePeriod && rule.push({ answerId: 858, emptyOne: 125, emptyTwo: basicForm.usagePeriod, operationIds: preId + ',858', type: 3 })
+              await addOperation({
+                parentId: preId,
+                lcJudgmentRuleReq: rule,
+                projectId: +sessionStorage.getItem('projectId'),
+                startTime: sessionStorage.getItem('startTime')
+              })
 
-            this.setCreditIds({
-              personalLoanId: data.personalLoanId,
-              applicationDate: data.applicationDate || this.form.applicationDate,
-              contractNo: data.contractNo || this.form.contractNo,
-            })
-            if (data.contractNo) this.form.contractNo = data.contractNo
-            this.curStep++
+              this.setCreditIds({
+                personalLoanId: data.personalLoanId,
+                applicationDate: data.applicationDate || this.form.applicationDate,
+                contractNo: data.contractNo || this.form.contractNo,
+              })
+              if (data.contractNo) this.form.contractNo = data.contractNo
+              this.curStep++
+            }
           } catch { (e) => { } }
         }, this.$refs))
       } else {
         // 合同信息校验
+        if (!this.form.contractAmount) return this.$message.warning('请输入合同金额！')
         this.$refs.form.validate(myValidate(() => {
-          // this.visible = true
           this.saveContract()
         }, this.$refs))
       }
@@ -549,23 +564,27 @@ export default {
           ...form,
         })
 
-        // 判分
-        const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767'
-        const rule = [
-          { answerId: 860, emptyOne: 125, emptyTwo: form.contractAmount, operationIds: preId + ',860', type: 3 },
-          { answerId: 861, emptyOne: 141, emptyTwo: this.loanTerms.find(e => e.id === form.loanTerm).pointId, operationIds: preId + ',861', type: 1 },
-          { answerId: 862, emptyOne: 125, emptyTwo: form.interestStartDate, operationIds: preId + ',862', type: 3 },
-          { answerId: 863, emptyOne: 125, emptyTwo: form.repaymentMethod, operationIds: preId + ',863', type: 3 },
-          { answerId: 864, emptyOne: 125, emptyTwo: form.repaymentAccount, operationIds: preId + ',864', type: 3 },
-        ]
-        await addOperation({
-          parentId: preId,
-          lcJudgmentRuleReq: rule,
-          projectId: +sessionStorage.getItem('projectId'),
-          startTime: sessionStorage.getItem('startTime')
-        })
+        if (data.status === 200) {
+          // 判分
+          const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767'
+          const rule = [
+            { answerId: 860, emptyOne: 125, emptyTwo: form.contractAmount, operationIds: preId + ',860', type: 3 },
+            { answerId: 861, emptyOne: 141, emptyTwo: this.loanTerms.find(e => e.id === form.loanTerm).pointId, operationIds: preId + ',861', type: 1 },
+            { answerId: 862, emptyOne: 125, emptyTwo: form.interestStartDate, operationIds: preId + ',862', type: 3 },
+            { answerId: 863, emptyOne: 125, emptyTwo: form.repaymentMethod, operationIds: preId + ',863', type: 3 },
+            { answerId: 864, emptyOne: 125, emptyTwo: form.repaymentAccount, operationIds: preId + ',864', type: 3 },
+          ]
+          await addOperation({
+            parentId: preId,
+            lcJudgmentRuleReq: rule,
+            projectId: +sessionStorage.getItem('projectId'),
+            startTime: sessionStorage.getItem('startTime')
+          })
 
-        data.status === 200 ? this.$router.push('/counter/list/manage/personalLoans') : this.$message.error(data.message)
+          this.$router.push('/counter/list/manage/personalLoans')
+        } else {
+          this.$message.error(data.message)
+        }
       } catch { (e) => { } }
     },
     // 展示放款弹框
@@ -581,16 +600,18 @@ export default {
       })
       this.$message[data.status === 200 ? 'success' : 'error'](data.message)
 
-      // 判分
-      const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767'
-      await addOperation({
-        parentId: preId,
-        lcJudgmentRuleReq: [{ answerId: 865, emptyOne: '', emptyTwo: '', operationIds: preId + ',865', type: '' }],
-        projectId: +sessionStorage.getItem('projectId'),
-        startTime: sessionStorage.getItem('startTime')
-      })
+      if (data.status === 200) {
+        // 判分
+        const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767'
+        await addOperation({
+          parentId: preId,
+          lcJudgmentRuleReq: [{ answerId: 865, emptyOne: '', emptyTwo: '', operationIds: preId + ',865', type: '' }],
+          projectId: +sessionStorage.getItem('projectId'),
+          startTime: sessionStorage.getItem('startTime')
+        })
 
-      setTimeout(this.$router.push('/counter/list/manage/personalLoans'), 1500)
+        setTimeout(this.$router.push('/counter/list/manage/personalLoans'), 1500)
+      }
     },
 
     // 展示展期弹框
@@ -606,16 +627,18 @@ export default {
       })
       this.$message[data.status === 200 ? 'success' : 'error'](data.message)
 
-      // 判分
-      const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767'
-      await addOperation({
-        parentId: preId,
-        lcJudgmentRuleReq: [{ answerId: 866, emptyOne: '', emptyTwo: '', operationIds: preId + ',866', type: '' }],
-        projectId: +sessionStorage.getItem('projectId'),
-        startTime: sessionStorage.getItem('startTime')
-      })
+      if (data.status === 200) {
+        // 判分
+        const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',766,767'
+        await addOperation({
+          parentId: preId,
+          lcJudgmentRuleReq: [{ answerId: 866, emptyOne: '', emptyTwo: '', operationIds: preId + ',866', type: '' }],
+          projectId: +sessionStorage.getItem('projectId'),
+          startTime: sessionStorage.getItem('startTime')
+        })
 
-      setTimeout(this.$router.push('/counter/list/manage/personalLoans'), 1500)
+        setTimeout(this.$router.push('/counter/list/manage/personalLoans'), 1500)
+      }
     },
 
     phoneListen,

src/pages/manage/list/personalLoans/index.vue

@@ -25,7 +25,7 @@ export default {
   },
   data () {
     return {
-      text: '',/* 顶部文字 */
+      text: '全部',/* 顶部文字 */
       textObj: {
         '1': '全部',
         '2': '正常还款',

src/pages/manage/list/personalLoans/list.vue

@@ -39,7 +39,8 @@
             scope.row.contractNo !== '——' ? '查看' : '编辑'
           }}</el-button>
           <template v-if="scope.row.personalLoanId > 0">
-            <el-button v-if="!scope.row.renewalOrNot" @click="toDetail(scope.row, 2)" size="small">展期</el-button>
+            <el-button v-if="scope.row.disbursementDate !== '——' && !scope.row.renewalOrNot"
+              @click="toDetail(scope.row, 2)" size="small">展期</el-button>
             <el-button @click="repayment(scope.row)" size="small">还款计划</el-button>
           </template>
         </template>

src/store/modules/system.js

@@ -1510,7 +1510,6 @@ export default {
 
     // 下拉框的数据,在电脑中的下拉框有许多相同的，不用每次都请求服务器，可以在这里拿数据:
     selectList: {
-      banknoteRemittanceList: [],
       currencySelectList: [],
       goldLogoSelectList: [],
       accountQualitySelectList: [],
@@ -2837,7 +2836,6 @@ export default {
         76: 'isTranslate',
         40: 'outAccountWayList',
         39: 'calculateWayList',
-        119: 'banknoteRemittanceList',
         122: 'fundingSourceList',
         123: 'allCurrencyList',
         124: 'buyForeignPurposeList',