From 8a9a88437464258460691770f3c66e8ac2684b32 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 29 Nov 2023 12:06:17 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8D=95=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E9=85=8D=E8=B4=A7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                           |   4 +-
 src/api/inout/order.js                    |  10 +++
 src/views/inout/DialogCreateOrder.vue     |   7 +-
 src/views/inout/IoReturnedSearchOrder.vue | 104 +++++++++++++++++-----
 4 files changed, 100 insertions(+), 25 deletions(-)

diff --git a/.env.production b/.env.production
index c5bb385..5e56bff 100644
--- a/.env.production
+++ b/.env.production
@@ -22,10 +22,10 @@ ENV = 'production'
 
 # 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
 
 # 漳州中医院
-VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
 
 # 平和
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 34e015e..f4154c9 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -537,3 +537,13 @@ export function orderDetailAdd(params) {
     data: params
   });
 }
+
+
+export function copyOrder(params) {
+  return axios({
+    url: "/udiwms/inout/order/copyOrder",
+    method: "post",
+    data: params
+  });
+}
+
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 05c6e55..eaa5869 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -74,7 +74,7 @@
           <el-col :span="11">
             <el-form-item prop="action" label="单据类型:">
               <el-select v-model="orderFormData.action" placeholder="请选择单据类型"
-                         :disabled="corpOrderIdDisabled"
+                         :disabled="corpOrderIdDisabled && orderFormData.action!=null"
                          style="width: 90%"
                          @change="actionChange">
                 <el-option
@@ -957,7 +957,10 @@ export default {
       this.refreshCodesPanel();
       // //加载选择框候选数据
       this.findInvListByUser();
-      this.initBusType();
+      if (this.orderFormData.action == null) {
+        this.getBusTypeByInv();
+      } else
+        this.initBusType();
 
       this.findMethod(this.orderFormData.fromCorp);
       this.findFromInvList();
diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
index 011c7fc..415e396 100644
--- a/src/views/inout/IoReturnedSearchOrder.vue
+++ b/src/views/inout/IoReturnedSearchOrder.vue
@@ -141,7 +141,7 @@
                 border
                 @current-change="handleSelectionChange"
                 :default-sort="defaultSort"
-                @sort-change="handleSortChange"     >
+                @sort-change="handleSortChange">
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="退货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
@@ -158,7 +158,7 @@
 
         <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
                          sortable="custom"
-                         :sort-orders="['ascending', 'descending']"       >
+                         :sort-orders="['ascending', 'descending']">
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
             <span>{{ scope.row.createTime }}</span>
@@ -195,22 +195,30 @@
             >打印
             </el-button
             >
+
             <el-button
               type="text"
               size="small"
-              v-if="customerId == 110"
-              @click.native.stop="rollback(scope.row)"
-            >撤回
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.status == 10"
-              @click.native.stop="reviewOrder(scope.row)"
-            >审核
+              @click.native.stop="repeatOrder(scope.row)"
+            >再次配货
             </el-button
             >
+            <!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              v-if="customerId == 110"-->
+            <!--              @click.native.stop="rollback(scope.row)"-->
+            <!--            >撤回-->
+            <!--            </el-button-->
+            <!--            >-->
+            <!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              v-if="scope.row.status == 10"-->
+            <!--              @click.native.stop="reviewOrder(scope.row)"-->
+            <!--            >审核-->
+            <!--            </el-button-->
+            <!--            >-->
             <el-button
               type="text"
               size="small"
@@ -510,11 +518,30 @@
       ></accept-order>
     </el-dialog>
 
+
+    <el-dialog
+      title="编辑单据"
+      :visible.sync="addOrderVisible"
+      width="85%"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="addOrderVisible"
+      @close='closeDialog'
+    >
+      <addOrder
+        :closeDialog="closeDialog"
+        :orderQuery="returnData"
+        :viewType="viewType"
+      ></addOrder>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import {
+  copyOrder,
   deleteByOrderId,
   getOrderList, rollUnReceivebackOrder
 } from "../../api/inout/order";
@@ -529,6 +556,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 
+import addOrder from "./DialogCreateOrder";
 
 const formJson = {
   site_id: "",
@@ -548,14 +576,14 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "supSearch",
+        vueType: "supReturned",
         page: 1,
         limit: 10,
         startTime: null,
         endTime: null,
         startAduditTime: null,
         endAduditTime: null,
-        status: 10,
+        // status: 10,
         invCode: this.$store.getters.locInvCode,
       },
 
@@ -593,7 +621,7 @@ export default {
         "11": "仓库盘点",
         "12": "采购计划",
         "13": "领用单据",
-        "14": "第三方系统单据","15":"采购订单"
+        "14": "第三方系统单据", "15": "采购订单"
       },
       deleteData: {
         id: "",
@@ -670,9 +698,14 @@ export default {
       acceptQuery: null,
       acceptOrderVisible: false,
       showSup: false,
+
+
+      addOrderVisible: false,
+      returnData: null,
+      viewType: 3,
     };
   },
-  components: {AcceptOrder},
+  components: {AcceptOrder, addOrder},
   methods: {
     onReset() {
       this.$router.push({
@@ -683,15 +716,15 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "supSearch",
+        vueType: "supReturned",
         page: 1,
         limit: 10,
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
-      this.actDateRange=[];
-      this.auditDateRange=[];
+      this.actDateRange = [];
+      this.auditDateRange = [];
       this.getList();
     },
 
@@ -775,6 +808,30 @@ export default {
         this.loading = false;
       });
     },
+
+
+    repeatOrder(row) {
+      this.$confirm('此操作将创建新的送货单据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+
+        copyOrder(row)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.returnData = response.data;
+              this.addOrderVisible = true;
+            }
+
+          })
+          .catch(() => {
+          });
+
+      }).catch(() => {
+        // this.$message.info('回退失败');
+      });
+    },
     getBusType() {
       let query = {
         // code: this.filterQuery.invCode,
@@ -831,7 +888,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
-      this.filterQuery.busType = 4;     //退货出入库单据类型
+      // this.filterQuery.busType = 4;     //退货出入库单据类型
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
@@ -1047,6 +1104,11 @@ export default {
       };
       return statusMap[status];
     },
+
+    closeDialog() {
+      this.addOrderVisible = false;
+    },
+
   }
   ,
   mounted() {

From 21ff6b97dbee4d6a163b2c3c32a85a6f6a9f9a6a Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 11 Dec 2023 21:57:36 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=88=AB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   8 +-
 src/api/thrsys/thrHsfl.js                     |   9 ++
 src/views/basic/product/productEdit.vue       |  49 ++++++--
 src/views/inout/IoReturnedSearchOrder.vue     |   2 +
 .../purchase/product/supProductEditDialog.vue |  10 +-
 .../company/basicCompanyProductsImport.vue    | 118 ++++++++++++++----
 .../company/basicCompanyproductEdit.vue       |  50 ++++++--
 .../products/supAddDiProductSelectUdi.vue     |  44 ++++++-
 8 files changed, 234 insertions(+), 56 deletions(-)

diff --git a/.env.production b/.env.production
index 5e56bff..44e3cdc 100644
--- a/.env.production
+++ b/.env.production
@@ -22,7 +22,7 @@ ENV = 'production'
 
 # 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/'
-VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
 
 # 漳州中医院
 # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
@@ -31,17 +31,17 @@ VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
 
 # 长泰医院
-# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 
 
 
 # 应用访问路径 例如使用前缀 /admin/
 
 # 域名
-# VUE_APP_CONTEXT_PATH = '/'
+VUE_APP_CONTEXT_PATH = '/'
 
 # 其他
-VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
+# VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
 # 监控地址
 VUE_APP_MONITRO_ADMIN = '/admin/login'
diff --git a/src/api/thrsys/thrHsfl.js b/src/api/thrsys/thrHsfl.js
index 55b0acf..07eaae6 100644
--- a/src/api/thrsys/thrHsfl.js
+++ b/src/api/thrsys/thrHsfl.js
@@ -7,3 +7,12 @@ export function getHslbs(query) {
     params: query
   });
 }
