完善厂家系统认款--作废

anrui-scm/anrui-scm-ui/src/api/supplychain/manufacturers.js

@@ -18,4 +18,11 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  cancel: function(data) {
+    return request({
+      url: '/base/v1/basemanufactorsubscription/cancel',
+      method: 'post',
+      params: data
+    })
+  }
 }

anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue

@@ -44,43 +44,44 @@
         </div>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column fixed label="操作" width="100px" align="center">
+            <el-table-column fixed label="操作" width="180" align="center">
               <template slot-scope="scope">
                 <el-button type="success" size="mini" v-show="scope.row.isShowAdopt == 1" @click="handPass(scope.row)">通过</el-button>
+                <el-button type="success" size="mini" v-show="scope.row.isShowAdopt == 1" @click="handCancellation(scope.row)">作废</el-button>
               </template>
             </el-table-column>
             <el-table-column label="状态" width="100px" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.state == '0' ? '未认款' : '已认款' }}</span>
+                <span>{{ scope.row.state == '0' ? '未认款' : scope.row.state == '1' ? '已认款' : '已作废' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请编号" align="center" width="200px">
+            <el-table-column label="申请编号" align="center" width="200">
               <template slot-scope="scope">
                 <span class="bluezi" @click="handleLook(scope.row.vehApplySid)">{{ scope.row.proSchAppNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="采购类型" align="center" width="200px">
+            <el-table-column label="采购类型" align="center" width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.applyType }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请订金金额" header-align="center" align="left" width="150px">
+            <el-table-column label="申请订金金额" header-align="center" align="left" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.paymentMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="打款状态" align="center" width="100px">
+            <el-table-column label="打款状态" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.paymentState == '0' ? '未打款' : scope.row.paymentState == '1' ? '已打款' : '无需打款'}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="认款日期" align="center" width="100px">
+            <el-table-column label="认款日期" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.subscriptionDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="认款人" align="center" width="120px">
+            <el-table-column label="认款人" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.subscriptionPeo }}</span>
               </template>
@@ -162,6 +163,10 @@ export default {
         {
           dictKey: 1,
           dictValue: '已认款'
+        },
+        {
+          dictKey: 2,
+          dictValue: '已作废'
         }
       ],
       paymentState_list: [
@@ -296,8 +301,16 @@ export default {
     handPass(row) {
       req.adopt({ sid: row.sid, remarks: row.remarks, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
-          this.init()
           this.$message({ showClose: true, type: 'success', message: '操作成功' })
+          this.getList()
+        }
+      })
+    },
+    handCancellation(row) {
+      req.cancel({ sid: row.sid }).then((res) => {
+        if (res.success) {
+          this.$message({ showClose: true, type: 'success', message: '操作成功' })
+          this.getList()
         }
       })
     },