Merge tag 'Hotfix-mo-70' into develop

Finish Hotfix-mo-70

src/api/supply/engin.js

@@ -126,6 +126,15 @@ export function withdrawEngin(params) {
   })
 }
 
+// 工程信息单 - 弃审
+export function abandonEngin(params) {
+  return request({
+    url: '/engin-info-order/abandon',
+    method: 'post',
+    params
+  })
+}
+
 // 工程信息单 - 删除
 export function deleteEngin(params) {
   return request({

src/views/supply/engin/commerce_list.vue

@@ -116,7 +116,7 @@
                 {{scope.row.examineStatus | statusFilter}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="工程订单号" prop="enginOrderNo" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="工程订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="订单日期" prop="orderDate" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <div>

src/views/supply/engin/components/home_form.vue

@@ -261,11 +261,11 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="总仓库" prop="status1" min-width="100" show-overflow-tooltip>
+        <!-- <el-table-column align="center" label="总仓库" prop="status1" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <div>{{ scope.row.status1 | status1Filter }}</div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column align="center" label="仓库状态" prop="status2" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <div>{{ status2Filter(scope.row) }}</div>

src/views/supply/engin/engin_list.vue

@@ -156,6 +156,13 @@
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'" >
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
+                <el-popconfirm 
+                  style="margin-right: 10px;" 
+                  title="确定弃审吗？" 
+                  @onConfirm="handleAbandon(scope.row.enginInfoId)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
+                  <el-button slot="reference" type="text">弃审</el-button>
+                </el-popconfirm>
                 <el-button 
                   type="text" 
                   @click="toForm(scope.row)" 
@@ -210,7 +217,7 @@
 </template>
 
 <script>
-import { getEnginList, applyEngin, withdrawEngin, deleteEngin, editDateEngin } from "@/api/supply/engin";
+import { getEnginList, applyEngin, withdrawEngin, deleteEngin, editDateEngin, abandonEngin } from "@/api/supply/engin";
 import { getSalesmanList } from '@/api/common'
 import EnginDetail from "@/views/supply/engin/components/engin_detail";
 import EnginForm from "@/views/supply/engin/components/engin_form";
@@ -412,6 +419,14 @@ export default {
       })
     },
 
+    // 弃审
+    handleAbandon(id) {
+      abandonEngin({id}).then(res => {
+        this.$successMsg();
+        this.getList();
+      })
+    },
+
     // 删除
     handleDelete(id) {
       deleteEngin({ids: id}).then(res => {