Finish Hotfix-mo-25

src/api/supply/sales.js

@@ -27,6 +27,15 @@ export function examineData(params) {
   })
 }
 
+// 弃审
+export function abandonData(params) {
+  return request({
+    url: '/sale/order/trialApproval',
+    method: 'post',
+    params
+  })
+}
+
 // 审批进入判断
 export function examineJudge(params) {
   return request({

src/components/Common/print-foshan.vue

@@ -3,7 +3,11 @@
     <div class="print-page" v-for="(item, index) in showData" :key="index">
       <div class="print-title">
         <div class="title1">佛山盛世欣兴格力贸易有限公司</div>
-        <div class="title2">商品发货单</div>
+        <div class="title2">
+          <div></div>
+          <div>销售发货单</div>
+          <div>{{ item.pickOrderWater }}</div>
+        </div>
       </div>
       <div class="print-form-1">
         <el-row :gutter="0">
@@ -169,6 +173,12 @@ export default {
     .title2 {
       font-size: 18px;
       margin-bottom: 24px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      div {
+        width: 33.333%;
+      }
     }
   }
   .print-form-1 {

src/components/Common/print-guangzhou.vue

@@ -2,8 +2,12 @@
   <div class="detail-container">
     <div class="print-page" v-for="(item, index) in showData" :key="index">
       <div class="print-title">
-        <div class="title1">广州盛世欣兴格力贸易有限公司销售发货单</div>
-        <div class="title2">{{ item.informationKey }}</div>
+        <div class="title1">佛山盛世欣兴格力贸易有限公司</div>
+        <div class="title2">
+          <div></div>
+          <div>销售发货单</div>
+          <div>{{ item.pickOrderWater }}</div>
+        </div>
       </div>
       <div class="print-form-2">
         <el-row :gutter="0">
@@ -223,16 +227,20 @@ export default {
     page-break-after: always;
   }
   .print-title {
+    text-align: center;
     .title1 {
       font-size: 24px;
-      margin-bottom: 10px;
-      text-align: center;
+      margin-bottom: 18px;
     }
     .title2 {
       font-size: 18px;
-      margin-bottom: 20px;
-      text-align: right;
-      margin-right: 100px;
+      margin-bottom: 24px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      div {
+        width: 33.333%;
+      }
     }
   }
   .print-table-1 {

src/views/supply/engin/engin_list.vue

@@ -245,7 +245,7 @@ export default {
         useUnit: this.screenForm.company,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
-        status: this.screenForm.status,
+        examineStatus: this.screenForm.status,
       }
     },
   },
@@ -276,7 +276,7 @@ export default {
         useUnit: this.screenForm.company,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
-        status: this.screenForm.status,
+        examineStatus: this.screenForm.status,
       };
       getEnginList(params).then((res) => {
         this.dataList = res.data.records;

src/views/supply/sales/sales_list.vue

@@ -118,6 +118,13 @@
               <template slot-scope="scope">
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
                 <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
+                <el-popconfirm 
+                  style="margin-left: 10px;" 
+                  title="确定弃审吗？" 
+                  @onConfirm="handleAbandon(scope.row.id)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
+                  <el-button slot="reference" type="text">弃审</el-button>
+                </el-popconfirm>
               </template>
             </el-table-column>
           </el-table>
@@ -147,7 +154,7 @@
 </template>
 
 <script>
-import { getList, examineJudge, examineBatch } from "@/api/supply/sales";
+import { getList, examineJudge, examineBatch, abandonData } from "@/api/supply/sales";
 import SalesDetail from "@/views/supply/sales/components/sales_detail";
 import SalesExamine from "@/views/supply/sales/components/sales_examine";
 import ExamineDialog from "@/components/Common/examine-dialog";
@@ -206,7 +213,7 @@ export default {
       examineForm: {
         status: '',
         remark: '',
-      }
+      },
     }
   },
 
@@ -346,6 +353,14 @@ export default {
         this.$successMsg('修改成功');
       })
     },
+
+    // 弃审
+    handleAbandon(id) {
+      abandonData({id}).then(res => {
+        this.$successMsg();
+        this.getList();
+      })
+    },
   }
 }
 </script>