Merge branch 'dev1.0.1' of http://192.168.0.200:3000/suf/factoring-trade-front-end-v2 into dev1.0.1

src/router/moudules/tradeManagement.js

@@ -129,7 +129,7 @@ export default {
           meta: { title: '变更审核' }
         },
         {
-          path: '/purchaseContractManagement/changeContractReview/:id',
+          path: '/purchaseContractManagement/purchaseContractDetail/:id',
           name: 'PurchaseContractDetail',
           component: () => import('@/views/purchaseContractManagement/detail'),
           hidden: true,

src/views/acceptanceManagement/components/historyViewContent/add.vue

@@ -25,7 +25,7 @@
         <el-input :value="ruleForm.businessNumber" disabled />
       </el-form-item>
       <el-form-item label="预估结算日期" prop="expectedSettlementDate">
-        <el-date-picker v-model="ruleForm.expectedSettlementDate" value-format="yyyy-MM-dd" type="date" placeholder="选择预估结算日期"  style="width: 100%;" disabled />
+        <el-date-picker v-model="ruleForm.expectedSettlementDate" value-format="yyyy-MM-dd" type="date" placeholder="选择预估结算日期" style="width: 100%;" disabled />
       </el-form-item>
 
       <!-- 签署确认 -->
@@ -289,7 +289,8 @@ export default {
             supplier,
             acceptancePersonInfoHistories,
             supplementFiles,
-            fileStorage
+            fileStorage,
+            approval
           } = JSON.parse(JSON.stringify(newV))
 
           this.ruleForm = {
@@ -304,7 +305,8 @@ export default {
             checkOperatorEnterpriseContact,
             steelWaiter,
             sellBillNumber,
-            additionalRemarks
+            additionalRemarks,
+            approval
           }
           const { projectName } = businessBasicInfo
           const { corporateName } = customer
@@ -316,7 +318,7 @@ export default {
           this.ruleForm.coreEnterpriseName = corporateName
           this.ruleForm.platformName = platformName
           this.ruleForm.projectName = projectName
-          this.ruleForm.approval = 1
+          // this.ruleForm.approval = approval
 
           this.goodsInfoList = acceptanceBusinessGoods
           acceptancePersonInfoHistories.map(item => {

src/views/creditManage/projectCredit/dueReview/components/Company/Auditing.vue

@@ -39,6 +39,7 @@
         <el-select v-model="ruleForm.holdingRatio" placeholder="请选择国有控股比例" :disabled="disabled">
           <el-option
             v-for="item in holdingRatioList"
+            v-show="item.code !== 'holdingRatio_4' && item.code!== 'holdingRatio_5' && item.code!== 'holdingRatio_6'"
             :key="item.code"
             :label="item.name"
             :value="item.code"
@@ -59,6 +60,7 @@
         <el-select v-model="ruleForm.equityHierarchyDetail" placeholder="请选择股权层级" :disabled="disabled">
           <el-option
             v-for="item in equityHierarchyDetailList"
+            v-show="item.code !== 'equityHierarchyDetail_2_F'"
             :key="item.code"
             :label="item.name"
             :value="item.code"

src/views/divideAccountsManage/edit.vue

@@ -439,11 +439,11 @@ export default {
         {
           label: '操作',
           width: '100',
-          show: !this.disabled,
           render: (h, row, index) => {
-            const btnList = [
-              { msg: '删除', icon: 'el-icon-delete', category: 'delete' }
-            ]
+            const btnList = []
+            if (!this.disabled) {
+              btnList.push({ msg: '删除', icon: 'el-icon-delete', category: 'delete' })
+            }
             if (row.contractNo && row.quotaDisburseBatch) {
               btnList.unshift({ msg: '查看放款计划', icon: 'iconfont icon-Magnifier', category: 'see' })
             }
@@ -607,7 +607,7 @@ export default {
       })
     },
     submit(type) {
-      const params = {
+      var params = {
         Loading: true,
         ledgerAccountBasicInfo: {
           ...this.ledgerAccountBasicInfo,
@@ -621,6 +621,7 @@ export default {
         this.$refs.ruleForm.validate((valid) => {
           if (valid) {
             this.oneCalc('click').then(() => {
+              params.goodsAssignList = this.loanTableData
               accountSubmit(params).then(() => {
                 this.$message.success('提交成功')
                 this.$router.go(-1)

src/views/financingManage/limitExpenditure/components/RevenueExpenditurePlan.vue

@@ -6,6 +6,7 @@
       :columns="columns"
       :data="tableData"
       :count="0"
+      row-key="index"
     />
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" label-position="top" class="rule-form-orange">
       <el-form-item label="预期IRR" prop="planIrrStr" style="width: 100%">
@@ -151,7 +152,8 @@ export default {
         if (newV && Object.keys(newV).length) {
           const list = JSON.parse(JSON.stringify(newV.incomeExpenditurePlanList))
           replaceNull(list)
-          this.tableData = list
+          this.tableData = JSON.parse(JSON.stringify(list)) 
+          this.handlerTable()
           this.ruleForm.planIrrStr = newV.planIrrStr
         }
       },
@@ -175,12 +177,22 @@ export default {
           receivingSubject: '',
           currency: ''
         })
+        this.handlerTable()
       } else if (type === 'delete') {
         this.tableData.splice(index, 1)
       }
     },
+    handlerTable() {
+      this.tableData = this.tableData.map((item, index) => {
+        item.index = index
+        return item
+      })
+    },
     getParams() {
-      return this.tableData
+      return this.tableData.map(item => {
+        delete item.index
+        return item
+      })
     }
   }
 }

src/views/financingManage/limitExpenditure/components/TripartiteAgreement.vue

@@ -197,7 +197,6 @@ export default {
       handler(newV) {
         if (newV === undefined) return
         const { reviewBasicContractList } = JSON.parse(JSON.stringify(newV))
-        console.log(reviewBasicContractList, 888)
         this.tableData = reviewBasicContractList
       },
       immediate: true,

src/views/financingManage/limitExpenditure/mainContent.vue

@@ -190,7 +190,7 @@ export default {
         }
         this.expenditurePlanData = {
           incomeExpenditurePlanList: this.ruleForm.incomeExpenditurePlanList || [],
-          planIrrStr: this.ruleForm.planIrrStr
+          planIrrStr: this.ruleForm.planIrrStr  
         }
         this.formKey += 1
       })
@@ -279,10 +279,13 @@ export default {
           this.$router.go(-1)
         })
       } else {
-        await this.automaticGeneration()
+        const data = await this.getParams(type)
+        if(data.incomeExpenditurePlanList && data.incomeExpenditurePlanList.length) {
+          await this.automaticGeneration()
+        }
         this.$refs.ruleForm.validate(async(valid) => {
           if (valid) {
-            const data = await this.getParams(type)
+            
             data.visible = type !== 'temp'
             setTimeout(() => {
               reviewQuotaDisburseSubmit(data).then(() => {

src/views/purchaseContractManagement/changeContractReview.vue

@@ -78,7 +78,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'PurchContract', Loading: true }
+        params: { businessKey: this.$route.query.infoId, businessType: 'PurchContract', Loading: true }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {

src/views/purchaseContractManagement/detail.vue

@@ -60,7 +60,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'PurchContract', Loading: true }
+        params: { businessKey: this.$route.query.infoId, businessType: 'PurchContract', Loading: true }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {

src/views/purchaseContractManagement/index.vue

@@ -133,7 +133,10 @@ export default {
       if(type == 'see') {
         this.$router.push({
           name: 'PurchaseContractDetail',
-          params: { id: 'children', infoId: row.id, taskId: row.taskId }
+          params: { id: 'children', infoId: row.id, taskId: row.taskId },
+          query: {
+            infoId: row.id, taskId: row.taskId
+          }
         })
         // this.$router.push({
         //   name: 'PurchaseContractReview',
@@ -161,20 +164,27 @@ export default {
       if (row.taskName === '采购合同审核') {
         this.$router.push({
           name: 'PurchaseContractReview',
-          params: { id: 'children', infoId: row.id, taskId: row.taskId }
+          params: { id: 'children', infoId: row.id, taskId: row.taskId },
+          query: {
+            infoId: row.id, taskId: row.taskId
+          }
         })
       } else if (row.taskName === '采购合同终审' || row.taskName == '采购合同变更终审') {
         this.$router.push({
           name: 'PurchaseContractSignReview',
           params: { id: 'children', infoId: row.id, taskId: row.taskId, isChange: row.taskName == '采购合同变更终审' },
           query: { 
-            isChange: row.taskName == '采购合同变更终审'
+            isChange: row.taskName == '采购合同变更终审',
+            infoId: row.id, taskId: row.taskId
           }
         })
       } else if (row.taskName.includes('合同变更审核')) {
         this.$router.push({
           name: 'PurchaseContractChangeReview',
-          params: { id: 'children', infoId: row.id, taskId: row.taskId }
+          params: { id: 'children', infoId: row.id, taskId: row.taskId },
+          query: {
+            infoId: row.id, taskId: row.taskId
+          }
         })
       }
     },

src/views/purchaseContractManagement/prequalification.vue

@@ -77,7 +77,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'PurchContract', Loading: true }
+        params: { businessKey: this.$route.query.infoId, businessType: 'PurchContract', Loading: true }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {

src/views/purchaseContractManagement/purchaseContractReview.vue

@@ -79,7 +79,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'PurchContract', Loading: true }
+        params: { businessKey: this.$route.query.infoId, businessType: 'PurchContract', Loading: true }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {
@@ -109,7 +109,7 @@ export default {
       })
     },
     getParamas() {
-      let data = { taskId: this.$route.params.taskId, businessKey: this.$route.params.infoId, ...this.$refs.auditInfo.ruleForm }
+      let data = { taskId: this.$route.query.taskId, businessKey: this.$route.query.infoId, ...this.$refs.auditInfo.ruleForm }
       return data
     },
     submit(type) {

src/views/purchaseContractManagement/signReview.vue

@@ -78,7 +78,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'PurchContract', Loading: true }
+        params: { businessKey: this.$route.query.infoId, businessType: 'PurchContract', Loading: true }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {
@@ -93,11 +93,11 @@ export default {
     },
     submit(data) {
       // this.isLoading = true
-      data.businessKey = this.$route.params.infoId
-      data.taskId = this.$route.params.taskId
+      data.businessKey = this.$route.query.infoId
+      data.taskId = this.$route.query.taskId
       data.Loading = true
       request({
-        url: this.$route.params.isChange || this.$route.query.isChange ? '/purchContract/change/final/sign/audit' : '/purchContract/final/approval/doAudit',
+        url: this.$route.query.isChange || this.$route.query.isChange ? '/purchContract/change/final/sign/audit' : '/purchContract/final/approval/doAudit',
         method: 'post',
         data
       }).then(() => {

src/views/settlementManagement/detail.vue

@@ -52,7 +52,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'BillBasicInformation' }
+        params: { businessKey: this.$route.query.infoId, businessType: 'BillBasicInformation' }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {

src/views/settlementManagement/edit.vue

@@ -27,7 +27,7 @@
       </div>
       <div slot="bar">
         <div>
-          {{ $route.params.type.includes('单价变更') ? '单价调整审核' : '结算单审核' }}
+          {{ $route.query.type.includes('单价变更') ? '单价调整审核' : '结算单审核' }}
         </div>
       </div>
       <div slot="bottom">
@@ -112,7 +112,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'BillBasicInformation' }
+        params: { businessKey: this.$route.query.infoId, businessType: 'BillBasicInformation' }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {
@@ -130,8 +130,8 @@ export default {
         url: '/bill/approval',
         method: 'get',
         params: {
-          taskId: this.$route.params.taskId,
-          businessKey: this.$route.params.infoId
+          taskId: this.$route.query.taskId,
+          businessKey: this.$route.query.infoId
         }
       }).then(({ data: { file } }) => {
         this.file = file ? [...file] : []
@@ -140,8 +140,8 @@ export default {
     submit() {
       this.isLoading = true
       let data = new FormData()
-      data.append('taskId', this.$route.params.taskId)
-      data.append('settlementBasicInfoId', this.$route.params.infoId)
+      data.append('taskId', this.$route.query.taskId)
+      data.append('settlementBasicInfoId', this.$route.query.infoId)
       data.append('approvalComment', this.ruleForm.approvalComment)
       data.append('approvalConclusion', this.ruleForm.approvalConclusion)
       request({

src/views/settlementManagement/index.vue

@@ -140,7 +140,10 @@ export default {
       if(type == 'edit') {
         this.$router.push({
           name: 'SettlementEdit',
-          params: { id: 'child', infoId: row.id, taskId: row.taskId, type: row.taskName }
+          params: { id: 'child', infoId: row.id, taskId: row.taskId, type: row.taskName },
+          query: {
+            infoId: row.id, taskId: row.taskId, type: row.taskName
+          }
         })
       } else if(type == 'timeAxis') {
         this.timeAxisClick(row)
@@ -169,7 +172,10 @@ export default {
       } else {
         this.$router.push({
           name: 'SettlementView',
-          params: { id: 'child', infoId: row.id, taskId: row.taskId, type: row.taskName }
+          params: { id: 'child', infoId: row.id, taskId: row.taskId, type: row.taskName },
+          query: {
+            infoId: row.id, taskId: row.taskId, type: row.taskName
+          }
         })
       }
     },

src/views/userManagement/indexTable.js

@@ -28,7 +28,7 @@ export default {
         label: '用户名称',
         showTooltip: true,
         width: '100',
-        prop: 'userName'
+        prop: 'loginName'
       },
       {
         label: '登录手机号码',