From cefe78f707eecfd172560689fb44b9e150a3d559 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 13 Dec 2024 11:38:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=98=BF=E9=87=8C=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8D=95=E7=9A=84=E4=B8=9A=E5=8A=A1=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/DialogCreateOrder.vue        |  5 +-
 .../distribution/retraceCodeDetailDialog.vue  | 42 +++++------
 .../distribution/selectMsfxOrderDialog.vue    | 70 +++++++++++--------
 3 files changed, 66 insertions(+), 51 deletions(-)

diff --git a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
index 0905803..2358530 100644
--- a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
+++ b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
@@ -871,7 +871,10 @@ export default {
 
     //查询msfx单据
     selectOrder(){
-
+      if (this.orderFormData.action == null) {
+        this.$message.error('请选择单据类型！')
+        return
+      }
       this.selectOrderVisible = true
     },
 
diff --git a/src/views/pharmaceuticals/distribution/retraceCodeDetailDialog.vue b/src/views/pharmaceuticals/distribution/retraceCodeDetailDialog.vue
index 52dc400..6b94fea 100644
--- a/src/views/pharmaceuticals/distribution/retraceCodeDetailDialog.vue
+++ b/src/views/pharmaceuticals/distribution/retraceCodeDetailDialog.vue
@@ -1,25 +1,25 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="orderQuery" size="mini" label-width="100px" v-show="showSearch">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item class="query-form-item" label="追溯码:">
-              <el-input v-model="orderQuery.unionCode" placeholder="请扫描或输入追溯码"
-                        style="width: 500px"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div class="top-right-btn">
-        <el-button-group>
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-          <!--<el-button type="primary" icon="el-icon-check" @click="confirmSelect">确定</el-button>-->
-        </el-button-group>
-      </div>
+<!--      <el-form :model="orderQuery" size="mini" label-width="100px" v-show="showSearch">-->
+<!--        <el-row>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item class="query-form-item" label="追溯码:">-->
+<!--              <el-input v-model="orderQuery.unionCode" placeholder="请扫描或输入追溯码"-->
+<!--                        style="width: 500px"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--      </el-form>-->
+<!--      <div class="top-right-btn">-->
+<!--        <el-button-group>-->
+<!--          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>-->
+<!--          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>-->
+<!--          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>-->
+<!--          &lt;!&ndash;<el-button type="primary" icon="el-icon-check" @click="confirmSelect">确定</el-button>&ndash;&gt;-->
+<!--        </el-button-group>-->
+<!--      </div>-->
       <el-table
         :data="dataList"
         style="width: 100%"
@@ -33,17 +33,19 @@
         <el-table-column
           label="监管码"
           prop="code"
-          width="140"
+          width="240"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           label="监管码级别"
           prop="codeLevel"
+          width="100"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           label="最小包装数量"
           prop="pkgAmount"
+          width="100"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
diff --git a/src/views/pharmaceuticals/distribution/selectMsfxOrderDialog.vue b/src/views/pharmaceuticals/distribution/selectMsfxOrderDialog.vue
index 16e943f..c6dc68d 100644
--- a/src/views/pharmaceuticals/distribution/selectMsfxOrderDialog.vue
+++ b/src/views/pharmaceuticals/distribution/selectMsfxOrderDialog.vue
@@ -82,31 +82,32 @@
       >
         <el-table-column label width="45">
           <template slot-scope="scope">
-            <el-radio :label="scope.row.billCode" v-model="radioCheck"><span></span></el-radio>
+            <el-radio :label="scope.row.billCode" v-model="scope.row.radioCheck"><span></span></el-radio>
           </template>
         </el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="订单编号" prop="billCode" width="140" show-overflow-tooltip ></el-table-column>
-        <el-table-column width="120" label="单据时间" prop="billTimeFormat" show-overflow-tooltip ></el-table-column>
-        <el-table-column label="单据类型" prop="billType" show-overflow-tooltip ></el-table-column>
-        <el-table-column label="药品信息" prop="physicInfo" show-overflow-tooltip ></el-table-column>
-        <el-table-column label="药品名称" prop="physicName" show-overflow-tooltip ></el-table-column>
-        <el-table-column label="制剂数量" prop="prepnCount" show-overflow-tooltip ></el-table-column>
-        <el-table-column width="100" label="生产批号" prop="produceBatchNo" show-overflow-tooltip ></el-table-column>
-        <el-table-column label="发货企业" prop="toUserName"  show-overflow-tooltip  ></el-table-column>
-        <el-table-column  label="收货企业" prop="fromUserName" show-overflow-tooltip  ></el-table-column>
-        <el-table-column label="生产日期"  prop="produceDate" show-overflow-tooltip ></el-table-column>
-        <el-table-column label="有效期至" prop="exprieDate" show-overflow-tooltip ></el-table-column>
-        <el-table-column  width="120" label="最小包装数量" prop="codeCount"  show-overflow-tooltip ></el-table-column>
-        <el-table-column  width="120" label="厂商" prop="produceEntName"  show-overflow-tooltip ></el-table-column>
+        <el-table-column width="180" label="单据时间" prop="billTimeFormat" show-overflow-tooltip ></el-table-column>
+<!--        <el-table-column label="单据类型" prop="billType" show-overflow-tooltip ></el-table-column>-->
+<!--        <el-table-column label="药品信息" prop="physicInfo" show-overflow-tooltip width="240"></el-table-column>-->
+<!--        <el-table-column label="药品名称" prop="physicName" show-overflow-tooltip width="180"></el-table-column>-->
+        <el-table-column label="发货企业" prop="fromUserName"  show-overflow-tooltip  width="180"></el-table-column>
+        <el-table-column  label="收货企业" prop="toUserName" show-overflow-tooltip  width="180"></el-table-column>
+<!--        <el-table-column width="100" label="生产批号" prop="produceBatchNo" show-overflow-tooltip ></el-table-column>-->
+
+<!--        <el-table-column label="生产日期"  prop="produceDate" show-overflow-tooltip width="180"></el-table-column>-->
+<!--        <el-table-column label="有效期至" prop="exprieDate" show-overflow-tooltip width="180"></el-table-column>-->
+<!--        <el-table-column width="120" label="制剂数量" prop="prepnCount" show-overflow-tooltip ></el-table-column>-->
+<!--        <el-table-column  width="120" label="最小包装数量" prop="codeCount"  show-overflow-tooltip ></el-table-column>-->
+<!--        <el-table-column  width="120" label="厂商" prop="produceEntName"  show-overflow-tooltip ></el-table-column>-->
 
       </el-table>
-      <pagination
-        v-show="pageTotal>0"
-        :total="pageTotal"
-        :page.sync="orderQuery.page"
-        :limit.sync="orderQuery.limit"
-      />
+<!--      <pagination-->
+<!--        v-show="pageTotal>0"-->
+<!--        :total="pageTotal"-->
+<!--        :page.sync="orderQuery.page"-->
+<!--        :limit.sync="orderQuery.limit"-->
+<!--      />-->
       <!--@pagination="getList"-->
     </el-card>
 <!--    <el-card>-->
@@ -120,17 +121,21 @@
             border
             ref="multipleTable"
           >
-            <el-table-column label="药品通用名" prop="prodName" width="140" show-overflow-tooltip ></el-table-column>
+            <el-table-column label="药品通用名" prop="prodName" width="240" show-overflow-tooltip ></el-table-column>
             <el-table-column width="140" label="药品商品名" prop="prodName" show-overflow-tooltip ></el-table-column>
-            <el-table-column label="生产企业名称" prop="productEntName" show-overflow-tooltip ></el-table-column>
-            <el-table-column label="药品信息" prop="physicInfo" show-overflow-tooltip ></el-table-column>
-            <el-table-column label="药品名称" prop="physicName" show-overflow-tooltip ></el-table-column>
-            <el-table-column label="制剂数量" prop="prepnCount" show-overflow-tooltip ></el-table-column>
+<!--            <el-table-column label="生产企业名称" prop="productEntName" show-overflow-tooltip ></el-table-column>-->
+<!--            <el-table-column label="药品信息" prop="physicInfo" show-overflow-tooltip ></el-table-column>-->
+<!--            <el-table-column label="药品名称" prop="physicName" show-overflow-tooltip ></el-table-column>-->
+<!--            <el-table-column label="制剂数量" prop="prepnCount" show-overflow-tooltip ></el-table-column>-->
             <el-table-column width="100" label="生产批号" prop="produceBatchNo" show-overflow-tooltip ></el-table-column>
-            <el-table-column label="包装单位描述" prop="pkgUnitDesc"  show-overflow-tooltip  ></el-table-column>
-            <el-table-column  label="制剂规格描述" prop="SC73399619155911" show-overflow-tooltip  ></el-table-column>
-            <el-table-column label="生产日期"  prop="produceDate" show-overflow-tooltip ></el-table-column>
-            <el-table-column label="有效期至" prop="exprieDate" show-overflow-tooltip ></el-table-column>
+<!--            <el-table-column label="包装单位描述" prop="pkgUnitDesc"  show-overflow-tooltip  ></el-table-column>-->
+
+            <el-table-column width="180" label="生产日期"  prop="produceDate" show-overflow-tooltip ></el-table-column>
+            <el-table-column width="180" label="有效期至" prop="validEndDate" show-overflow-tooltip ></el-table-column>
+            <el-table-column  width="180" label="制剂规格描述" prop="prepnSpec" show-overflow-tooltip  ></el-table-column>
+            <el-table-column width="120" label="制剂数量" prop="leastPrepnAmount" show-overflow-tooltip ></el-table-column>
+            <el-table-column  width="120" label="最小包装数量" prop="leastPkgAmount"  show-overflow-tooltip ></el-table-column>
+            <el-table-column  width="120" label="厂商" prop="productEntName"  show-overflow-tooltip ></el-table-column>
 
 
             <el-table-column label="操作" width="160" fixed="right">
@@ -185,7 +190,7 @@ export default {
         beginDate:null,
         ensDate:null,
         page: 1,
-        limit: 10
+        limit: 100
       },
       pageTotal: 10,
       dataList: [],
@@ -226,7 +231,7 @@ export default {
         beginDate: null,
         ensDate: null,
         page: 1,
-        limit: 10
+        limit: 100
       },
         this.getList()
     },
@@ -235,6 +240,11 @@ export default {
         this.$message.error('请选择要选入的单据！')
         return
       }
+      if (this.orderFormData.action == null) {
+        this.$message.error('请选择单据类型！')
+        return
+      }
+      this.orderFormData.orderEntity = JSON.parse(JSON.stringify(this.orderFormData));
       this.orderFormData.aliData = this.currentRow
       addAliBizProduct(this.orderFormData).then((res) => {
         if (res.code === 20000) {