diff --git a/.env.production b/.env.production
index a0ae4e4..df046e4 100644
--- a/.env.production
+++ b/.env.production
@@ -15,13 +15,13 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
-VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 
 # 文明懂
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
 
 # 刘恩典
-# VUE_APP_BASE_API = 'http://192.168.0.243:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://192.168.0.243:9150/UDI_SPMS_SERVER/'
 
 # 漳州中医院
 # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
diff --git a/src/api/supplier/supProductsAddDi.js b/src/api/supplier/supProductsAddDi.js
index fa60fa8..e35efc5 100644
--- a/src/api/supplier/supProductsAddDi.js
+++ b/src/api/supplier/supProductsAddDi.js
@@ -1,43 +1,43 @@
 import axios from "@/utils/request";
 
 export function getThrDiProducts(query) {
-    return axios({
-        url: "/udiwms/thrsys/getThrProductsDiList",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/thrsys/getThrProductsDiList",
+    method: "get",
+    params: query
+  });
 }
 
 export function delThrDiProducts(query) {
-    return axios({
-        url: "/udiwms/thrsys/delThrAddDiProducts",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/thrsys/delThrAddDiProducts",
+    method: "post",
+    data: query
+  });
 }
 
 export function updateDiProduct(data) {
-    return axios({
-        url: '/udiwms/thrsys/updateThrAddDiProducts',
-        method: 'post',
-        data: data
-    })
+  return axios({
+    url: '/udiwms/thrsys/updateThrAddDiProducts',
+    method: 'post',
+    data: data
+  })
 }
 
 export function addDiProduct(data) {
-    return axios({
-        url: '/udiwms/thrsys/addThrAddDiProducts',
-        method: 'post',
-        data: data
-    })
+  return axios({
+    url: '/udiwms/thrsys/addThrAddDiProducts',
+    method: 'post',
+    data: data
+  })
 }
 
 export function getDiProductDetail(query) {
-    return axios({
-        url: "/udiwms/thrsys/getDiProductDetail",
-        method: "get",
-        params: query
-    })
+  return axios({
+    url: "/udiwms/thrsys/getDiProductDetail",
+    method: "get",
+    params: query
+  })
 }
 
 export function gupdateDiProductDetail(query) {
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index a89f1de..d673c66 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -529,10 +529,11 @@
                 <el-select v-model="inputQuery.checkWebNew" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
+                  <el-option label="业务单自动生成扫码单" :value="4"></el-option>
 
                 </el-select>
               </el-col>
@@ -552,10 +553,11 @@
                 <el-select v-model="inputQuery.checkPdaUn" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
+                  <el-option label="业务单自动生成扫码单" :value="4"></el-option>
 
                 </el-select>
               </el-col>
@@ -575,10 +577,11 @@
                 <el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
+                  <el-option label="业务单自动生成扫码单" :value="4"></el-option>
 
                 </el-select>
               </el-col>
@@ -598,10 +601,11 @@
                 <el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
+                  <el-option label="业务单自动生成扫码单" :value="4"></el-option>
 
                 </el-select>
               </el-col>
@@ -621,10 +625,11 @@
                 <el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
+                  <el-option label="业务单自动生成扫码单" :value="4"></el-option>
 
                 </el-select>
               </el-col>
@@ -644,11 +649,11 @@
                 <el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
-
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
+                  <el-option label="业务单自动生成扫码单" :value="4"></el-option>
                 </el-select>
               </el-col>
               <el-divider direction="vertical"></el-divider>
@@ -666,10 +671,11 @@
                 <el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
+                  <el-option label="业务单自动生成扫码单" :value="4"></el-option>
 
                 </el-select>
               </el-col>
@@ -689,11 +695,11 @@
                 <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
-
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
+                  <el-option label="业务单自动生成扫码单" :value="4"></el-option>
                 </el-select>
               </el-col>
               <el-divider direction="vertical"></el-divider>
@@ -711,10 +717,11 @@
                 <el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
+                  <el-option label="业务单自动生成扫码单" :value="4"></el-option>
 
                 </el-select>
               </el-col>
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index 1913a5b..4411bd6 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -107,7 +107,8 @@
         <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="备注:">
-              <el-input v-model="filterQuery.unionRemark" placeholder="请输入备注" style="width: 90%" clearable="true"></el-input>
+              <el-input v-model="filterQuery.unionRemark" placeholder="请输入备注" style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -339,9 +340,10 @@
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            label="发票代码" width="150"
-            prop="invoiceCode"
+            label="发票编码" width="150"
+            prop="invoiceEncode"
           ></el-table-column>
+
           <el-table-column
             label="物资名称"
             prop="cpmctymc" width="150"
@@ -357,15 +359,15 @@
             prop="batchNo"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column
+            label="发票代码" width="150"
+            prop="invoiceCode"
+          ></el-table-column>
           <el-table-column
             label="机器编码" width="150"
             prop="machineNo"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
-            label="发票编码" width="150"
-            prop="invoiceEncode"
-          ></el-table-column>
           <el-table-column
             label="开票日期" width="150"
             prop="invoiceDate"
@@ -622,7 +624,7 @@ export default {
         "11": "仓库盘点",
         "12": "采购计划",
         "13": "领用单据",
-        "14": "第三方系统单据","15":"采购订单"
+        "14": "第三方系统单据", "15": "采购订单"
       },
       deleteData: {
         id: "",
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index 54d6858..2d764d1 100644
--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@@ -1,49 +1,49 @@
 <template>
   <div>
     <el-card class="el-card">
-        <el-form :model="unionQuery" size="mini" label-width="130px" v-show="showSearch">
-          <el-row>
-            <el-col :span="12">
+      <el-form :model="unionQuery" size="mini" label-width="130px" v-show="showSearch">
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="UDI码:">
               <el-input v-model="unionQuery.udiCode" style="width: 90%" placeholder="请扫描或输入UDI码"
                         clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
             </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="DI:">
-                <el-input  v-model="unionQuery.nameCode" style="width: 90%"  clearable="true" size="mini"
-                           placeholder="请输入完整DI"
-                           @keyup.enter.native="keyup_submit($event)"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="规格型号:">
-                <el-input
-                  v-model="unionQuery.ggxh" clearable="true"
-                  style="width: 90%"
-                  :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                  placeholder="规格型号"
-                  size="mini"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="注册证:">
-                <el-input
-                  v-model="unionQuery.zczbhhzbapzbh" clearable="true"
-                  style="width: 90%"
-                  :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                  placeholder="注册证/备案号"
-                  size="mini"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="DI:">
+              <el-input v-model="unionQuery.nameCode" style="width: 90%" clearable="true" size="mini"
+                        placeholder="请输入完整DI"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:">
+              <el-input
+                v-model="unionQuery.ggxh" clearable="true"
+                style="width: 90%"
+                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
+                placeholder="规格型号"
+                size="mini"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="注册证:">
+              <el-input
+                v-model="unionQuery.zczbhhzbapzbh" clearable="true"
+                style="width: 90%"
+                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
+                placeholder="注册证/备案号"
+                size="mini"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
             <el-form-item label="医疗器械注册人:">
               <el-select
                 v-model="unionQuery.ylqxzcrbarmc"
@@ -67,8 +67,8 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            </el-col>
-            <el-col :span="6">
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="器械通用名称:">
               <el-input
                 :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
@@ -78,9 +78,9 @@
                 placeholder="器械通用名称"
               ></el-input>
             </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+          </el-col>
+        </el-row>
+      </el-form>
 
 
       <div class="top-right-btn">
@@ -88,27 +88,30 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="searchList" size="mini">查询</el-button>
-          <el-button type="primary"  icon="el-icon-refresh" @click="getSuperSeaech" size="mini">国家同步库查询</el-button>
-          <el-button type="primary" size="mini" icon="el-icon-bottom-right" @click="checkCombine" :loading="combineLoading">选入</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="getSuperSeaech" size="mini">国家同步库查询</el-button>
+          <el-button type="primary" size="mini" icon="el-icon-bottom-right" @click="checkCombine"
+                     :loading="combineLoading">选入
+          </el-button>
         </el-button-group>
       </div>
 
       <el-divider style="margin: 15px"></el-divider>
 
-        <el-table :data="udidlList" style="width: 100%" v-loading="loading" border highlight-current-row="true"  :row-class-name="tableRowClassName" @current-change="handleErpChange" ref="diList">
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column label="产品标识" prop="nameCode"  show-overflow-tooltip></el-table-column>
-          <el-table-column label="物资名称" prop="cpmctymc"  show-overflow-tooltip></el-table-column>
-          <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册证编号"  prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button  type="text"  size="small"  @click="diDetail(scope.row)">详情</el-button>
-            </template>
-          </el-table-column>
-
-        </el-table>
+      <el-table :data="udidlList" style="width: 100%" v-loading="loading" border highlight-current-row="true"
+                :row-class-name="tableRowClassName" @current-change="handleErpChange" ref="diList">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册证编号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="diDetail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+
+      </el-table>
 
       <pagination
         v-show="total>0"
@@ -122,25 +125,25 @@
 
     <el-card class="el-card">
       <el-form :model="editQuery" ref="editQuery" border label-width="100px">
-<!--        <el-row :gutter="20" class="el-row" type="flex">-->
-<!--          <H3 style="margin-left: 10px;margin-bottom: 15px">产品信息补齐：</H3>-->
-<!--        </el-row>-->
-<!--        <el-row :gutter="20" class="el-row" type="flex">-->
-<!--          <el-col :span="18" class="el-col">-->
-<!--            <el-form-item label="产品编码预上传至第三方系统:" label-width="220px">-->
-<!--              <el-checkbox-group v-model="editQuery.selectThirdSys">-->
-<!--                <el-checkbox-->
-<!--                  v-for="item in thirdSys"-->
-<!--                  :key="item.thirdId"-->
-<!--                  :label="item.thirdId"-->
-<!--                >{{ item.thirdName }}-->
-<!--                </el-checkbox-->
-<!--                >-->
-<!--              </el-checkbox-group>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--        </el-row>-->
+        <!--        <el-row :gutter="20" class="el-row" type="flex">-->
+        <!--          <H3 style="margin-left: 10px;margin-bottom: 15px">产品信息补齐：</H3>-->
+        <!--        </el-row>-->
+        <!--        <el-row :gutter="20" class="el-row" type="flex">-->
+        <!--          <el-col :span="18" class="el-col">-->
+        <!--            <el-form-item label="产品编码预上传至第三方系统:" label-width="220px">-->
+        <!--              <el-checkbox-group v-model="editQuery.selectThirdSys">-->
+        <!--                <el-checkbox-->
+        <!--                  v-for="item in thirdSys"-->
+        <!--                  :key="item.thirdId"-->
+        <!--                  :label="item.thirdId"-->
+        <!--                >{{ item.thirdName }}-->
+        <!--                </el-checkbox-->
+        <!--                >-->
+        <!--              </el-checkbox-group>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+        <!--        </el-row>-->
 
         <el-divider>
 
@@ -154,7 +157,8 @@
           </el-col>
           <el-col :span="12" class="el-col">
             <el-form-item label="医保编码:">
-              <el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm" @input="change($event)"></el-input>
+              <el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"
+                        @input="change($event)"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -167,7 +171,8 @@
           </el-col>
           <el-col :span="12" class="el-col">
             <el-form-item label="生产企业:">
-              <el-input style="width: 65%" size="small" v-model="editQuery.manufactory" splaceholder="请输入内容" @input="change($event)"></el-input>
+              <el-input style="width: 65%" size="small" v-model="editQuery.manufactory" splaceholder="请输入内容"
+                        @input="change($event)"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -180,7 +185,7 @@
           </el-col>
           <el-col :span="12" class="el-col">
             <el-form-item label="产品描述:">
-              <el-input style="width: 65%" size="small" splaceholder="请输入内容"   v-model="editQuery.cpms"></el-input>
+              <el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -188,7 +193,8 @@
         <el-row>
           <el-col :span="12" class="el-col">
             <el-form-item label="产品价格:">
-              <el-input style="width: 65%" size="small" splaceholder="请输入内容" type="number" step="0.01" v-model="editQuery.price"></el-input>
+              <el-input style="width: 65%" size="small" splaceholder="请输入内容" type="number" step="0.01"
+                        v-model="editQuery.price"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -196,13 +202,15 @@
         <el-row>
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
             <el-form-item :label="productRemarkSet.remarkTitle1 ">
-              <el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak1"></el-input>
+              <el-input style="width: 65%" size="small" splaceholder="请输入内容"
+                        v-model="editQuery.basicPrductRemak1"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
             <el-form-item :label="productRemarkSet.remarkTitle2 ">
-            <el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak2"></el-input>
+              <el-input style="width: 65%" size="small" splaceholder="请输入内容"
+                        v-model="editQuery.basicPrductRemak2"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -210,27 +218,31 @@
         <el-row>
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
             <el-form-item :label="productRemarkSet.remarkTitle3 ">
-              <el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak3"></el-input>
+              <el-input style="width: 65%" size="small" splaceholder="请输入内容"
+                        v-model="editQuery.basicPrductRemak3"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
             <el-form-item :label="productRemarkSet.remarkTitle4 ">
-            <el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak4"></el-input>
+              <el-input style="width: 65%" size="small" splaceholder="请输入内容"
+                        v-model="editQuery.basicPrductRemak4"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <el-row >
+        <el-row>
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
             <el-form-item :label="productRemarkSet.remarkTitle5 ">
-            <el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak5"></el-input>
+              <el-input style="width: 65%" size="small" splaceholder="请输入内容"
+                        v-model="editQuery.basicPrductRemak5"></el-input>
             </el-form-item>
           </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-input style="width: 65%" size="small" splaceholder="请输入内容"
+                        v-model="editQuery.basicPrductRemak6"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -238,13 +250,15 @@
         <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-input style="width: 65%" size="small" splaceholder="请输入内容"
+                        v-model="editQuery.basicPrductRemak7"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
             <el-form-item :label="productRemarkSet.remarkTitle8">
-              <el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.basicPrductRemak8"></el-input>
+              <el-input style="width: 65%" size="small" splaceholder="请输入内容"
+                        v-model="editQuery.basicPrductRemak8"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -270,13 +284,13 @@
 </template>
 
 <script>
-import { getUdiInfos, filterCompany, superSearch } from '../../../api/basic/udiInfo'
-import { combineUdi } from '../../../api/basic/udiRelevance'
-import { addDiProduct } from '@/api/supplier/supProductsAddDi'
+import {getUdiInfos, filterCompany, superSearch} from '../../../api/basic/udiInfo'
+import {combineUdi} from '../../../api/basic/udiRelevance'
+import {addDiProduct} from '@/api/supplier/supProductsAddDi'
 import selectDiDetail from './selectDIDetailDialog'
 import store from '@/store'
-import { getBasicThirdSys } from '@/api/basic/basicThirdSys'
-import { finProductSet } from '@/api/param/systemParamConfig'
+import {getBasicThirdSys} from '@/api/basic/basicThirdSys'
+import {finProductSet} from '@/api/param/systemParamConfig'
 
 export default {
   name: 'closeDialog',
@@ -350,6 +364,7 @@ export default {
         measname: null,
         sptm: null,
         uuids: null,
+        devKeys: [],
         customerId: store.getters.customerId
 
       },
@@ -361,7 +376,7 @@ export default {
     }
   },
   methods: {
-    change(e){
+    change(e) {
       this.$forceUpdate(e);
     },
     onReset() {
@@ -379,10 +394,10 @@ export default {
       this.udidlList = [];
       // this.getList();
     },
-    clearAll(){
-      this.unionQuery.cpmctymc=null;
-      this.unionQuery.ggxh=null;
-      this.unionQuery.zczbhhzbapzbh=null;
+    clearAll() {
+      this.unionQuery.cpmctymc = null;
+      this.unionQuery.ggxh = null;
+      this.unionQuery.zczbhhzbapzbh = null;
 
     },
     searchList() {
@@ -473,7 +488,7 @@ export default {
       this.unionQuery.page = val.page
       this.getList()
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName({row, rowIndex}) {
       if (row.check) return 'warning-row'
       return ''
     },
@@ -499,7 +514,10 @@ export default {
       }
       let uuids = []
       uuids.push(this.curSelectDi.uuid)
+      let devKeys = []
+      devKeys.push(this.curSelectDi.deviceRecordKey)
       this.editQuery.uuids = uuids
+      this.editQuery.devKeys = devKeys
       addDiProduct(this.editQuery).then((res) => {
         if (res.code === 20000) {
           this.$message.success('添加成功')