+
+
+export function getThrProductType(query) {
+  return axios({
+    url: "/udiwms/thrsys/getThrProductType",
+    method: "get",
+    params: query
+  });
+}
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 3c25fa3..bac1f44 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -242,12 +242,26 @@
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
             <el-form-item :label="productRemarkSet.remarkTitle7+':'">
-              <el-input
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
+              <el-select
                 v-model="editQuery.basicPrductRemak7"
-              ></el-input>
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物资类别"
+                :remote-method="findThrTypeMethod"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="item in thrTypeOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
@@ -593,7 +607,7 @@ import selectErp from "./udiInfoselectErpUdi";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
 import {getListMenu, getOneName} from '@/api/basic/basicHospType'
-import {getHslbs} from "@/api/thrsys/thrHsfl";
+import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
 
 
 export default {
@@ -654,6 +668,7 @@ export default {
       },
       loading: false,
       hsflOptions: [],
+      thrTypeOptions: [],
     }
   },
   components: {
@@ -675,6 +690,9 @@ export default {
     if (this.editQuery.basicPrductRemak8 != null) {
       this.findHsflMethod(this.editQuery.basicPrductRemak8);
     }
+    if (this.editQuery.basicPrductRemak7 != null) {
+      this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
+    }
   },
   methods: {
     diableChange() {
@@ -905,8 +923,23 @@ export default {
         .catch(() => {
           this.loading = false;
         });
-    }
-    ,
+    },
+    findThrTypeMethod(query) {
+      this.thrTypeOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getThrProductType(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.thrTypeOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
 
   }
 }
diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
index 415e396..cb650ad 100644
--- a/src/views/inout/IoReturnedSearchOrder.vue
+++ b/src/views/inout/IoReturnedSearchOrder.vue
@@ -577,6 +577,7 @@ export default {
         mainAction: null,
         action: null,
         vueType: "supReturned",
+        statusType: "supReturned",
         page: 1,
         limit: 10,
         startTime: null,
@@ -717,6 +718,7 @@ export default {
         mainAction: null,
         action: null,
         vueType: "supReturned",
+        statusType: "supReturned",
         page: 1,
         limit: 10,
         startTime: null,
diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue
index 1946243..df2feb5 100644
--- a/src/views/purchase/product/supProductEditDialog.vue
+++ b/src/views/purchase/product/supProductEditDialog.vue
@@ -550,8 +550,8 @@ export default {
           return;
         }
       }
-      if(val==3){
-        this.$confirm( "已审核通过，是否需要重新提交变更", {
+      if (val == 3) {
+        this.$confirm("已审核通过，是否需要重新提交变更", {
           confirmButtonText: "确定",
           type: "warning",
           showCancelButton: false,
@@ -581,7 +581,7 @@ export default {
               }
             });
           });
-      }else{
+      } else {
         this.$refs['inputQuery'].validate(valid => {
           if (valid) {
             // this.inputQuery.auditStatus = val;
@@ -669,7 +669,7 @@ export default {
       this.imgList = [];
       previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
         if (response.code === 20000) {
-          this.imgList=response.data;
+          this.imgList = response.data;
         }
       });
       this.imgViewerVisible = true;
@@ -703,7 +703,7 @@ export default {
           this.loading = false;
           if (response.code === 20000) {
             this.inputQuery = response.data;
-            this.inputQuery.manufacturerId=this.inputQuery.manufacturerIdFk
+            this.inputQuery.manufacturerId = this.inputQuery.manufacturerIdFk
             this.selectSingleProductVisible = false;
           } else {
             this.$message.error(response.message);
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index c58b753..031c55f 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -206,12 +206,12 @@
           </el-row>
 
           <el-row>
-<!--            <el-col :span="12" class="el-col">-->
-<!--              <el-form-item label="包装级别" prop="bzcj">-->
-<!--                <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" v-model="editQuery.bzcj"-->
-<!--                          :disabled="true"></el-input>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
+            <!--            <el-col :span="12" class="el-col">-->
+            <!--              <el-form-item label="包装级别" prop="bzcj">-->
+            <!--                <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" v-model="editQuery.bzcj"-->
+            <!--                          :disabled="true"></el-input>-->
+            <!--              </el-form-item>-->
+            <!--            </el-col>-->
 
             <el-col :span="12" class="el-col">
               <el-form-item label="包含下级包装数量" prop="bhxjsl">
@@ -276,12 +276,12 @@
                 <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.cpms"></el-input>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="12" class="el-col">-->
-<!--              <el-form-item label="计量单位" prop="measname">-->
-<!--                <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"-->
-<!--                          v-model="editQuery.measname"></el-input>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
+            <!--            <el-col :span="12" class="el-col">-->
+            <!--              <el-form-item label="计量单位" prop="measname">-->
+            <!--                <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"-->
+            <!--                          v-model="editQuery.measname"></el-input>-->
+            <!--              </el-form-item>-->
+            <!--            </el-col>-->
             <el-col :span="12" class="el-col">
               <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
                 <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容"
@@ -311,9 +311,9 @@
             <H3 style="margin-left: 10px;margin-bottom: 15px">{{ replTitle }}</H3>
           </el-col>
           <el-col :span="6" class="el-col">
-          <div style=" float: right; text-align: right; margin-bottom: 8px;">
-            <el-button type="primary" icon="el-icon-upload" @click="selectExport">选中导入</el-button>
-          </div>
+            <div style=" float: right; text-align: right; margin-bottom: 8px;">
+              <el-button type="primary" icon="el-icon-upload" @click="selectExport">选中导入</el-button>
+            </div>
           </el-col>
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 15px">
@@ -524,12 +524,26 @@
               <div class="itemTag">
                 <span>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span>
               </div>
-              <el-input
-                style="width: 65%"
-                size="small"
-                splaceholder="请输入内容"
+              <el-select
                 v-model="repEditQuery.basicPrductRemak7"
-              ></el-input>
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物资类别"
+                :remote-method="findThrTypeMethod"
+                style="width: 65%"
+              >
+                <el-option
+                  v-for="item in thrTypeOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                </el-option>
+              </el-select>
             </div>
           </el-col>
 
@@ -538,12 +552,27 @@
               <div class="itemTag">
                 <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
               </div>
-              <el-input
-                style="width: 65%"
-                size="small"
-                splaceholder="请输入内容"
+              <el-select
                 v-model="repEditQuery.basicPrductRemak8"
-              ></el-input>
+                filterable
+                remote
+                style="width: 65%"
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物价类别"
+                :remote-method="findHsflMethod"
+              >
+                <el-option
+                  v-for="item in hsflOptions"
+                  :key="item.hsbm"
+                  :label="item.hsmc"
+                  :value="item.hsbm"
+                >
+                  <span style="float: left">{{ item.hsmc }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.hsbm }}</span>
+                </el-option>
+              </el-select>
+
             </div>
           </el-col>
         </el-row>
@@ -560,6 +589,7 @@ import {filterByUuid} from "../../../api/basic/udiInfo";
 import {insertCompanyProductRelevance, insertFilter} from "../../../api/basic/companyProductRelevance";
 import store from "../../../store";
 import {isBlank} from "@/utils/strUtil";
+import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
 
 export default {
   name: "UdIInfoSelect",
@@ -599,7 +629,7 @@ export default {
         supplementRequest: null,
       },
       loading: false,
-      editQuery: null,
+      editQuery: {},
       repEditQuery: {
         sptm: null,
         ybbm: null,
@@ -652,6 +682,8 @@ export default {
       selectLocalVisible: false,
       productRemarkSet: {},
       supplementRequest: null,
+      hsflOptions: [],
+      thrTypeOptions: [],
     };
   },
 
@@ -750,6 +782,7 @@ export default {
 
     },
     allExport() {
+      debugger
       this.postQuery.customerId = store.getters.customerId;
       this.postQuery.supplementRequest = this.repEditQuery;
       insertFilter(this.postQuery).then(response => {
@@ -943,6 +976,39 @@ export default {
         }
       });
     },
+    findHsflMethod(query) {
+      this.hsflOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getHslbs(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.hsflOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    }
+    ,
+    findThrTypeMethod(query) {
+      this.thrTypeOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getThrProductType(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.thrTypeOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
   },
   mounted() {
   },
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 1135c5c..2d1d350 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -152,12 +152,26 @@
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
             <el-form-item :label="productRemarkSet.remarkTitle7+':'">
-              <el-input
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
+              <el-select
                 v-model="editQuery.basicPrductRemak7"
-              ></el-input>
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物资类别"
+                :remote-method="findThrTypeMethod"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="item in thrTypeOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
@@ -245,7 +259,7 @@ import {updateById} from '@/api/basic/udiRelevance'
 import {filterByUuid} from '@/api/basic/udiInfo'
 import selectErp from "./udiInfoselectErpUdi";
 import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion'
-import {getHslbs} from "@/api/thrsys/thrHsfl";
+import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
 
 export default {
   name: 'productEdit',
@@ -293,6 +307,7 @@ export default {
       editSingleDiDialogVisible: false,
       selectErpDialogVisible: false,  //选入ERP产品
       hsflOptions: [],
+      thrTypeOptions: [],
     }
   },
 
@@ -446,8 +461,24 @@ export default {
         .catch(() => {
           this.loading = false;
         });
-    }
-    ,
+    },
+
+    findThrTypeMethod(query) {
+      this.thrTypeOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getThrProductType(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.thrTypeOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
 
   },
   components: {
@@ -464,6 +495,9 @@ export default {
     if (this.editQuery.basicPrductRemak8 != null) {
       this.findHsflMethod(this.editQuery.basicPrductRemak8);
     }
+    if (this.editQuery.basicPrductRemak7 != null) {
+      this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
+    }
 
   },
 }
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index c4e9c95..fc4ac4d 100644
--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@@ -250,8 +250,26 @@
         <el-row>
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
             <el-form-item :label="productRemarkSet.remarkTitle7 ">
-              <el-input style="width: 65%" size="small" splaceholder="请输入内容"
-                        v-model="editQuery.basicPrductRemak7"></el-input>
+              <el-select
+                v-model="editQuery.basicPrductRemak7"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物资类别"
+                :remote-method="findThrTypeMethod"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="item in thrTypeOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -310,7 +328,7 @@ import selectDiDetail from './selectDIDetailDialog'
 import store from '@/store'
 import {getBasicThirdSys} from '@/api/basic/basicThirdSys'
 import {finProductSet} from '@/api/param/systemParamConfig'
-import {getHslbs} from "@/api/thrsys/thrHsfl";
+import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
 
 export default {
   name: 'closeDialog',
@@ -393,6 +411,7 @@ export default {
       selectThirdSys: [],
       productRemarkSet: {},
       hsflOptions: [],
+      thrTypeOptions: [],
     }
   },
   methods: {
@@ -630,8 +649,23 @@ export default {
         .catch(() => {
           this.loading = false;
         });
-    }
-    ,
+    },
+    findThrTypeMethod(query) {
+      this.thrTypeOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getThrProductType(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.thrTypeOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
 
   },
   created() {

From bef7eba8a1fe213ac7ec0e7e675780cf5f852414 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 18 Dec 2023 09:44:41 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=88=AB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                                      |  8 ++++----
 .../supplier/company/basicCompanyProductsImport.vue  |  5 ++++-
 .../supplier/company/basicCompanyproductEdit.vue     | 12 ++++++------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.env.production b/.env.production
index 44e3cdc..b6cdd40 100644
--- a/.env.production
+++ b/.env.production
@@ -7,7 +7,7 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API =  'http://www.linjiyu.lol:82/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API =  'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API =  'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API =  'http://127.0.0.1:9150/UDI_SPMS_SERVER/'
 
@@ -31,17 +31,17 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
 
 # 长泰医院
-VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 
 
 
 # 应用访问路径 例如使用前缀 /admin/
 
 # 域名
-VUE_APP_CONTEXT_PATH = '/'
+# VUE_APP_CONTEXT_PATH = '/'
 
 # 其他
-# VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
+VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
 # 监控地址
 VUE_APP_MONITRO_ADMIN = '/admin/login'
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index 031c55f..f4eeaaa 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -1016,7 +1016,10 @@ export default {
   created() {
     this.selectSysParam();
     this.findBasicProductSet();
-
+    this.findHsflMethod(this.repEditQuery.basicPrductRemak8);
+    // }
+    // if (this.editQuery.basicPrductRemak7 != null) {
+    this.findThrTypeMethod(this.repEditQuery.basicPrductRemak7);
   },
 };
 </script>
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 2d1d350..193f41a 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -492,12 +492,12 @@ export default {
       limit: 10,
     };
     this.getDetailList(ttquery);
-    if (this.editQuery.basicPrductRemak8 != null) {
-      this.findHsflMethod(this.editQuery.basicPrductRemak8);
-    }
-    if (this.editQuery.basicPrductRemak7 != null) {
-      this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
-    }
+    // if (this.editQuery.basicPrductRemak8 != null) {
+    this.findHsflMethod(this.editQuery.basicPrductRemak8);
+    // }
+    // if (this.editQuery.basicPrductRemak7 != null) {
+    this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
+    // }
 
   },
 }

From 47f22e9cfbe73d6da3d08a50742b17889b76329c Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 17 Jan 2024 17:21:37 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=B4=A7=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E9=A2=84=E8=A7=88=E7=AD=89=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .env.production                               | 15 ++++++-
 .../basic/product/SelectDIDetailDialog.vue    |  9 ++++
 src/views/basic/product/product.vue           | 12 +++++-
 .../basic/product/udilnfoManageSpDetail.vue   | 12 ++++++
 src/views/biz/UdiTrace.vue                    |  9 ++++
 src/views/inout/DialogInvoice.vue             | 28 ++++++-------
 src/views/inout/InvoiceRegByOrder.vue         | 20 +++++----
 src/views/purchase/cert/supCertAudit.vue      |  8 ++--
 src/views/purchase/cert/supCertSearch.vue     |  8 ++--
 .../purchase/cert/supCertificationAdd.vue     | 10 ++---
 .../supManufacturerAuditDialog.vue            | 42 ++++++++++++-------
 .../supManufacturerEditDialog.vue             |  4 +-
 .../supplier/company/SelectDIDetailDialog.vue |  9 ++++
 src/views/supplier/company/ThrProductsAdd.vue |  9 ++++
 .../supplier/company/basicCompanyProducts.vue |  6 +++
 .../company/basicCompanyProductsImport.vue    | 16 +++----
 .../company/basicCompanyproductDetail.vue     |  9 ++++
 .../company/basicCompanyproductEdit.vue       | 15 ++++---
 .../supplier/company/basicProductEdit.vue     |  1 +
 .../products/selectDIDetailDialog.vue         |  9 ++++
 .../products/supAddDiProductSelectUdi.vue     | 16 +++++--
 22 files changed, 196 insertions(+), 73 deletions(-)

diff --git a/.env.development b/.env.development
index e29fc9f..ec3f881 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ VUE_APP_TITLE = 供应商自助管理平台
 # 开发环境配置
 ENV = 'development'
 
-VUE_APP_BASE_API = 'http://127.0.0.1:9993'
+VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'
diff --git a/.env.production b/.env.production
index b6cdd40..8ffcfd6 100644
--- a/.env.production
+++ b/.env.production
@@ -7,7 +7,7 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API =  'http://www.linjiyu.lol:82/UDI_SPMS_SERVER/'
-VUE_APP_BASE_API =  'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API =  'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API =  'http://127.0.0.1:9150/UDI_SPMS_SERVER/'
 
@@ -23,6 +23,7 @@ VUE_APP_BASE_API =  'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/'
 # 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_SPMS_SERVER/'
 
 # 漳州中医院
 # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
@@ -32,8 +33,20 @@ VUE_APP_BASE_API =  'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/'
 
 # 长泰医院
 # VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.139:9150/UDI_SPMS_SERVER/'
 
+# VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
 
+# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/'
+
+#诏安医院
+# VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.17:9150/UDI_SPMS_SERVER/'
+# 大田
+VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
+# 云霄妇幼
+# VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/'
 
 # 应用访问路径 例如使用前缀 /admin/
 
diff --git a/src/views/basic/product/SelectDIDetailDialog.vue b/src/views/basic/product/SelectDIDetailDialog.vue
index b23941c..4899f98 100644
--- a/src/views/basic/product/SelectDIDetailDialog.vue
+++ b/src/views/basic/product/SelectDIDetailDialog.vue
@@ -312,6 +312,15 @@
                   ></el-input>
                 </div>
               </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>产品货号或编号:&nbsp;</span>
+                  </div>
+                  <el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
+                            v-model="editQuery.cphhhbh"></el-input>
+                </div>
+              </el-col>
             </el-row>
           </el-collapse-item>
 
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 21a18be..6db8862 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -997,7 +997,17 @@
                         </div>
                       </el-col>
                     </el-row>
-
+                    <el-row :gutter="20" class="el-row" type="flex">
+                      <el-col :span="12" class="el-col">
+                        <div class="text item">
+                          <div class="itemTag">
+                            <span>产品货号或编号:&nbsp;</span>
+                          </div>
+                          <el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
+                                    v-model="editQuery.cphhhbh"></el-input>
+                        </div>
+                      </el-col>
+                    </el-row>
                     <el-row :gutter="20" class="el-row" type="flex">
                       <el-col
                         :span="12"
diff --git a/src/views/basic/product/udilnfoManageSpDetail.vue b/src/views/basic/product/udilnfoManageSpDetail.vue
index bf43bd0..77be85b 100644
--- a/src/views/basic/product/udilnfoManageSpDetail.vue
+++ b/src/views/basic/product/udilnfoManageSpDetail.vue
@@ -316,6 +316,18 @@
                 ></el-input>
               </div>
             </el-col>
+
+          </el-row>
+          <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="12" class="el-col">
+              <div class="text item">
+                <div class="itemTag">
+                  <span>产品货号或编号:&nbsp;</span>
+                </div>
+                <el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
+                          v-model="editQuery.cphhhbh"></el-input>
+              </div>
+            </el-col>
           </el-row>
 
         </el-collapse-item>
diff --git a/src/views/biz/UdiTrace.vue b/src/views/biz/UdiTrace.vue
index bd31ae2..23fe2c5 100644
--- a/src/views/biz/UdiTrace.vue
+++ b/src/views/biz/UdiTrace.vue
@@ -325,6 +325,15 @@
                   ></el-input>
                 </div>
               </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>产品货号或编号:&nbsp;</span>
+                  </div>
+                  <el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
+                            v-model="editQuery.cphhhbh"></el-input>
+                </div>
+              </el-col>
             </el-row>
           </el-collapse-item>
 
diff --git a/src/views/inout/DialogInvoice.vue b/src/views/inout/DialogInvoice.vue
index 27cdbc9..c0a7762 100644
--- a/src/views/inout/DialogInvoice.vue
+++ b/src/views/inout/DialogInvoice.vue
@@ -164,18 +164,18 @@ export default {
         // machineNo: [
         //   {required: true, message: "请输入机器编码", trigger: "blur"}
         // ],
-        invoiceCode: [
-          {required: true, message: "请输入发票代码", trigger: "blur"}
-        ],
+        // invoiceCode: [
+        //   {required: true, message: "请输入发票代码", trigger: "blur"}
+        // ],
         invoiceEncode: [
           {required: true, message: "请输入发票编码", trigger: "blur"}
         ],
         price: [
           {required: true, message: "请输入发票价格", trigger: "blur"}
         ],
-        remark: [
-          {required: true, message: "请输入备注", trigger: "blur"}
-        ],
+        // remark: [
+        //   {required: true, message: "请输入备注", trigger: "blur"}
+        // ],
       },
       loading: false,
       uploadUrl: "",
@@ -196,10 +196,10 @@ export default {
           //   this.$message.error("机器编码不能为空！");
           //   return;
           // }
-          if (this.$isBlank(this.inputQuery.invoiceCode)) {
-            this.$message.error("发票代码不能为空！");
-            return;
-          }
+          // if (this.$isBlank(this.inputQuery.invoiceCode)) {
+          //   this.$message.error("发票代码不能为空！");
+          //   return;
+          // }
           if (this.$isBlank(this.inputQuery.invoiceEncode)) {
             this.$message.error("发票编码不能为空！");
             return;
@@ -208,10 +208,10 @@ export default {
             this.$message.error("发票价格不能为空！");
             return;
           }
-          if (this.$isBlank(this.inputQuery.remark)) {
-            this.$message.error("备注不能为空！");
-            return;
-          }
+          // if (this.$isBlank(this.inputQuery.remark)) {
+          //   this.$message.error("备注不能为空！");
+          //   return;
+          // }
           updateById(this.inputQuery).then((res) => {
             if (res.code == 20000) {
               this.$message({
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index 4411bd6..0b7e632 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -984,15 +984,19 @@ export default {
         });
     },
     getInvList() {
-      getInvListByUser()
+      let query = {
+        advanceType:1,
+        spUse:1
+      }
+      getInvListByUser(query)
         .then((response) => {
-          let invlist1 = response.data || [];
-          for (var i = 0; i < invlist1.length; i++) {
-            if (invlist1[i].code == 1000000) {
-              this.invList.push(invlist1[i]);
-              this.filterQuery.invCode = invlist1[i].code;
-            }
-          }
+          this.invList = response.data || [];
+          // for (var i = 0; i < invlist1.length; i++) {
+          //   if (invlist1[i].code == 1000000) {
+          //     this.invList.push(invlist1[i]);
+          //     this.filterQuery.invCode = invlist1[i].code;
+          //   }
+          // }
 
         })
         .catch(() => {
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index b0c269e..0f9f992 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -133,9 +133,9 @@
       <el-form :model="filterManufacturerQuery" class="query-form" label-width="120px" v-show="showSearch2">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="生产企业名称">
+            <el-form-item label="生产企业/代理人">
               <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%"
-                        placeholder="请输入生产企业名称" clearable></el-input>
+                        placeholder="请输入生产企业/代理人" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -159,7 +159,7 @@
       <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%" ref="table"
                 highlight-current-row border @row-click="supManufacturerClick">
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业/代理人" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
         <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
         <el-table-column label="企业类型" prop="bussinessStatus" width="120">
           <template slot-scope="scope">
@@ -279,7 +279,7 @@
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业/代理人" prop="manufacturerName" show-overflow-tooltip></el-table-column>
         <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
         <el-table-column label="审核状态" prop="auditStatus" width="120">
           <template slot-scope="scope">
diff --git a/src/views/purchase/cert/supCertSearch.vue b/src/views/purchase/cert/supCertSearch.vue
index d50198e..2392230 100644
--- a/src/views/purchase/cert/supCertSearch.vue
+++ b/src/views/purchase/cert/supCertSearch.vue
@@ -92,8 +92,8 @@
       <el-form :model="filterManufacturerQuery" class="query-form" label-width="120px" v-show="showSearch1">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="生产企业名称">
-              <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%" placeholder="请输入生产企业名称"
+            <el-form-item label="生产企业/代理人">
+              <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%" placeholder="请输入生产企业/代理人"
                         clearable></el-input>
             </el-form-item>
           </el-col>
@@ -119,7 +119,7 @@
       <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%" border
                 highlight-current-row @row-click="supManufacturerClick">
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业/代理人" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
         <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
         <el-table-column label="企业类型" prop="bussinessStatus" width="120">
           <template slot-scope="scope">
@@ -214,7 +214,7 @@
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业/代理人" prop="manufacturerName" show-overflow-tooltip></el-table-column>
         <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
         <el-table-column label="审核状态" prop="auditStatus" width="120">
           <template slot-scope="scope">
diff --git a/src/views/purchase/cert/supCertificationAdd.vue b/src/views/purchase/cert/supCertificationAdd.vue
index 2010b90..8557145 100644
--- a/src/views/purchase/cert/supCertificationAdd.vue
+++ b/src/views/purchase/cert/supCertificationAdd.vue
@@ -6,16 +6,16 @@
       <el-form
         :model="filterQuery"
         class="query-form"
-        label-width="100px"
+        label-width="110px"
         v-show="showSearch"
       >
         <el-row>
           <el-col span="6">
-            <el-form-item label="企业名称:">
+            <el-form-item label="生产企业/代理人:">
               <el-input
                 v-model="filterQuery.companyName"
                 style="width: 90%"
-                placeholder="请输入企业名称"
+                placeholder="请输入生产企业/代理人"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -76,7 +76,7 @@
       >
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
-          label="企业名称"
+          label="生产企业/代理人"
           prop="companyName"
           width="250"
         ></el-table-column>
@@ -250,7 +250,7 @@
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          label="生产企业"
+          label="生产企业/代理人"
           prop="manufacturerName"
           show-overflow-tooltip
         ></el-table-column>
diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
index 9f22263..078e009 100644
--- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
@@ -13,7 +13,8 @@
           <el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onPassSubmit">审核通过</el-button>
           <el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onRejectSubmit">审核拒绝
           </el-button>
-          <el-button v-if="editType==1 && auditType!=1" type="primary" size="mini" icon="search" @click="printSupCertAll">打印
+          <el-button v-if="editType==1 && auditType!=1" type="primary" size="mini" icon="search"
+                     @click="printSupCertAll">打印
           </el-button>
         </div>
         <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
@@ -46,7 +47,7 @@
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="10" class="el-col">
-            <el-form-item label="企业名称:" label-width="150px" prop="companyName">
+            <el-form-item label="生产企业/代理人:" label-width="150px" prop="companyName">
               <el-input
                 size="small"
                 placeholder="请输入内容" disabled
@@ -200,7 +201,8 @@
           </el-table-column>
           <el-table-column label="操作" width="250">
             <template slot-scope="scope">
-              <el-button v-if="editType==1 && auditType!=1" type="text" size="small" @click.native="printSupCert(scope.row)">打印
+              <el-button v-if="editType==1 && auditType!=1" type="text" size="small"
+                         @click.native="printSupCert(scope.row)">打印
               </el-button>
               <el-button type="text" size="small" v-if="editType==2" @click.native="auditCert(scope.row)">编辑</el-button>
               <el-button
@@ -215,6 +217,12 @@
             </template>
           </el-table-column>
         </el-table>
+        <el-image-viewer
+          v-if="imgViewer"
+          style="z-index: 9999"
+          :on-close="closeImgViewer"
+          :url-list="imgList"
+        />
         <el-pagination
           :page-size="certQuery.limit"
           @current-change="certHandleCurrentChange"
@@ -368,6 +376,7 @@ export default {
       selectedOptions: [],
       selectedOptions2: [],
       imgViewerVisible: false,
+      imgViewer: false,
       imgList: [],
       options: regionDataPlus,
       rules: {
@@ -558,19 +567,20 @@ export default {
     showImgViewer(row) {
       // let newWindow = window.open();
       // newWindow.document.write(row.filePath)
-        this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-        this.imgList = [];
-        previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
-          if (response.code === 20000) {
-            this.imgList=response.data;
-          }
-        });
-        this.imgViewerVisible = true;
-        const m = (e) => {
-          e.preventDefault()
-        };
-        document.body.style.overflow = 'hidden';
-        document.addEventListener("touchmove", m, false); // 禁止页面滑动
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.imgList = [];
+      previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
+        if (response.code === 20000) {
+          this.imgList = response.data;
+        }
+      });
+      this.imgViewerVisible = true;
+      this.imgViewer = true
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'hidden';
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
     closeImgViewer() {
       this.imgViewerVisible = false;
diff --git a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
index e0af7e4..d628014 100644
--- a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
@@ -69,10 +69,10 @@
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="10" class="el-col">
-            <el-form-item label="生产企业:" label-width="150px" prop="companyName">
+            <el-form-item label="生产企业/代理人:" label-width="150px" prop="companyName">
               <el-input
                 size="small"
-                placeholder="请输入生产企业"
+                placeholder="请输入生产企业/代理人"
                 v-model.trim="inputQuery.companyName"
                 @input="change()"
               ></el-input>
diff --git a/src/views/supplier/company/SelectDIDetailDialog.vue b/src/views/supplier/company/SelectDIDetailDialog.vue
index eb20fa0..3a49163 100644
--- a/src/views/supplier/company/SelectDIDetailDialog.vue
+++ b/src/views/supplier/company/SelectDIDetailDialog.vue
@@ -295,6 +295,15 @@
                                     ></el-input>
                                 </div>
                             </el-col>
+                          <el-col :span="12" class="el-col">
+                            <div class="text item">
+                              <div class="itemTag">
+                                <span>产品货号或编号:&nbsp;</span>
+                              </div>
+                              <el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
+                                        v-model="editQuery.cphhhbh"></el-input>
+                            </div>
+                          </el-col>
                         </el-row>
                     </el-collapse-item>
 
diff --git a/src/views/supplier/company/ThrProductsAdd.vue b/src/views/supplier/company/ThrProductsAdd.vue
index 27345a2..e261f20 100644
--- a/src/views/supplier/company/ThrProductsAdd.vue
+++ b/src/views/supplier/company/ThrProductsAdd.vue
@@ -274,6 +274,15 @@
                             ></el-input>
                         </div>
                     </el-col>
+                  <el-col :span="12" class="el-col">
+                    <div class="text item">
+                      <div class="itemTag">
+                        <span>产品货号或编号:&nbsp;</span>
+                      </div>
+                      <el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
+                                v-model="editQuery.cphhhbh"></el-input>
+                    </div>
+                  </el-col>
                 </el-row>
             </div>
 
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index fcb9259..f806230 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -41,6 +41,12 @@
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="第三方产品编码:">
               <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index f4eeaaa..f3707eb 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -420,7 +420,6 @@
               ></el-input>
             </div>
           </el-col>
-
         </el-row>
 
 
@@ -507,12 +506,15 @@
               <div class="itemTag">
                 <span>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span>
               </div>
-              <el-input
-                style="width: 65%"
-                size="small"
-                splaceholder="请输入内容"
+              <el-select
                 v-model="repEditQuery.basicPrductRemak6"
-              ></el-input>
+                placeholder="请选择"
+                clearable
+                style="width: 65%"
+              >
+                <el-option label="扣费" value="1"></el-option>
+                <el-option label="不扣费" value="0"></el-option>
+              </el-select>
             </div>
           </el-col>
         </el-row>
@@ -547,7 +549,7 @@
             </div>
           </el-col>
 
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
+          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8 && repEditQuery.basicPrductRemak6=='1'">
             <div class="text item">
               <div class="itemTag">
                 <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue
index 9bb59c2..703a453 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -508,6 +508,15 @@
                   ></el-input>
                 </div>
               </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>产品货号或编号:&nbsp;</span>
+                  </div>
+                  <el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
+                            v-model="editQuery.cphhhbh"></el-input>
+                </div>
+              </el-col>
             </el-row>
 
             <el-row :gutter="20" class="el-row" type="flex">
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 193f41a..0430674 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -140,12 +140,15 @@
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
             <el-form-item :label="productRemarkSet.remarkTitle6+':'">
-              <el-input
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
+              <el-select
                 v-model="editQuery.basicPrductRemak6"
-              ></el-input>
+                placeholder="请选择"
+                clearable
+                style="width: 80%"
+              >
+                <el-option label="扣费" value="1"></el-option>
+                <el-option label="不扣费" value="0"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -174,7 +177,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
+          <el-col :span="12"   v-if="productRemarkSet.remarkEnable8==true  && editQuery.basicPrductRemak6=='1'">
             <el-form-item :label="productRemarkSet.remarkTitle8+':'">
               <el-select
                 v-model="editQuery.basicPrductRemak8"
diff --git a/src/views/supplier/company/basicProductEdit.vue b/src/views/supplier/company/basicProductEdit.vue
index 8c0741d..7bd0a8a 100644
--- a/src/views/supplier/company/basicProductEdit.vue
+++ b/src/views/supplier/company/basicProductEdit.vue
@@ -197,6 +197,7 @@
                             ></el-input>
                         </div>
                     </el-col>
+
                 </el-row>
                 <el-row :gutter="20" class="el-row" type="flex">
 
diff --git a/src/views/supplier/products/selectDIDetailDialog.vue b/src/views/supplier/products/selectDIDetailDialog.vue
index 9fa57e1..858ecb3 100644
--- a/src/views/supplier/products/selectDIDetailDialog.vue
+++ b/src/views/supplier/products/selectDIDetailDialog.vue
@@ -347,6 +347,15 @@
                             v-model="editQuery.cpms"></el-input>
                 </div>
               </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>产品货号或编号:&nbsp;</span>
+                  </div>
+                  <el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
+                            v-model="editQuery.cphhhbh"></el-input>
+                </div>
+              </el-col>
             </el-row>
           </el-collapse-item>
 
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index fc4ac4d..695f9a2 100644
--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@@ -240,9 +240,16 @@
           </el-col>
 
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
-            <el-form-item :label="productRemarkSet.remarkTitle6    ">
-              <el-input style="width: 65%" size="small" splaceholder="请输入内容"
-                        v-model="editQuery.basicPrductRemak6"></el-input>
+            <el-form-item :label="productRemarkSet.remarkTitle6">
+              <el-select
+                v-model="editQuery.basicPrductRemak6"
+                placeholder="请选择"
+                clearable
+                style="width: 80%"
+              >
+                <el-option label="扣费" value="1"></el-option>
+                <el-option label="不扣费" value="0"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -273,7 +280,8 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
+          <el-col :span="12" class="el-col"
+                  v-if="productRemarkSet.remarkEnable8==true  && editQuery.basicPrductRemak6=='1'">
             <el-form-item :label="productRemarkSet.remarkTitle8">
               <el-select
                 v-model="editQuery.basicPrductRemak8"

From 403782abf464ae01c026335aea979208dc0d31c9 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 25 Jan 2024 14:44:40 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .env.production                               | 12 ++++++---
 src/views/basic/product/product.vue           |  2 +-
 src/views/purchase/cert/supCertAudit.vue      | 17 +++++++++---
 src/views/purchase/cert/supCertSearch.vue     | 27 ++++++++++++-------
 .../company/basicCompanyproductDetail.vue     |  2 +-
 .../company/basicCompanyproductEdit.vue       |  1 +
 .../supplier/company/basicProductEdit.vue     |  2 +-
 8 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/.env.development b/.env.development
index ec3f881..e29fc9f 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ VUE_APP_TITLE = 供应商自助管理平台
 # 开发环境配置
 ENV = 'development'
 
-VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER'
+VUE_APP_BASE_API = 'http://127.0.0.1:9993'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'
diff --git a/.env.production b/.env.production
index 8ffcfd6..e15a9f8 100644
--- a/.env.production
+++ b/.env.production
@@ -32,7 +32,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
 
 # 长泰医院
-# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.139:9150/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
@@ -43,18 +43,22 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.17:9150/UDI_SPMS_SERVER/'
 # 大田
-VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
 # 云霄妇幼
 # VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/'
 
+# 南靖
+# VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/'
+
+
 # 应用访问路径 例如使用前缀 /admin/
 
 # 域名
-# VUE_APP_CONTEXT_PATH = '/'
+VUE_APP_CONTEXT_PATH = '/'
 
 # 其他
-VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
+# VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
 # 监控地址
 VUE_APP_MONITRO_ADMIN = '/admin/login'
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 6db8862..d2eba8d 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -1322,7 +1322,7 @@
 
                   <el-collapse-item name="6">
                     <template slot="title">
-                      <p class="form-title">版本信息</p>
+                      <p class="form-title">国家DI标识数据库版本信息</p>
                     </template>
                     <el-row :gutter="20" class="el-row" type="flex">
                       <el-col :span="12" class="el-col">
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index 0f9f992..7c76b4d 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -259,6 +259,15 @@
                         placeholder="请输入注册备案人"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="审核状态:">
+              <el-select v-model="registrationQuery.auditStatus" placeholder="请选择审核状态">
+                <el-option label="全部" :value="21"></el-option>
+                <el-option label="未审核" :value='6'></el-option>
+                <el-option label="已审核" :value='2'></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
 
@@ -428,7 +437,7 @@ export default {
       registrationQuery: {
         customerId: null,
         manufacturerIdFk: null,
-        auditStatus: "21",
+        auditStatus: 21,
         recordProductName: "",
         recordCode: "",
         recordPeopleName: "",
@@ -499,7 +508,7 @@ export default {
       this.filterQuery = {
         companyName: "",
         creditNum: "",
-        auditStatus: "21",
+        auditStatus: 21,
         page: 1,
         limit: 20,
       };
@@ -585,7 +594,7 @@ export default {
         creditCode: "",
         placeArea: "",
         page: 1,
-        auditStatus: "21",
+        auditStatus: 21,
         limit: 10,
       };
       this.manufacturerList = [];
@@ -674,7 +683,7 @@ export default {
         recordProductName: "",
         recordCode: "",
         recordPeopleName: "",
-        auditStatus: "21",
+        auditStatus: 21,
         page: 1,
         limit: 10
       };
diff --git a/src/views/purchase/cert/supCertSearch.vue b/src/views/purchase/cert/supCertSearch.vue
index 2392230..93b688b 100644
--- a/src/views/purchase/cert/supCertSearch.vue
+++ b/src/views/purchase/cert/supCertSearch.vue
@@ -187,13 +187,20 @@
             <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable="true"
                       placeholder="请输入物资名称"></el-input>
           </el-form-item>
-          <el-form-item label="注册备案号:">
+          <el-form-item label="注册/备案号:">
             <el-input v-model="registrationQuery.recordCode" style="width: 90%" clearable="true"
-                      placeholder="请输入注册备案号"></el-input>
+                      placeholder="请输入注册/备案号"></el-input>
           </el-form-item>
-          <el-form-item label="注册备案人:">
+          <el-form-item label="注册/备案人:">
             <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%" clearable="true"
-                      placeholder="请输入注册备案人"></el-input>
+                      placeholder="请输入注册/备案人"></el-input>
+          </el-form-item>
+          <el-form-item label="审核状态:">
+            <el-select v-model="registrationQuery.auditStatus" placeholder="请选择审核状态">
+              <el-option label="全部" :value="22"></el-option>
+              <el-option label="未审核" :value='6'></el-option>
+              <el-option label="已审核" :value='2'></el-option>
+            </el-select>
           </el-form-item>
         </el-row>
       </el-form>
@@ -294,7 +301,7 @@ export default {
         companyName: "",
         checkType: "",
         creditNum: "",
-        auditStatus: "22",
+        auditStatus: 22,
         page: 1,
         limit: 20,
       },
@@ -324,7 +331,7 @@ export default {
         companyName: "",
         creditCode: "",
         placeArea: "",
-        auditStatus: "22",
+        auditStatus: 22,
         page: 1,
         limit: 10,
       },
@@ -362,7 +369,7 @@ export default {
       registrationQuery: {
         customerId: null,
         manufacturerIdFk: null,
-        auditStatus: "22",
+        auditStatus: 22,
         recordProductName: "",
         recordCode: "",
         recordPeopleName: "",
@@ -421,7 +428,7 @@ export default {
       this.filterQuery = {
         companyName: "",
         creditNum: "",
-        auditStatus: "22",
+        auditStatus: 22,
         page: 1,
         limit: 20,
       };
@@ -504,7 +511,7 @@ export default {
         creditCode: "",
         placeArea: "",
         page: 1,
-        auditStatus: "22",
+        auditStatus: 22,
         limit: 10,
       };
       this.manufacturerList = [];
@@ -577,7 +584,7 @@ export default {
         recordProductName: "",
         recordCode: "",
         recordPeopleName: "",
-        auditStatus: "22",
+        auditStatus: 22,
         page: 1,
         limit: 10
       };
diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue
index 703a453..1fe1659 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -791,7 +791,7 @@
 
           <el-collapse-item name="6">
             <template slot="title">
-              <p class="form-title">版本信息</p>
+              <p class="form-title">国家DI标识数据库版本信息</p>
             </template>
 
             <el-row :gutter="20" class="el-row" type="flex">
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 0430674..b61f8ef 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -318,6 +318,7 @@ export default {
     submitUpload() {
       var data = {
         id: this.editQuery.prid,
+        uid: this.editQuery.rlId,
         sptm: this.editQuery.sptm,
         spmc: this.editQuery.spmc,
         measname: this.editQuery.measname,
diff --git a/src/views/supplier/company/basicProductEdit.vue b/src/views/supplier/company/basicProductEdit.vue
index 7bd0a8a..388317a 100644
--- a/src/views/supplier/company/basicProductEdit.vue
+++ b/src/views/supplier/company/basicProductEdit.vue
@@ -713,7 +713,7 @@
 
                     <el-collapse-item name="5">
                         <template slot="title">
-                            <p class="form-title">版本信息</p>
+                            <p class="form-title">国家DI标识数据库版本信息</p>
                         </template>
                         <el-row :gutter="20" class="el-row" type="flex">
                             <el-col :span="8" class="el-col">

From a057f56321d2c2d345e4faebf91d22aa5e15558d Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 2 Feb 2024 14:40:54 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E9=9B=86=E9=87=87=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                  |  2 +-
 .env.production                                   |  5 ++++-
 src/views/basic/business/stockOrder.vue           |  4 ++--
 .../company/basicCompanyProductsImport.vue        | 15 ++++++++++++++-
 .../products/supAddDiProductSelectUdi.vue         | 12 ++++++++++++
 5 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index e29fc9f..2554ec7 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ VUE_APP_TITLE = 供应商自助管理平台
 # 开发环境配置
 ENV = 'development'
 
-VUE_APP_BASE_API = 'http://127.0.0.1:9993'
+VUE_APP_BASE_API = 'http://192.168.0.166:9993'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'
diff --git a/.env.production b/.env.production
index e15a9f8..05d414c 100644
--- a/.env.production
+++ b/.env.production
@@ -32,7 +32,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
 
 # 长泰医院
-VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.139:9150/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
@@ -51,6 +51,9 @@ VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 # 南靖
 # VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/'
 
+# 东山
+VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'
+
 
 # 应用访问路径 例如使用前缀 /admin/
 
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 32e461f..23ae698 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -87,7 +87,7 @@
       <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
                 @row-click="getStockOrderDetailList" ref="multipleTable"
                 :default-sort="defaultSort"
-                @sort-change="handleSortChange" >
+                @sort-change="handleSortChange">
         <el-table-column type="selection" width="55">
         </el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
@@ -153,7 +153,7 @@
           </template>
         </el-table-column>
         <el-table-column label="价格" prop="price"></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="生产企业" prop="manufacturer"></el-table-column>
         <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
       </el-table>
 
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index f3707eb..50e4691 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -420,6 +420,18 @@
               ></el-input>
             </div>
           </el-col>
+          <el-col :span="12">
+            <div class="text item">
+              <div class="itemTag">
+                <span>是否可集采:&nbsp;</span>
+              </div>
+
+              <el-radio-group v-model="repEditQuery.groupBuy"  style="margin-top: 10px">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </div>
+          </el-col>
         </el-row>
 
 
@@ -549,7 +561,8 @@
             </div>
           </el-col>
 
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8 && repEditQuery.basicPrductRemak6=='1'">
+          <el-col :span="12" class="el-col"
+                  v-if="productRemarkSet.remarkEnable8 && repEditQuery.basicPrductRemak6=='1'">
             <div class="text item">
               <div class="itemTag">
                 <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index 695f9a2..1678796 100644
--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@@ -197,6 +197,18 @@
                         v-model="editQuery.price"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="是否可集采:"
+              prop="groupBuy"
+              class="query-form-item"
+            >
+              <el-radio-group v-model="editQuery.groupBuy">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>

From 939a4b9b6d6316f55b6168fb119b75ffb775984f Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sat, 3 Feb 2024 10:21:28 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.production b/.env.production
index 05d414c..28ebf56 100644
--- a/.env.production
+++ b/.env.production
@@ -32,7 +32,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
 
 # 长泰医院
-# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.139:9150/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
@@ -52,7 +52,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/'
 
 # 东山
-VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'
 
 
 # 应用访问路径 例如使用前缀 /admin/