From f51139f3d07e9d88b7ddb3ddf9766052c485470e Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 27 Mar 2023 14:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inout/order.js                        |   9 +
 src/assets/styles/variables.scss              |   2 +-
 .../basic/product/SelectDIDetailDialog.vue    |   2 +-
 src/views/basic/product/UdiInfoSelectRel.vue  |   6 +-
 src/views/basic/product/udiInfoRelevance.vue  |   4 +-
 .../basic/product/udiInfoselectErpUdi.vue     |   6 +-
 .../basic/product/udilnfoManageSpDetail.vue   |   4 +-
 src/views/biz/UdiTrace.vue                    |   2 +-
 src/views/inout/DialogSelectRl.vue            |   6 +-
 src/views/inout/DialogcChangeNewOrder.vue     | 560 ++++++++++++++++++
 src/views/inout/InvoiceRegister.vue           |   2 +-
 src/views/inout/IoEditOrder.vue               |  56 +-
 src/views/inout/codeRel/ioCodeRelEdit.vue     |   2 +-
 src/views/inout/receive/DialogNewReceive.vue  |   2 +-
 .../inout/receive/receiveAuditDetail.vue      |   2 +-
 src/views/inout/uploadManage/uploadOrder.vue  |   2 +-
 .../inventory/DeviceMAOrderCompleted.vue      |   2 +-
 src/views/inventory/DeviceMAOrderModify.vue   |   2 +-
 .../inventory/DeviceReceiveOrderAudit.vue     |   2 +-
 .../inventory/DeviceReceiveOrderCompleted.vue |   2 +-
 .../inventory/DeviceReceiveOrderModify.vue    |   2 +-
 src/views/inventory/InvCountOrderModify.vue   |   2 +-
 src/views/inventory/InvMAOrderAudit.vue       |   2 +-
 src/views/inventory/InvMAOrderCompleted.vue   |   2 +-
 src/views/inventory/InvMAOrderModify.vue      |   2 +-
 src/views/inventory/InvPlace.vue              |   2 +-
 src/views/inventory/InvStatistics.vue         |   6 +-
 .../inventory/inner/innerOrderEditDialog.vue  |   2 +-
 .../purchase/purApply/purApplyEditDiaolog.vue |   3 +-
 .../purApply/pureApplyDetailDialog.vue        |   2 +-
 .../purOrder/purOrderDetailDialog.vue         |   2 +-
 .../purchase/purOrder/purOrderEditDialog.vue  |   2 +-
 .../purchase/purPlan/purPlanDetailDialog.vue  |   2 +-
 .../purchase/purPlan/purPlanEditDialog.vue    |   2 +-
 src/views/remind/invWarning.vue               |   2 +-
 .../thirdSys/invProducts/thrInvProducts.vue   |   2 +-
 src/views/thirdSys/product/thrProducts.vue    |   6 +-
 src/views/thirdSys/product/thrProductsAdd.vue |   6 +-
 .../thirdSys/product/thrProductsDetail.vue    |   2 +-
 .../product/thrProductsImportDetail.vue       |   2 +-
 .../thirdSys/product/thrProductsSelect.vue    |   6 +-
 vue.config.js                                 |   2 +-
 42 files changed, 674 insertions(+), 62 deletions(-)
 create mode 100644 src/views/inout/DialogcChangeNewOrder.vue

diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index fc6656f7..b9bd4988 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -497,3 +497,12 @@ export function submitOrderToThrSys(params) {
   });
 }
 
+export function orderChange(query) {
+  return axios({
+    url: "/udiwms/stock/order/change",
+    method: "post",
+    data: query
+  });
+}
+
+
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 34484d47..5c841aa5 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 225px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/src/views/basic/product/SelectDIDetailDialog.vue b/src/views/basic/product/SelectDIDetailDialog.vue
index bce26992..72112980 100644
--- a/src/views/basic/product/SelectDIDetailDialog.vue
+++ b/src/views/basic/product/SelectDIDetailDialog.vue
@@ -204,7 +204,7 @@
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
-                    <span>生产厂家:&nbsp;</span>
+                    <span>生产企业:&nbsp;</span>
                   </div>
                   <el-input
                     style="width: 65%"
diff --git a/src/views/basic/product/UdiInfoSelectRel.vue b/src/views/basic/product/UdiInfoSelectRel.vue
index 4df745f1..d9603c80 100644
--- a/src/views/basic/product/UdiInfoSelectRel.vue
+++ b/src/views/basic/product/UdiInfoSelectRel.vue
@@ -44,10 +44,10 @@
 
           <el-row>
             <el-col :span="6">
