From 8468687d272f2d04ad17820fa45ef954feec2591 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 1 Mar 2024 18:06:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=9D=E5=AD=98=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thirdSys/invOrder/thrInvOrder.vue | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/thirdSys/invOrder/thrInvOrder.vue b/src/views/thirdSys/invOrder/thrInvOrder.vue
index 39b16a48..6711c6b3 100644
--- a/src/views/thirdSys/invOrder/thrInvOrder.vue
+++ b/src/views/thirdSys/invOrder/thrInvOrder.vue
@@ -78,18 +78,16 @@
         <el-table-column label="出入库类型" prop="mainAction"></el-table-column>
         <el-table-column label="第三方单据类型" prop="billType"></el-table-column>
         <el-table-column label="外部系统" prop="thirdSysFk"></el-table-column>
-        <el-table-column label="单据状态" prop="status"></el-table-column>
+<!--        <el-table-column label="单据状态" prop="status"></el-table-column>-->
         <el-table-column
           prop="status"
           label="单据状态"
-          width="100"
-          :filters="[{ text: '待生成', value: '0' }, { text: '已生成', value: '1' }]"
-          :filter-method="filterTag"
+          width="160"
           filter-placement="bottom-end">
           <template slot-scope="scope">
             <el-tag
               :type="scope.row.status == '1' ? 'primary' : 'success'"
-              disable-transitions>{{scope.row.status}}</el-tag>
+              disable-transitions>{{scope.row.status == 0 ? '待生成':'已生成'}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="操作" width="160">
@@ -97,9 +95,12 @@
             <el-button type="text" @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button>
-            <el-button v-show="scope.row.status == 0" type="text" @click.native.stop="generateBill(scope.row)"
+            <el-button v-show="scope.row.status == 0" type="text" @click.native.stop="generateBill(scope.row)" STYLE="color:rgb(0,0,255)"
             >生成单据
             </el-button>
+            <el-button v-show="scope.row.status == 1" type="text" @click.native.stop="generateBill(scope.row)" STYLE="color:rgb(0,220,255)"
+            >重新生成
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -117,13 +118,13 @@
         <el-table-column label="物资编码" prop="relId"></el-table-column>
         <el-table-column label="第三方项目编码" prop="thrCode"></el-table-column>
         <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="DI" prop="nameCode" show-overflow-tooltip="true"></el-table-column>
+<!--        <el-table-column label="DI" prop="nameCode" show-overflow-tooltip="true"></el-table-column>-->
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="计量单位" prop="measname"></el-table-column>
         <el-table-column label="价格" prop="price"></el-table-column>
-        <el-table-column label="生产日期" prop="productDate"></el-table-column>
-        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+<!--        <el-table-column label="生产日期" prop="productDate"></el-table-column>-->
+<!--        <el-table-column label="失效日期" prop="expireDate"></el-table-column>-->
 
         <el-table-column label="医疗器械注册备案人" prop="ylqxzcrbarmc"></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>