Browse Source

feat(验收单):验收单业务审核

sufan 7 months ago
parent
commit
e590cdd244

+ 0 - 1
src/views/myFinancing/applyFinancing/index.vue

@@ -508,7 +508,6 @@ export default {
     goodsSubmit() {
       const multipleList = this.$refs.goodsTable.multipleSelection
       const list = deduplicateArray(multipleList, 'signConfirm')
-
       if (!multipleList.length) {
         this.$message.warning('请选择已验收的货物')
         return

+ 15 - 15
src/views/mySettlement/divideAccountsManage/see.vue

@@ -255,7 +255,7 @@ export default {
           label: '是否计提(履约保证金)',
           prop: 'accrual',
           showTooltip: true,
-          width: '80',
+          width: '100',
           render: (h, row) => {
             return <el-select v-model={ row.accrual } disabled={this.disabled} onChange={() => { this.oneCalc('click') }} placeholder='请选择是否计提'>
               <el-option label='是' value={true}></el-option>
@@ -286,10 +286,10 @@ export default {
           }
         },
         {
-          label: '是否分配融资利息',
+          label: '是否分配融资利息和管理费',
           prop: 'hasAssignInterest',
           showTooltip: true,
-          width: '80',
+          width: '110',
           render: (h, row) => {
             return <el-select disabled={this.disabled} v-model={ row.hasAssignInterest } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
               <el-option label='是' value={true}></el-option>
@@ -307,18 +307,18 @@ export default {
             return <span> { this.handlerMoneyEmpty(row.financingInterest) }</span>
           }
         },
-        {
-          label: '是否分配管理费',
-          prop: 'hasAssignManagementFee',
-          showTooltip: true,
-          width: '80',
-          render: (h, row) => {
-            return <el-select disabled={this.disabled} v-model={ row.hasAssignManagementFee } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
-              <el-option label='是' value={true}></el-option>
-              <el-option label='否' value={false}></el-option>
-            </el-select>
-          }
-        },
+        // {
+        //   label: '是否分配管理费',
+        //   prop: 'hasAssignManagementFee',
+        //   showTooltip: true,
+        //   width: '80',
+        //   render: (h, row) => {
+        //     return <el-select disabled={this.disabled} v-model={ row.hasAssignManagementFee } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
+        //       <el-option label='是' value={true}></el-option>
+        //       <el-option label='否' value={false}></el-option>
+        //     </el-select>
+        //   }
+        // },
         {
           label: '融资管理费',
           prop: 'financingManagementFee',

+ 35 - 41
src/views/myTrade/acceptanceManagement/index.vue

@@ -1,50 +1,44 @@
 <template>
   <div class="acceptance-management">
     <template>
-      <div class="tempalte-content">
-        <div class="search">
-          <div class="left" />
-          <div class="right">
-            <template>
-              <div>
-                <el-input v-model="search.businessNumber" style="width: 250px" placeholder="请输入验收单编号/业务编号" clearable />
-              </div>
-              <div>
-                <el-select v-model="search.status" placeholder="请选择状态">
-                  <el-option
-                    v-for="item in constant.projectInitiationStatus"
-                    :key="item.code"
-                    :label="item.name"
-                    :value="item.code"
-                  />
-                </el-select>
-              </div>
-              <div>
-                <el-input v-model="search.fastSearch" style="width: 300px" placeholder="请输入项目名称/主企业名称/核心企业名称" clearable />
-              </div>
-              <div class="leftBtn">
-                <el-button type="primary" @click="fetchData">查询</el-button>
-              </div>
-              <div>
-                <el-button type="primary" icon="el-icon-plus" @click="modifyClick('create')">创建验收单</el-button>
-              </div>
-            </template>
+      <div class="search">
+        <div class="left" />
+        <div class="right">
+          <div>
+            <el-input v-model="search.businessNumber" placeholder="请输入验收单编号/业务编号" clearable />
+          </div>
+          <div>
+            <el-select v-model="search.status" placeholder="请选择状态">
+              <el-option
+                v-for="item in constant.projectInitiationStatus"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </div>
+          <div>
+            <el-input v-model="search.fastSearch" placeholder="请输入项目名称/主企业名称/核心企业名称" clearable />
+          </div>
+          <div class="right-btn">
+            <el-button type="primary" @click="fetchData">查询</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="modifyClick('create')">创建验收单</el-button>
           </div>
         </div>
-        <cy-comm-table
-          ref="commTable"
-          v-loading="loading"
-          :columns="columns"
-          :table-options="tableOptions"
-          :data="tableData"
-          :count="total"
-          parent-component="AcceptanceManagement"
-        />
       </div>
+      <cy-comm-table
+        ref="commTable"
+        v-loading="loading"
+        :columns="columns"
+        :table-options="tableOptions"
+        :data="tableData"
+        :count="total"
+        parent-component="AcceptanceManagement"
+      />
     </template>
 
-    <!-- 申请审核 -->
-    <cy-dialog ref="receiveDialog" title="申请审核">
+    <!-- 申请融资 -->
+    <cy-dialog ref="receiveDialog" title="申请融资">
       <p style="text-align: center;">确认申请验收单审核,完成后续融资流程么?</p>
       <div class="submit-btn">
         <el-button @click="$refs.receiveDialog.show = false">关闭</el-button>
@@ -124,9 +118,9 @@ export default {
               taskId: row.taskId
             }
           })
-        } else {
-          this.apply(row)
         }
+      } else if (type === 'apply') {
+        this.apply(row)
       }
 
       if (type === 'change') {

+ 10 - 3
src/views/myTrade/acceptanceManagement/indexTable.js

@@ -90,9 +90,9 @@ export default {
                 })
               } else {
                 btnList.push({
-                  msg: '申请审核',
+                  msg: '申请融资',
                   icon: 'iconfont icon-orange icon-a-Group8151',
-                  category: 'edit'
+                  category: 'apply'
                 })
               }
             } else if (row.status === '处理中') {
@@ -102,7 +102,14 @@ export default {
                 icon: 'iconfont icon-orange icon-a-Group957',
                 category: 'see'
               })
-              if (row.stage === '录入验收单' || row.stage === '签署确认') {
+              if (row.businessApprovalStatus === 1 && row.stage === '录入验收单') {
+                btnList.push({
+                  msg: '申请融资',
+                  icon: 'iconfont icon-orange icon-a-Group8151',
+                  category: 'apply'
+                })
+              }
+              if ((row.stage === '录入验收单' || row.stage === '签署确认') && !row.businessApprovalStatus) {
                 btnList.push({
                   msg: '处理',
                   icon: 'iconfont icon-orange icon-a-Group8151',