-              <el-form-item class="query-form-item" label="生产厂家:">
+              <el-form-item class="query-form-item" label="生产企业:">
                 <el-input v-model="erpQuery.manufactory"
                           clearable="true"
-                          placeholder="生产厂家"></el-input>
+                          placeholder="生产企业"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -98,7 +98,7 @@
           <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         </el-table>
         <pagination
           v-show="pageTotal>0"
diff --git a/src/views/basic/product/udiInfoRelevance.vue b/src/views/basic/product/udiInfoRelevance.vue
index 55d1947f..6a7b5a3f 100644
--- a/src/views/basic/product/udiInfoRelevance.vue
+++ b/src/views/basic/product/udiInfoRelevance.vue
@@ -42,7 +42,7 @@
                         <el-form-item class="query-form-item">
                             <el-input v-model="erpQuery.manufactory"
                                       clearable="true"
-                                      placeholder="生产厂家"></el-input>
+                                      placeholder="生产企业"></el-input>
                         </el-form-item>
                     </el-row>
 
@@ -89,7 +89,7 @@
                     <el-table-column label="计量单位" prop="measname"></el-table-column>
                     <el-table-column label="规格型号" prop="spec"></el-table-column>
                     <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+                    <el-table-column label="生产企业" prop="manufactory"></el-table-column>
                 </el-table>
                 <el-pagination
                     :page-size="erpQuery.limit"
diff --git a/src/views/basic/product/udiInfoselectErpUdi.vue b/src/views/basic/product/udiInfoselectErpUdi.vue
index 76f86b89..0ee8153a 100644
--- a/src/views/basic/product/udiInfoselectErpUdi.vue
+++ b/src/views/basic/product/udiInfoselectErpUdi.vue
@@ -26,8 +26,8 @@
                     </el-row>
                   <el-row>
                       <el-col :span="6">
-                        <el-form-item label="生产厂家:">
-                            <el-input v-model="erpQuery.manufactory" style="width: 90%" clearable="true" placeholder="请输入生产厂家" @keyup.enter.native="keyup_submit($event)"></el-input>
+                        <el-form-item label="生产企业:">
+                            <el-input v-model="erpQuery.manufactory" style="width: 90%" clearable="true" placeholder="请输入生产企业" @keyup.enter.native="keyup_submit($event)"></el-input>
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
@@ -74,7 +74,7 @@
                     <el-table-column label="计量单位" prop="measname"></el-table-column>
                     <el-table-column label="规格型号" prop="spec"></el-table-column>
                     <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+                    <el-table-column label="生产企业" prop="manufactory"></el-table-column>
                     <el-table-column label="配送企业" prop="supName"></el-table-column>
                 </el-table>
           <pagination
diff --git a/src/views/basic/product/udilnfoManageSpDetail.vue b/src/views/basic/product/udilnfoManageSpDetail.vue
index d710315d..891ab157 100644
--- a/src/views/basic/product/udilnfoManageSpDetail.vue
+++ b/src/views/basic/product/udilnfoManageSpDetail.vue
@@ -8,7 +8,7 @@
       <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
       <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
       <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
-      <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+      <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
     </el-table>
 
 
@@ -291,7 +291,7 @@
             <el-col :span="12" class="el-col">
               <div class="text item">
                 <div class="itemTag">
-                  <span>生产厂家:&nbsp;</span>
+                  <span>生产企业:&nbsp;</span>
                 </div>
                 <el-input
                   style="width: 65%"
diff --git a/src/views/biz/UdiTrace.vue b/src/views/biz/UdiTrace.vue
index 8e9b96d1..f1f41f1c 100644
--- a/src/views/biz/UdiTrace.vue
+++ b/src/views/biz/UdiTrace.vue
@@ -237,7 +237,7 @@
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
-                    <span>生产厂家:&nbsp;</span>
+                    <span>生产企业:&nbsp;</span>
                   </div>
                   <el-input
                     style="width: 65%"
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index d5d3c032..36a97b55 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -20,7 +20,7 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="生产厂家"
+        label="生产企业"
         prop="ylqxzcrbarmc"
         show-overflow-tooltip
       ></el-table-column>
@@ -92,7 +92,7 @@
         ></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
 
       </el-table>
       <el-table
@@ -435,7 +435,7 @@
           <el-col :span="12" class="el-col">
             <div class="text item">
               <div class="itemTag">
-                <span>生产厂家:&nbsp;</span>
+                <span>生产企业:&nbsp;</span>
               </div>
               <el-input
                 style="width: 65%"
diff --git a/src/views/inout/DialogcChangeNewOrder.vue b/src/views/inout/DialogcChangeNewOrder.vue
new file mode 100644
index 00000000..bd54dcb0
--- /dev/null
+++ b/src/views/inout/DialogcChangeNewOrder.vue
@@ -0,0 +1,560 @@
+<template>
+  <div>
+    <el-form :model="formData" :rules="formRules" ref="dataForm">
+
+      <el-button-group style="display: flex;margin: -40px 0 20px 80%; height: 35px">
+
+        <el-button
+          type="primary"
+          @click.native="submit('0')"
+        >生成单据
+        </el-button
+        >
+      </el-button-group>
+
+      <el-row :gutter="20">
+        <el-col :span="3">
+          <div class="ao-text">
+            <span>入库单号：</span>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="corpOrderId">
+            <el-input v-model="formData.corpOrderId" auto-complete="off"
+                      :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <div class="ao-text">
+            <span>单据时间：</span>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="actDate">
+            <el-date-picker
+              v-model="formData.actDate"
+              type="datetime"
+              placeholder="日期"
+              :disabled="true"
+              style="width: 100%; "
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+
+        <el-col :span="3">
+          <div class="ao-text">
+            <span>单据类型：</span>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item class="query-form-item" prop="billType">
+            <el-select v-model="formData.action" placeholder="请选择单据类型"
+                       @change="actionChange">
+              <el-option
+                v-for="item in busTypes"
+                :key="item.name"
+                :label="item.name"
+                :value="item.action">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="3">
+          <div class="ao-text">
+            <span>当前仓库：</span>
+          </div>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item prop="locStorageCode">
+            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange">
+              <el-option
+                v-for="item in storageList"
+                :key="item.name"
+                :label="item.name"
+                :value="item.code">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+
+      </el-row>
+      <el-row :gutter="20">
+
+
+        <el-col :span="3">
+          <div class="ao-text">
+            <span>往来信息：</span>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item class="query-form-item" prop="fromCorp"
+                        v-if="curAction.corpType ==0 ">
+            <el-select
+              v-model="formData.fromCorp"
+              filterable
+              remote
+              clearable="true"
+              reserve-keyword
+              placeholder="请输入往来单位"
+              :remote-method="findMethod"
+              :loading="loading"
+              @change="unitChange"
+            >
+              <el-option
+                v-for="item in fromOptions"
+                :key="item.name"
+                :label="item.name"
+                :value="item"
+              >
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="query-form-item" prop="fromCorp"
+                        v-if="curAction.corpType ==1">
+            <el-select
+              v-model="formData.fromCorp"
+              filterable
+              remote
+              clearable="true"
+              reserve-keyword
+              placeholder="请输入仓库信息"
+              :remote-method="findStorageMethod"
+              :loading="loading"
+              @change="storageChange"
+            >
+              <el-option
+                v-for="item in fromStorageOptions"
+                :key="item.value"
+                :label="item.code"
+                :value="item">
+                <span style="float: left">{{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+              </el-option>
+            </el-select>
+
+            <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
+            >
+              <el-option
+                v-for="item in fromSubStorageOptions"
+                :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>
+                <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="query-form-item" prop="fromCorp"
+                        v-if="curAction.corpType ==2">
+            <el-input v-model="formData.fromCorp" auto-complete="off"
+                      clearable
+                      placeholder="请输入病人住院号"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="3">
+          <div class="ao-text">
+            <span>当前分库：</span>
+          </div>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item prop="invWarehouseCode">
+            <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
+            >
+              <el-option
+                v-for="item in subInvList"
+                :key="item.name"
+                :label="item.name"
+                :value="item.code">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <el-table v-loading="detailLoading"
+              :data="detailList"
+              border
+              @selection-change="changeFun"
+              style="width: 100%; margin-top: 20px;">
+      <el-table-column
+        label="物资名称"
+        prop="coName"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="规格型号"
+        prop="spec"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="批次号"
+        prop="batchNo"
+        show-overflow-tooltip
+      ></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="count"
+      ></el-table-column>
+      <el-table-column
+        label="价格"
+        prop="price"
+      ></el-table-column>
+      <el-table-column
+        label="生产企业"
+        prop="manufacturer"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="注册/备案凭证号"
+        prop="certCode"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="100" prop="price" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteOrderDetail(scope.$index, scope.row)"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {filterAllByLoc, filterAllByUser} from "@/api/system/invWarehouse";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+// import {parseTime} from "@/filtres";
+import {getLocalJoinByUser} from "@/api/basic/busLocalType";
+import {submitOrderWeb} from "@/api/inout/order";
+import {orderChange} from "@/api/inout/order";
+import {getBizDetailList} from "@/api/inout/orderDetailBiz";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
+import {convertDate} from "@/utils/date"
+
+export default {
+  name: "DialogcChangeNewOrder",
+
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    curRow: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      convertDateFun: convertDate,
+      formData: {
+        corpOrderId: "",
+        code: "",
+        actor: "",
+        fromCorpId: "",
+        fromCorp: null,
+        fromType: 2,
+        actDate: new Date(),
+        action: null,
+        locStorageCode: null,
+        fromSubInvCode: null,
+        invWarehouseCode: null,
+        mainAction: null
+      },
+      fromStorageOptions: [],
+      fromSubStorageOptions: [],
+      curAction: {
+        corpType: 0,
+        genUnit: false,
+      },
+      busTypes: [],
+      fromOptions: [],
+      loading: false,
+      detailList: [],
+      storageList: [],
+      detailLoading: false,
+      subInvList: [],
+
+    }
+  },
+  methods: {
+
+    submit() {
+      if (this.$isBlank(this.formData.action)) {
+        this.$message.warning("请选择单据类型！");
+        return;
+      }
+      if (this.$isBlank(this.formData.locStorageCode)) {
+        this.$message.error('当前仓库不能为空');
+        return;
+      }
+      if (this.$isBlank(this.formData.fromCorp)) {
+        this.$message.error('当前往来单位不能为空');
+        return;
+      }
+      if (this.$isBlank(this.formData.invWarehouseCode)) {
+        this.$message.error("当前分库不能为空");
+        return;
+      }
+      if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromSubInvCode)) {
+        this.$message.error('往来单位分库不能为空');
+        return;
+      }
+      if (this.detailList.length == 0) {
+        this.$message.error("产品列表不能为空");
+        return;
+      }
+
+      if (this.formData.locStorageCode === this.formData.fromCorp || this.formData.invWarehouseCode === this.formData.fromSubInvCode) {
+        this.$message.error("当前仓库和往来仓库不能相同！");
+        return;
+      }
+
+      let products = [];
+      this.detailList.forEach(item => {
+        let product = {
+          relId: item.relId,
+          batchNo: item.batchNo
+        };
+        products.push(product);
+      });
+
+      this.busTypes.forEach(item => {
+        if (item.action === this.formData.action) {
+          this.formData.mainAction = item.mainAction;
+        }
+      })
+      let tQuery = {
+        stockOrderId: this.curRow.id,
+        locStorageCode: this.formData.locStorageCode,
+        action: this.formData.action,
+        mainAction: this.formData.mainAction,
+        fromCorp: this.formData.fromCorp,
+        fromCorpId: this.formData.fromCorpId,
+        invWarehouseCode: this.formData.invWarehouseCode,
+        fromSubInvCode: this.formData.fromSubInvCode,
+
+        products: products
+      };
+      stockOrderChange(tQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        });
+    },
+
+
+    locCHange() {
+
+      if (this.$isNotBlank(this.formData.invWarehouseCode)) {
+        this.formData.invWarehouseCode = "";
+      }
+      this.findStorageMethod();
+      this.findSubInvByInv(this.formData.locStorageCode);
+    },
+
+
+    findSubInvByInv(invCode) {
+      this.subInvList = [];
+      let query = {
+        pcode: invCode
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+
+    findStorageMethod(query) {
+      if (this.formData.locStorageCode == null)
+        return;
+      this.fromStorageOptions = [];
+      let cQuery = {
+        locInvCode: this.formData.locStorageCode,
+      };
+      filterAllByLoc(cQuery)
+        .then((response) => {
+          this.fromStorageOptions = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    findSubStorageMethod() {
+      let cQuery = {
+        pcode: this.formData.fromCorpId,
+        filter: 2,
+      };
+      filterSubByInv(cQuery)
+        .then((response) => {
+          this.fromSubStorageOptions = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: null,
+        outType: null,
+      };
+      if (this.curAction.corpType == 3) {//特殊往来
+        cQuery.corpType = 4;
+        this.formData.fromCorpId = this.curAction.defaultUnit;
+      } else if (this.curAction.corpType == 2)//客户
+      {
+        cQuery.corpType = 4;
+        cQuery.outType = 2;
+
+      } else if (this.curAction.corpType == 0) {
+        cQuery.corpType = 2;
+      } else return;
+
+
+      getBasicUnitMaintains(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.page.list || [];
+          if (this.curAction.corpType == 3) {
+            for (let i = 0; i < this.fromOptions.length; i++) {
+              if (this.fromOptions[i].erpId == this.formData.fromCorpId) {
+                this.formData.fromCorp = this.fromOptions[i].name;
+              }
+            }
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+
+    storageChange(row) {
+      this.formData.fromCorpId = row.code;
+      this.formData.fromCorp = row.name;
+      if (isBlank(this.formData.fromCorp)) {
+        this.fromSubStorageOptions = [];
+        this.formData.fromSubInvCode = null;
+      } else {
+        this.findSubStorageMethod();
+      }
+    },
+
+    unitChange(row) {
+      this.formData.fromCorpId = row.erpId;
+      this.formData.fromCorp = row.name;
+    },
+    actionChange(item) {
+      this.curAction = this.getActionItem(item);
+      this.formData.fromCorp = null;
+      this.formData.fromSubInvCode = null;
+      this.findMethod();
+    },
+    getActionItem(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i];
+        }
+      }
+    },
+
+    changeFun(row) {
+      let _this = this;
+      _this.multipId = []; //每次改动重置ID
+      row.forEach((item) => {
+        _this.multipId.push(item.id);
+      })
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.billAction = this.busTypes[0].action;
+        })
+        .catch(() => {
+        });
+    },
+    getStorage() {
+      this.storageList = [];
+      filterAllByUser()
+        .then((response) => {
+          this.storageList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    getStockOrderDetailList(orderId) {
+      let query = {
+        orderIdFk: orderId
+      }
+      getBizDetailList(query)
+        .then((response) => {
+          this.detailLoading = false;
+          this.detailList = response.data.list || [];
+        })
+        .catch(() => {
+          this.detailLoading = false;
+          this.detailList = [];
+        });
+    },
+    deleteOrderDetail(index) {
+      for (let i = 0; i < this.detailList.length; i++) {
+        if (index === i) {
+          this.detailList.splice(index, 1);
+          break
+        }
+      }
+    }
+  },
+  created() {
+    if (this.$isBlank(this.formData.corpOrderId)) {
+      let date = new Date();
+      this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
+    }
+    this.getBusType();
+    this.getStorage();
+    this.getStockOrderDetailList(this.curRow.id);
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inout/InvoiceRegister.vue b/src/views/inout/InvoiceRegister.vue
index 45d5cc9c..60f4d23f 100644
--- a/src/views/inout/InvoiceRegister.vue
+++ b/src/views/inout/InvoiceRegister.vue
@@ -43,7 +43,7 @@
           prop="price"
         ></el-table-column>
         <el-table-column
-          label="生产厂家"
+          label="生产企业"
           prop="manufacturer"
           show-overflow-tooltip
         ></el-table-column>
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index bdb5068b..398bb3b6 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -43,7 +43,7 @@
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="150">
+        <el-table-column label="操作" fixed="right" width="150">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -51,6 +51,14 @@
               @click.native.stop="showCodes(scope.row)"
             >编辑
             </el-button>
+
+            <el-button
+              type="text"
+              size="small"
+              @click.native="generOrder(scope.row)"
+            >复制
+            </el-button>
+
             <el-button
               type="text"
               size="small"
@@ -97,7 +105,7 @@
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            label="产品通用名称"
+            label="物资名称"
             prop="coName"
             show-overflow-tooltip
           ></el-table-column>
@@ -128,7 +136,7 @@
             prop="price"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
@@ -216,7 +224,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
@@ -386,6 +394,22 @@
       ></IoEditOrderCodeDetail>
     </el-dialog>
 
+
+    <el-dialog
+      title="根据当前单据生成新单据"
+      :visible.sync="stockChangeVisible"
+      width="85%"
+      v-if="stockChangeVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <DialogcChangeNewOrder
+        :closeDialog="closeDialog"
+        :curRow="curRow"
+      ></DialogcChangeNewOrder>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -399,7 +423,7 @@ import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {getCodeList} from "@/api/inout/code";
 import IoEditOrderCodeDetail from "@/views/inout/IoEditOrderCodeDetail.vue";
-
+import DialogcChangeNewOrder from "./DialogcChangeNewOrder";
 
 const formJson = {
   site_id: "",
@@ -494,7 +518,10 @@ export default {
         }
       },
       order: {},
-      codeDialogVisible: false
+      codeDialogVisible: false,
+
+      stockChangeVisible: false,
+      curRow: null,
     };
   },
   methods: {
@@ -759,6 +786,21 @@ export default {
         this.resultTotal = 0;
       });
     },
+
+    generOrder(row) {
+      this.stockChangeVisible = true;
+      this.curRow = row;
+    },
+
+    closeDialog(type) {
+      this.stockChangeVisible = false;
+      this.getList();
+      if (this.$isNotBlank(type)) {
+        this.detailList = [];
+      }
+    },
+
+
     showCodes(row) {
       this.order.billNo = row.billNo;
       this.codeDialogVisible = true;
@@ -780,7 +822,7 @@ export default {
     };
   },
   components: {
-    IoEditOrderCodeDetail
+    IoEditOrderCodeDetail,DialogcChangeNewOrder
   },
   created() {
 
diff --git a/src/views/inout/codeRel/ioCodeRelEdit.vue b/src/views/inout/codeRel/ioCodeRelEdit.vue
index 52ba8673..d3ec5bc6 100644
--- a/src/views/inout/codeRel/ioCodeRelEdit.vue
+++ b/src/views/inout/codeRel/ioCodeRelEdit.vue
@@ -30,7 +30,7 @@
         <el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh"></el-table-column>
         <el-table-column label="序列号" prop="serialNo"></el-table-column>
-        <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory"></el-table-column>
         <el-table-column label="计量单位" prop="measname"></el-table-column>
         <el-table-column label="创建时间" prop="createTime"></el-table-column>
       </el-table>
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index 98fa54ea..989077c2 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -125,7 +125,7 @@
           </el-table-column>
 
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="150">
             <template slot-scope="scope">
               <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true" @click.native="rowChange(scope.row)">编辑</el-button>
diff --git a/src/views/inout/receive/receiveAuditDetail.vue b/src/views/inout/receive/receiveAuditDetail.vue
index df1a4fea..f56fd118 100644
--- a/src/views/inout/receive/receiveAuditDetail.vue
+++ b/src/views/inout/receive/receiveAuditDetail.vue
@@ -75,7 +75,7 @@
           <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
           <el-table-column label="单据数量" prop="count" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
         </el-table>
       </el-card>
     </el-form>
diff --git a/src/views/inout/uploadManage/uploadOrder.vue b/src/views/inout/uploadManage/uploadOrder.vue
index 897934b6..1c05ff91 100644
--- a/src/views/inout/uploadManage/uploadOrder.vue
+++ b/src/views/inout/uploadManage/uploadOrder.vue
@@ -215,7 +215,7 @@
             prop="price"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
diff --git a/src/views/inventory/DeviceMAOrderCompleted.vue b/src/views/inventory/DeviceMAOrderCompleted.vue
index 19117c66..bbb6c041 100644
--- a/src/views/inventory/DeviceMAOrderCompleted.vue
+++ b/src/views/inventory/DeviceMAOrderCompleted.vue
@@ -65,7 +65,7 @@
         <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc"
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
       </el-table>
 
diff --git a/src/views/inventory/DeviceMAOrderModify.vue b/src/views/inventory/DeviceMAOrderModify.vue
index 6f105b87..c9aeeb0a 100644
--- a/src/views/inventory/DeviceMAOrderModify.vue
+++ b/src/views/inventory/DeviceMAOrderModify.vue
@@ -97,7 +97,7 @@
                            show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
                            show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="ylqxzcrbarmc"
+          <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                            show-overflow-tooltip></el-table-column>
         </el-table>
       </el-form>
diff --git a/src/views/inventory/DeviceReceiveOrderAudit.vue b/src/views/inventory/DeviceReceiveOrderAudit.vue
index 9f56bb1c..4b3eaed5 100644
--- a/src/views/inventory/DeviceReceiveOrderAudit.vue
+++ b/src/views/inventory/DeviceReceiveOrderAudit.vue
@@ -109,7 +109,7 @@
         <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column  label="生产厂家" prop="ylqxzcrbarmc"
+        <el-table-column  label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
       </el-table>
 
diff --git a/src/views/inventory/DeviceReceiveOrderCompleted.vue b/src/views/inventory/DeviceReceiveOrderCompleted.vue
index 62fce61b..bcb973b9 100644
--- a/src/views/inventory/DeviceReceiveOrderCompleted.vue
+++ b/src/views/inventory/DeviceReceiveOrderCompleted.vue
@@ -91,7 +91,7 @@
         <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc"
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
       </el-table>
 
diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
index 40c72b67..326f08be 100644
--- a/src/views/inventory/DeviceReceiveOrderModify.vue
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -157,7 +157,7 @@
           <el-table-column label="生产日期(yyMMdd)" prop="productionDate"></el-table-column>
           <el-table-column label="失效日期(yyMMdd)" prop="expireDate" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
diff --git a/src/views/inventory/InvCountOrderModify.vue b/src/views/inventory/InvCountOrderModify.vue
index 8225b073..44b8ccfe 100644
--- a/src/views/inventory/InvCountOrderModify.vue
+++ b/src/views/inventory/InvCountOrderModify.vue
@@ -123,7 +123,7 @@
           <el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
           <el-table-column label="失效日期(yyMMdd)" prop="expireDate" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button
diff --git a/src/views/inventory/InvMAOrderAudit.vue b/src/views/inventory/InvMAOrderAudit.vue
index 846d15f2..c3d17684 100644
--- a/src/views/inventory/InvMAOrderAudit.vue
+++ b/src/views/inventory/InvMAOrderAudit.vue
@@ -118,7 +118,7 @@
                          show-overflow-tooltip></el-table-column>
         <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column width="200" label="生产厂家" prop="ylqxzcrbarmc"
+        <el-table-column width="200" label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
       </el-table>
 
diff --git a/src/views/inventory/InvMAOrderCompleted.vue b/src/views/inventory/InvMAOrderCompleted.vue
index ca443db5..138eb3e5 100644
--- a/src/views/inventory/InvMAOrderCompleted.vue
+++ b/src/views/inventory/InvMAOrderCompleted.vue
@@ -101,7 +101,7 @@
                          show-overflow-tooltip></el-table-column>
         <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column width="200" label="生产厂家" prop="ylqxzcrbarmc"
+        <el-table-column width="200" label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
       </el-table>
 
diff --git a/src/views/inventory/InvMAOrderModify.vue b/src/views/inventory/InvMAOrderModify.vue
index 7bc95b31..18d0f38c 100644
--- a/src/views/inventory/InvMAOrderModify.vue
+++ b/src/views/inventory/InvMAOrderModify.vue
@@ -142,7 +142,7 @@
                            show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
                            show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="ylqxzcrbarmc"
+          <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                            show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
diff --git a/src/views/inventory/InvPlace.vue b/src/views/inventory/InvPlace.vue
index 97d6be88..3ece1e89 100644
--- a/src/views/inventory/InvPlace.vue
+++ b/src/views/inventory/InvPlace.vue
@@ -49,7 +49,7 @@
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
         <el-table-column label="批准文号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
       </el-table>
       <pagination
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 5d6e48d9..483c9c18 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -68,8 +68,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item class="query-form-item" label="生产厂家:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
+            <el-form-item class="query-form-item" label="生产企业:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
@@ -119,7 +119,7 @@
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
         <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
         <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index 0a56bb5a..c3a8ca85 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -46,7 +46,7 @@
                     <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="spec"  show-overflow-tooltip></el-table-column>
                     <el-table-column label="计量单位" prop="measname"  show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产厂家"  prop="manufactory" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="生产企业"  prop="manufactory" show-overflow-tooltip></el-table-column>
                     <el-table-column label="单据数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 0f2f5636..79c77019 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -102,6 +102,7 @@
                     <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
                     <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
                     <el-table-column width="150" label="申购数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
@@ -114,7 +115,7 @@
                     </el-table-column>
                     <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
                     <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
                     <el-table-column label="操作"  width="120">
                         <template slot-scope="scope">
diff --git a/src/views/purchase/purApply/pureApplyDetailDialog.vue b/src/views/purchase/purApply/pureApplyDetailDialog.vue
index ddf460cd..10f32e10 100644
--- a/src/views/purchase/purApply/pureApplyDetailDialog.vue
+++ b/src/views/purchase/purApply/pureApplyDetailDialog.vue
@@ -123,7 +123,7 @@
                     <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
                     <el-table-column width="150" label="单据数量" prop="count"></el-table-column>
                     <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
                     <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
                 </el-table>
             </el-card>
diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index 49c3b706..3447a4ee 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -128,7 +128,7 @@
                     <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
                     <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
                     <el-table-column width="150" label="单据数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 28599698..1f47340e 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -117,7 +117,7 @@
           </el-table-column>
           <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
           <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="120">
             <template slot-scope="scope">
diff --git a/src/views/purchase/purPlan/purPlanDetailDialog.vue b/src/views/purchase/purPlan/purPlanDetailDialog.vue
index e30c4728..12ebb2ef 100644
--- a/src/views/purchase/purPlan/purPlanDetailDialog.vue
+++ b/src/views/purchase/purPlan/purPlanDetailDialog.vue
@@ -130,7 +130,7 @@
                     <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
                     <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
                     <el-table-column width="150" label="单据数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue
index e13da9f7..63b0ffbe 100644
--- a/src/views/purchase/purPlan/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlan/purPlanEditDialog.vue
@@ -117,7 +117,7 @@
           </el-table-column>
           <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
           <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="120">
             <template slot-scope="scope">
diff --git a/src/views/remind/invWarning.vue b/src/views/remind/invWarning.vue
index d064660e..95d35d5f 100644
--- a/src/views/remind/invWarning.vue
+++ b/src/views/remind/invWarning.vue
@@ -75,7 +75,7 @@
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
         <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
         <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
diff --git a/src/views/thirdSys/invProducts/thrInvProducts.vue b/src/views/thirdSys/invProducts/thrInvProducts.vue
index d75becf1..9be40dc7 100644
--- a/src/views/thirdSys/invProducts/thrInvProducts.vue
+++ b/src/views/thirdSys/invProducts/thrInvProducts.vue
@@ -79,7 +79,7 @@
         <el-table-column label="失效日期" prop="expirationDate" show-overflow-tooltip></el-table-column>
         <el-table-column label="数量" prop="count" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册证号" prop="registerCertNo" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="仓位" prop="warehouseName" show-overflow-tooltip></el-table-column>
         <el-table-column label="货位" prop="spaceName" show-overflow-tooltip></el-table-column>
 
diff --git a/src/views/thirdSys/product/thrProducts.vue b/src/views/thirdSys/product/thrProducts.vue
index 0e3f264e..e42ac7f5 100644
--- a/src/views/thirdSys/product/thrProducts.vue
+++ b/src/views/thirdSys/product/thrProducts.vue
@@ -26,8 +26,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:">
-              <el-input v-model="filterQuery.manufactory" clearable style="width: 90%" placeholder="请输入生产厂家"></el-input>
+            <el-form-item label="生产企业:">
+              <el-input v-model="filterQuery.manufactory" clearable style="width: 90%" placeholder="请输入生产企业"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -66,7 +66,7 @@
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证" prop="registerNo" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="180px">
           <template slot-scope="scope">
             <el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>
diff --git a/src/views/thirdSys/product/thrProductsAdd.vue b/src/views/thirdSys/product/thrProductsAdd.vue
index 64ae78e4..a0116b23 100644
--- a/src/views/thirdSys/product/thrProductsAdd.vue
+++ b/src/views/thirdSys/product/thrProductsAdd.vue
@@ -46,8 +46,8 @@
                 </el-row>
                 <el-row  type="flex">
                     <el-col :span="11" class="el-col">
-                          <el-form-item label="生产厂家:" prop="manufactory">
-                            <el-input style="width: 90%" size="small" placeholder="请输入生产厂家" v-model.trim="newProductData.manufactory"></el-input>
+                          <el-form-item label="生产企业:" prop="manufactory">
+                            <el-input style="width: 90%" size="small" placeholder="请输入生产企业" v-model.trim="newProductData.manufactory"></el-input>
                           </el-form-item>
                     </el-col>
                     <el-col :span="11" class="el-col">
@@ -189,7 +189,7 @@ export default {
                 return;
             }
             if (this.$isBlank(this.newProductData.manufactory)) {
-                this.$message.warning("生产厂家不能为空！");
+                this.$message.warning("生产企业不能为空！");
                 return;
             }
             if (this.$isBlank(this.newProductData.registerNo)) {
diff --git a/src/views/thirdSys/product/thrProductsDetail.vue b/src/views/thirdSys/product/thrProductsDetail.vue
index 460d5eac..586abc16 100644
--- a/src/views/thirdSys/product/thrProductsDetail.vue
+++ b/src/views/thirdSys/product/thrProductsDetail.vue
@@ -22,7 +22,7 @@
               </el-row>
               <el-row  type="flex">
                 <el-col :span="11" class="el-col">
-                  <el-form-item label="生产厂家:" prop="manufactory">
+                  <el-form-item label="生产企业:" prop="manufactory">
                     <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.manufactory"></el-input>
                   </el-form-item>
                 </el-col>
diff --git a/src/views/thirdSys/product/thrProductsImportDetail.vue b/src/views/thirdSys/product/thrProductsImportDetail.vue
index c246e5dd..e772d57b 100644
--- a/src/views/thirdSys/product/thrProductsImportDetail.vue
+++ b/src/views/thirdSys/product/thrProductsImportDetail.vue
@@ -29,7 +29,7 @@
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
                 <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
                 <el-table-column label="注册证号" prop="registerNo" show-overflow-tooltip></el-table-column>
-                <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
             </el-table>
           <pagination
             v-show="total>0"
diff --git a/src/views/thirdSys/product/thrProductsSelect.vue b/src/views/thirdSys/product/thrProductsSelect.vue
index 0704dd7f..e875dcac 100644
--- a/src/views/thirdSys/product/thrProductsSelect.vue
+++ b/src/views/thirdSys/product/thrProductsSelect.vue
@@ -26,8 +26,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="生产厂家:">
-            <el-input v-model="filterQuery.manufactory" clearable="true" style="width: 90%" placeholder="请输入生产厂家"></el-input>
+          <el-form-item label="生产企业:">
+            <el-input v-model="filterQuery.manufactory" clearable="true" style="width: 90%" placeholder="请输入生产企业"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -72,7 +72,7 @@
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册证号" prop="registerNo" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="60">
           <template slot-scope="scope">
             <el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>
diff --git a/vue.config.js b/vue.config.js
index 3cfb4098..562e4b45 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.180:9991`,
+        target: `http://192.168.0.166:9991`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''