diff --git a/.env.development b/.env.development
index c36d00d3..eed92e7d 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://192.168.0.166:9991'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 
diff --git a/.env.production b/.env.production
index f54ba371..13382a18 100644
--- a/.env.production
+++ b/.env.production
@@ -37,7 +37,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
 
 # 片仔癀诊断
-# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
+ VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/
diff --git a/src/views/inout/DialogEditCode.vue b/src/views/inout/DialogEditCode.vue
index 01a8262b..327ac155 100644
--- a/src/views/inout/DialogEditCode.vue
+++ b/src/views/inout/DialogEditCode.vue
@@ -18,7 +18,7 @@
             <el-input v-model="editData.produceDate" auto-complete="off"
                       oninput="if(value.length>6)value=value.slice(0,6)"
                       type="number"
-                      :disabled="editType!=1"></el-input>
+                      :disabled="editType!=1 || editData.produceDate!=null"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="11">
@@ -26,19 +26,19 @@
             <el-input v-model="editData.expireDate" auto-complete="off"
                       oninput="if(value.length>6)value=value.slice(0,6)"
                       type="number"
-                      :disabled="editType!=1"></el-input>
+                      :disabled="editType!=1 || editData.expireDate!=null"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="11">
           <el-form-item prop="batchNo" label="批次号">
-            <el-input v-model="editData.batchNo" auto-complete="off" :disabled="editType!=1"></el-input>
+            <el-input v-model="editData.batchNo" auto-complete="off" :disabled="editType!=1 || editData.batchNo!=null"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="11">
           <el-form-item prop="serialNo" label="序列号">
-            <el-input v-model="editData.serialNo" auto-complete="off" :disabled="editType!=1"></el-input>
+            <el-input v-model="editData.serialNo" auto-complete="off" :disabled="editType!=1 || editData.serialNo!=null"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/inout/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue
index af02dc4f..2b771369 100644
--- a/src/views/inout/DialogSelectProduct.vue
+++ b/src/views/inout/DialogSelectProduct.vue
@@ -140,7 +140,10 @@
       <el-form :model="form">
         <el-form-item label="" prop="isGive">
           <el-radio-group v-model="currentCert">
-            <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -170,6 +173,7 @@
 import {addBizProduct} from "@/api/inout/orderDetailCode";
 import {filterCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance";
 import udiRlDetailDialog from "../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",//选入耗材字典产品对话框
@@ -282,7 +286,7 @@ export default {
         return;
       }
       let str = this.currentRow.zczbhhzbapzbh;
-      if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;
diff --git a/src/views/inout/DialogcChangeNewOrder.vue b/src/views/inout/DialogcChangeNewOrder.vue
index 8e98084f..fd0b08a3 100644
--- a/src/views/inout/DialogcChangeNewOrder.vue
+++ b/src/views/inout/DialogcChangeNewOrder.vue
@@ -5,8 +5,8 @@
       <el-button-group style="display: flex;margin: -40px 0 20px 80%; height: 35px">
 
         <el-button
-            type="primary"
-            @click.native="submit('0')"
+          type="primary"
+          @click.native="submit('0')"
         >生成单据
         </el-button
         >
@@ -22,11 +22,11 @@
         <el-col :span="11">
           <el-form-item prop="actDate" label="单据时间">
             <el-date-picker
-                v-model="formData.actDate"
-                type="datetime"
-                placeholder="日期"
-                :disabled="true"
-                style="width: 90%; "
+              v-model="formData.actDate"
+              type="datetime"
+              placeholder="日期"
+              :disabled="true"
+              style="width: 90%; "
             >
             </el-date-picker>
           </el-form-item>
@@ -37,10 +37,10 @@
           <el-form-item prop="locStorageCode" label="当前仓库">
             <el-select v-model="formData.invCode" placeholder="当前仓库信息" @change="locCHange" style="width: 90%">
               <el-option
-                  v-for="item in curInvOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
+                v-for="item in curInvOptions"
+                :key="item.name"
+                :label="item.name"
+                :value="item.code">
                 <span style="float: left">{{ item.name }}</span>
               </el-option>
             </el-select>
@@ -51,10 +51,10 @@
             <el-select v-model="formData.action" placeholder="请选择单据类型" style="width: 90%"
                        @change="actionChange">
               <el-option
-                  v-for="item in busTypeOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.action">
+                v-for="item in busTypeOptions"
+                :key="item.name"
+                :label="item.name"
+                :value="item.action">
                 <span style="float: left">{{ item.name }}</span>
               </el-option>
             </el-select>
@@ -66,21 +66,21 @@
           <el-form-item class="query-form-item" prop="fromCorp" label="往来信息"
                         v-if="curAction.corpType === 0 || curAction.corpType === 2 || (curAction.corpType === 1 && !curAction.genUnit)">
             <el-select
-                v-model="formData.fromCorp"
-                filterable
-                remote
-                clearable="true"
-                style="width: 90%"
-                reserve-keyword
-                placeholder="请输入往来单位"
-                :remote-method="findMethod"
-                :loading="loading"
+              v-model="formData.fromCorp"
+              filterable
+              remote
+              clearable="true"
+              style="width: 90%"
+              reserve-keyword
+              placeholder="请输入往来单位"
+              :remote-method="findMethod"
+              :loading="loading"
             >
               <el-option
-                  v-for="item in fromOptions"
-                  :key="item.erpId"
-                  :label="item.name"
-                  :value="item.erpId"
+                v-for="item in fromOptions"
+                :key="item.erpId"
+                :label="item.name"
+                :value="item.erpId"
               >
                 <span style="float: left">{{ item.name }}</span>
               </el-option>
@@ -91,10 +91,10 @@
             <el-select v-model="formData.fromInvCode" placeholder="请选择往来仓库信息" clearable="true" style="width: 90%"
             >
               <el-option
-                  v-for="item in fromInvOptions"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item.code">
+                v-for="item in fromInvOptions"
+                :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
@@ -130,52 +130,52 @@
               style="width: 100%; margin-top: 20px;">
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
-          label="物资名称"
-          prop="coName"
-          show-overflow-tooltip
+        label="物资名称"
+        prop="coName"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="规格型号"
-          prop="spec"
-          show-overflow-tooltip
+        label="规格型号"
+        prop="spec"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="批次号"
-          prop="batchNo"
-          show-overflow-tooltip
+        label="批次号"
+        prop="batchNo"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="生产日期"
-          prop="productDate"
+        label="生产日期"
+        prop="productDate"
       ></el-table-column>
       <el-table-column
-          label="失效日期"
-          prop="expireDate"
+        label="失效日期"
+        prop="expireDate"
       ></el-table-column>
       <el-table-column
-          label="单据数量"
-          prop="count"
+        label="单据数量"
+        prop="count"
       ></el-table-column>
       <el-table-column
-          label="价格"
-          prop="price"
+        label="价格"
+        prop="price"
       ></el-table-column>
       <el-table-column
-          label="生产企业"
-          prop="manufacturer"
-          show-overflow-tooltip
+        label="生产企业"
+        prop="manufacturer"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="注册/备案凭证号"
-          prop="certCode"
-          show-overflow-tooltip
+        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)"
+            type="text"
+            size="small"
+            @click="deleteOrderDetail(scope.$index, scope.row)"
           >删除
           </el-button>
         </template>
@@ -260,29 +260,27 @@ export default {
         this.$message.warning("请选择单据类型！");
         return;
       }
-      if ((this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)) && this.$isBlank(this.formData.fromCorp)) {
-        this.$message.error('当前往来信息不能为空');
-        return;
-      }
       if (this.$isBlank(this.formData.invCode)) {
         this.$message.error("当前分库不能为空");
         return;
       }
-
-      if (this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit && this.$isBlank(this.formData.fromCorp))) {
+      if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) {
+        this.$message.error('往来单位不能为空');
+        return;
+      }
+      if ((this.curAction.corpType === 2 && this.$isBlank(this.formData.fromCorp))) {
         this.$message.error("往来单位不能为空");
         return;
       }
-
-      if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) {
+      if ((this.curAction.corpType === 4 && this.$isBlank(this.formData.fromCorp))) {
         this.$message.error("往来单位不能为空");
         return;
       }
-
-      if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) {
-        this.$message.error('往来单位不能为空');
+      if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) {
+        this.$message.error("往来单位不能为空");
         return;
       }
+
       if (this.detailList.length == 0) {
         this.$message.error("产品列表不能为空");
         return;
@@ -317,15 +315,15 @@ export default {
         products: products
       };
       stockOrderChange(tQuery)
-          .then((response) => {
-            if (response.code === 20000) {
-              this.$message.success("提交成功");
-              this.closeDialog();
-            } else {
-              this.$message.error(response.message);
-            }
-            this.loading = false;
-          });
+        .then((response) => {
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        });
     },
 
 
@@ -333,15 +331,15 @@ export default {
     findInvListByUser() {
       this.curInvOptions = [];
       findInvByUser()
-          .then(response => {
-            this.curInvOptions = response.data || [];
-            if (this.curInvOptions != null && this.curInvOptions.length > 0 && this.formData.invWarehouseCode == null) {
-              this.formData.invWarehouseCode = this.curInvOptions[0].code;
-              this.getBusTypeByInv()
-            }
-          })
-          .catch(() => {
-          });
+        .then(response => {
+          this.curInvOptions = response.data || [];
+          if (this.curInvOptions != null && this.curInvOptions.length > 0 && this.formData.invWarehouseCode == null) {
+            this.formData.invWarehouseCode = this.curInvOptions[0].code;
+            this.getBusTypeByInv()
+          }
+        })
+        .catch(() => {
+        });
     },
 
 
@@ -351,11 +349,11 @@ export default {
         code: this.formData.invCode,
       };
       findByInvUser(query)
-          .then((response) => {
-            this.busTypeOptions = response.data || [];
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          this.busTypeOptions = response.data || [];
+        })
+        .catch(() => {
+        });
     },
 
 
@@ -371,11 +369,11 @@ export default {
         pcode: invCode
       };
       filterSubByInv(query)
-          .then((response) => {
-            this.subInvList = response.data || [];
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          this.subInvList = response.data || [];
+        })
+        .catch(() => {
+        });
     },
 
     findStorageMethod(query) {
@@ -386,11 +384,11 @@ export default {
         locInvCode: this.formData.locStorageCode,
       };
       filterAllByLoc(cQuery)
-          .then((response) => {
-            this.fromStorageOptions = response.data || [];
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          this.fromStorageOptions = response.data || [];
+        })
+        .catch(() => {
+        });
     },
     findMethod(query) {
       this.fromOptions = [];
@@ -410,13 +408,13 @@ export default {
         cQuery.corpType = 2;
       } else return;
       getBasicUnitMaintains(cQuery)
-          .then((response) => {
-            this.loading = false;
-            this.fromOptions = response.data.list || [];
-          })
-          .catch(() => {
-            this.loading = false;
-          });
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
 
 
@@ -451,14 +449,14 @@ export default {
         locInvCode: this.formData.invCode,
       };
       findByFrom(cQuery)
-          .then((response) => {
-            this.fromInvOptions = response.data || [];
-            if (val == 1) {
-              this.formData.fromInvCode = this.fromInvOptions[0].code;
-            }
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          this.fromInvOptions = response.data || [];
+          if (val == 1) {
+            this.formData.fromInvCode = this.fromInvOptions[0].code;
+          }
+        })
+        .catch(() => {
+        });
     },
 
     changeFun(row) {
@@ -475,14 +473,14 @@ export default {
         orderIdFk: orderId
       }
       getBizDetailList(query)
-          .then((response) => {
-            this.detailLoading = false;
-            this.detailList = response.data.list || [];
-          })
-          .catch(() => {
-            this.detailLoading = false;
-            this.detailList = [];
-          });
+        .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++) {
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index b83cb418..fcf1d82d 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="单号"
+              <el-input v-model="filterQuery.billNo" placeholder="请输入单号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
@@ -102,7 +102,13 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
+        </el-row>
+        <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-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -169,6 +175,7 @@
         </el-table-column>
         <el-table-column label="总金额" prop="allAmount" width="120">
         </el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.status)">{{
@@ -185,7 +192,6 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"
@@ -558,6 +564,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: null,
+        unionRemark: null,
       },
       determineVisible: false,
       determineData: null,
diff --git a/src/views/inout/InvoiceSelectRegByOrder.vue b/src/views/inout/InvoiceSelectRegByOrder.vue
index 2a070819..228b17b4 100644
--- a/src/views/inout/InvoiceSelectRegByOrder.vue
+++ b/src/views/inout/InvoiceSelectRegByOrder.vue
@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="单号"
+              <el-input v-model="filterQuery.billNo" placeholder="请输入单号"
                         style="width: 90%"
                         clearable="true"
               ></el-input>
@@ -48,29 +48,12 @@
         </el-row>
         <el-row>
 
-          <el-col :span="8" v-if="showSup">
-            <el-form-item class="query-form-item" label="送货单位:">
-              <el-select
-                v-model="filterQuery.fromCorp"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="送货单位"
-                :remote-method="findMethod"
-                size="mini"
-                :loading="corpLoading"
-                style="width: 90%"
-              >
-                <el-option
-                  v-for="item in fromOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.erpId"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
+          <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-form-item>
           </el-col>
 
@@ -108,6 +91,33 @@
           </el-col>
 
         </el-row>
+        <el-row>
+          <el-col :span="8" v-if="showSup">
+            <el-form-item class="query-form-item" label="送货单位:">
+              <el-select
+                  v-model="filterQuery.fromCorp"
+                  filterable
+                  remote
+                  clearable="true"
+                  reserve-keyword
+                  placeholder="送货单位"
+                  :remote-method="findMethod"
+                  size="mini"
+                  :loading="corpLoading"
+                  style="width: 90%"
+              >
+                <el-option
+                    v-for="item in fromOptions"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
@@ -143,6 +153,7 @@
         </el-table-column>
         <el-table-column label="总金额" prop="allAmount" width="120">
         </el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.status)">{{
@@ -399,7 +410,8 @@ export default {
         limit: 10,
         startTime: null,
         endTime: null,
-        invCode: null
+        invCode: null,
+        unionRemark: null
       },
       determineVisible: false,
       determineData: null,
diff --git a/src/views/inventory/InvCheckPlace.vue b/src/views/inventory/InvCheckPlace.vue
index 1b878b2f..0d3dd799 100644
--- a/src/views/inventory/InvCheckPlace.vue
+++ b/src/views/inventory/InvCheckPlace.vue
@@ -226,6 +226,7 @@ export default {
         limit: 20,
       };
       this.getList();
+      this.invChange();
     },
     onSubmit() {
       this.filterQuery.page = 1;
diff --git a/src/views/inventory/InvOutPlace.vue b/src/views/inventory/InvOutPlace.vue
index cc59d12c..b9c27e6f 100644
--- a/src/views/inventory/InvOutPlace.vue
+++ b/src/views/inventory/InvOutPlace.vue
@@ -208,6 +208,7 @@ export default {
         limit: 20,
       };
       this.getList();
+      this.invChange();
     },
     onSubmit() {
       this.filterQuery.page = 1;
diff --git a/src/views/inventory/InvPlace.vue b/src/views/inventory/InvPlace.vue
index 0f594461..5162a537 100644
--- a/src/views/inventory/InvPlace.vue
+++ b/src/views/inventory/InvPlace.vue
@@ -238,6 +238,7 @@ export default {
         limit: 20,
       };
       this.getList();
+      this.invChange();
     },
     onSubmit() {
       this.filterQuery.page = 1;
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index d54faa35..102e9b41 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -182,8 +182,8 @@ export default {
       formName: null,
       invCodebe: null,
       formMap: {
-        add: "新增采购计划",
-        update: "采购计划审核",
+        add: "新增采购订单",
+        update: "采购订单审核",
       },
       statusMap: {
         1: "草稿",
diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index b2fabf3e..ae37b1e8 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -261,9 +261,9 @@ export default {
     saveOrder(status) {
       let tip = "";
       if (status == "3") {
-        tip = "是否确定通过该采购计划？";
+        tip = "是否确定通过该采购订单？";
       } else {
-        tip = "是否确定拒绝该采购计划？";
+        tip = "是否确定拒绝该采购订单？";
       }
       this.$confirm(tip, "提示", {
         confirmButtonText: "确定",
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 37ce3403..22086fb2 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -398,10 +398,6 @@ export default {
         })
     },
     selectProductFunction() {
-      if (this.$isBlank(this.formData.supId)) {
-        this.$message.warning("请先选择供应商！");
-        return;
-      }
       this.selectProductVisible = true;
       //当父id为空的时候生成id
       if (this.pId == null) {
@@ -428,9 +424,6 @@ export default {
         .then((response) => {
           this.codeArray = response.data.list || [];
           this.total = response.data.total || 0;
-          if (this.total > 0) {
-            this.corpOrderIdDisabled = true;
-          }
           this.loading = false;
         })
         .catch(() => {
@@ -594,7 +587,6 @@ export default {
       this.sValue = this.formData.corpName;
       this.findMethod(this.formData.supId);
       this.getStockOrderDetailList();
-      this.corpOrderIdDisabled = true;
     } else {
       var date = new Date();
       this.formData = {
diff --git a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
index a6781b3c..4f639c5c 100644
--- a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
@@ -1,440 +1,444 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <div>
-                <el-form :inline="true" :model="listQuery" size="mini">
-                    <el-row style="margin-top: 15px;width: 1000px">
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.udiCode"
-                                      style="width: 600px"
-                                      placeholder="请扫描或输入UDI码"
-                                      clearable="true"
-                                      @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                    </el-row>
+  <div>
+    <el-card class="el-card">
+      <div>
+        <el-form :inline="true" :model="listQuery" size="mini">
+          <el-row style="margin-top: 15px;width: 1000px">
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.udiCode"
+                        style="width: 600px"
+                        placeholder="请扫描或输入UDI码"
+                        clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-row>
 
-                    <el-row>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
-                                      clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
-                        </el-form-item>
-                    </el-row>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-row>
 
-                    <el-row>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
-                                      clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
-                        </el-form-item>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
+            </el-form-item>
 
-                        <el-form-item>
-                            <el-button-group>
-                                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                                <el-button type="primary" icon="search" @click="search">查询</el-button>
-                                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
-                            </el-button-group>
-                        </el-form-item>
-                    </el-row>
-                </el-form>
+            <el-form-item>
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                <el-button type="primary" icon="search" @click="search">查询</el-button>
+                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-row>
+        </el-form>
 
-                <el-table
-                    :data="dataList"
-                    style="width: 100%"
-                    highlight-current-row="false"
-                    v-loading="loading"
-                    :row-class-name="tableRowClassName"
-                    @current-change="handleChange"
-                    ref="multipleTable"
-                >
-                    <!--                    <el-table-column-->
-                    <!--                        type="selection"-->
-                    <!--                        width="55">-->
-                    <!--                    </el-table-column>-->
-                    <el-table-column label width="45">
-                        <template slot-scope="scope">
-                            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="序号" type="index"></el-table-column>
-                    <el-table-column
-                        label="最小销售产品标识"
-                        prop="nameCode"
-                        width="140"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="产品编码"
-                        prop="thirdId"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="医疗器械注册人"
-                        prop="ylqxzcrbarmc"
-                        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="zczbhhzbapzbh"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="器械类别"
-                        prop="qxlb"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="配送企业"
-                        prop="companyName"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column label="操作" fixed="right" width="160">
-                        <template slot-scope="scope">
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native.stop="handleDetailClick(scope.row)"
-                            >详情
-                            </el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <el-pagination
-                    :page-size="listQuery.limit"
-                    @current-change="handleErpPageChange"
-                    layout="prev, pager, next"
-                    :total="pageTotal"
-                    :current-page="listQuery.page"
-                ></el-pagination>
-            </div>
-        </el-card>
-        <el-dialog
-            title="耗材字典详情"
-            :visible.sync="udiRlDetailVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            append-to-body
-            v-if="udiRlDetailVisible"
+        <el-table
+          :data="dataList"
+          style="width: 100%"
+          highlight-current-row="false"
+          v-loading="loading"
+          :row-class-name="tableRowClassName"
+          @current-change="handleChange"
+          ref="multipleTable"
         >
-            <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
-        </el-dialog>
+          <!--                    <el-table-column-->
+          <!--                        type="selection"-->
+          <!--                        width="55">-->
+          <!--                    </el-table-column>-->
+          <el-table-column label width="45">
+            <template slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="最小销售产品标识"
+            prop="nameCode"
+            width="140"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="产品编码"
+            prop="thirdId"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="医疗器械注册人"
+            prop="ylqxzcrbarmc"
+            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="zczbhhzbapzbh"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="器械类别"
+            prop="qxlb"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="配送企业"
+            prop="companyName"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" fixed="right" width="160">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="handleDetailClick(scope.row)"
+              >详情
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :page-size="listQuery.limit"
+          @current-change="handleErpPageChange"
+          layout="prev, pager, next"
+          :total="pageTotal"
+          :current-page="listQuery.page"
+        ></el-pagination>
+      </div>
+    </el-card>
+    <el-dialog
+      title="耗材字典详情"
+      :visible.sync="udiRlDetailVisible"
+      width="85%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="udiRlDetailVisible"
+    >
+      <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
+    </el-dialog>
 
-        <el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
-            <el-form :model="form">
-                <el-form-item label="" prop="isGive">
-                    <el-radio-group v-model="currentCert">
-                        <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="selectCert">确 定</el-button>
-                <el-button @click="dialogFormVisible = false">取 消</el-button>
-            </div>
-        </el-dialog>
+    <el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
+      <el-form :model="form">
+        <el-form-item label="" prop="isGive">
+          <el-radio-group v-model="currentCert">
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="selectCert">确 定</el-button>
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
 
-    </div>
+  </div>
 </template>
 
 <script>
 import {getStockOrderDetailInstrumentById, stockOrderDetailFilterProduct} from "../../../api/inout/stockOrder";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
-    name: "stockOrderNewSelectProduct",
-    props: {
-        data: {
-            type: Object,
-            required: true,
-        },
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        purType: {
-            type: Object,
-            required: true,
-        },
-
+  name: "stockOrderNewSelectProduct",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
     },
 
-    data() {
-        return {
-            listQuery: {
-                udiCode: "",
-                unionCode: "",
-                cpmctymc: "",
-                ggxh: "",
-                ylqxzcrbarmc: "",
-                thrPiId: "",
-                page: 1,
-                limit: 10,
+  },
+
+  data() {
+    return {
+      listQuery: {
+        udiCode: "",
+        unionCode: "",
+        cpmctymc: "",
+        ggxh: "",
+        ylqxzcrbarmc: "",
+        thrPiId: "",
+        page: 1,
+        limit: 10,
+      },
+      combineQuery: {
+        thirdId: "",
+        relId: "",
+        erpName: "",
+        keys: [],
+      },
+      ids: [],
+      radioCheck: null,
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      loading: false,
+      udiRlDetailVisible: false,
+      thirdSys: [],
+      thirdSysFk: null,
+      busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            combineQuery: {
-                thirdId: "",
-                relId: "",
-                erpName: "",
-                keys: [],
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            ids: [],
-            radioCheck: null,
-            dataList: [],
-            pageTotal: 1,
-            total: 1,
-            currentRow: null,
-            loading: false,
-            udiRlDetailVisible: false,
-            thirdSys: [],
-            thirdSysFk: null,
-            busTypes: [],
-            actDateRange: [],
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-            orderEditor: false,
-            orderId: "",
-            currentCert: null,
-            certList: [],
-            dialogFormVisible: false,
-            multipleSelection: null,
-        };
+          },
+        ],
+      },
+      orderEditor: false,
+      orderId: "",
+      currentCert: null,
+      certList: [],
+      dialogFormVisible: false,
+      multipleSelection: null,
+    };
+  },
+  methods: {
+    onReset() {
+      // this.$router.push({
+      //     path: "",
+      // });
+      this.listQuery = {
+        udiCode: "",
+        unionCode: "",
+        cpmctymc: "",
+        ggxh: "",
+        ylqxzcrbarmc: "",
+        thrPiId: "",
+        page: 1,
+        limit: 10,
+      },
+        this.getList();
     },
-    methods: {
-        onReset() {
-            // this.$router.push({
-            //     path: "",
-            // });
-            this.listQuery = {
-                udiCode: "",
-                unionCode: "",
-                cpmctymc: "",
-                ggxh: "",
-                ylqxzcrbarmc: "",
-                thrPiId: "",
-                page: 1,
-                limit: 10,
-            },
-                this.getList();
-        },
-        tableRowClassName({row}) {
-            if (row.checked) return "warning-row";
-            return "";
-        },
-        checkSelectable(row) {
-            return !row.check;
-        },
-        handleCurrentChange(val) {
-            this.unionQuery.page = val;
-            this.getList();
-        },
-        handleChange(val) {
-            this.radioCheck = val.id;
-            this.currentRow = val;
-            this.multipleSelection = val
-        },
-        handleDetailClick(row) {
-            this.currentRow = row;
-            this.udiRlDetailVisible = true;
-
-        },
-        handleErpPageChange(val) {
-            this.listQuery.page = val;
-            this.getList();
-        },
-        keyup_submit(event) {
-            this.listQuery.page = 1;
-            this.getList();
-            event.target.select();
-        },
-        search() {
-            this.listQuery.page = 1;
-            this.getList();
-        },
-        getList() {
-
-            this.loading = true;
-            this.listQuery.customerId = store.getters.customerId;
-            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
-                this.listQuery.companyName=this.data.formData.corpName
-            }
-            if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){
-                this.listQuery.companyName=this.data.corpName
-            }
-
-            stockOrderDetailFilterProduct(this.listQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.dataList = response.data.list || [];
-                        this.pageTotal = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                        this.dataList = [];
-                        this.pageTotal = 0;
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.dataList = [];
-                    this.pageTotal = 0;
-                });
-        },
-        intentBack() {
-            this.closeDialog();
-        },
-
-
-        confirmSelect() {
-            if (this.multipleSelection == null) {
-                this.$message.error('未选择产品');
-                return;
-            }
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleChange(val) {
+      this.radioCheck = val.id;
+      this.currentRow = val;
+      this.multipleSelection = val
+    },
+    handleDetailClick(row) {
+      this.currentRow = row;
+      this.udiRlDetailVisible = true;
 
-            if (this.ids.length > 0) {
-                for (var i = 0; i < this.ids.length; i++) {
-                    if (this.ids[i] == this.multipleSelection.rlId) {
-                        this.$message.error("该产品已录入！");
-                        return
-                    }
-                }
-            }
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    keyup_submit(event) {
+      this.listQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+    search() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    getList() {
 
-            let str = this.multipleSelection.zczbhhzbapzbh;
-            if (str.search(",") != -1) {
-                this.currentCert = null;
-                this.certList = str.split(',');
-                this.dialogFormVisible = true;
-            } else {
-                this.combine();
-            }
-        },
+      this.loading = true;
+      this.listQuery.customerId = store.getters.customerId;
+      if (this.listQuery.customerId == 110 && this.data.formData != null && this.data.formData != undefined) {
+        this.listQuery.companyName = this.data.formData.corpName
+      }
+      if (this.listQuery.customerId != 110 && this.data != null && this.data != undefined) {
+        this.listQuery.companyName = this.data.corpName
+      }
 
-      combine() {
-        this.loading = true;
-        let tQuery = {
-          productId:this.multipleSelection.rlId,
-          productName:this.multipleSelection.cpmctymc,
-          count:1,
-          orderIdFk:this.pId,
-          supId:this.multipleSelection.customerId,
-          zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
-        };
-        addPlanDetail(tQuery).then((response) => {
+      stockOrderDetailFilterProduct(this.listQuery)
+        .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
-            this.closeDialog(response.data);
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
           } else {
-            if (response.code == 601) {
-              this.$alert(response.message, "提示", {
-                confirmButtonText: "确定",
-              });
-            } else
-              this.$message.error(response.message);
+            this.$message.error(response.message);
+            this.dataList = [];
+            this.pageTotal = 0;
           }
-        }).catch(() => {
+        })
+        .catch(() => {
           this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
         });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
 
-      },
 
-        selectCert() {
-            if (this.currentCert == null) {
-                this.$message.error("请先选择对应的注册证！");
-            } else {
-                this.multipleSelection.zczbhhzbapzbh = this.currentCert;
-                this.combine();
-            }
+    confirmSelect() {
+      if (this.multipleSelection == null) {
+        this.$message.error('未选择产品');
+        return;
+      }
+
+      if (this.ids.length > 0) {
+        for (var i = 0; i < this.ids.length; i++) {
+          if (this.ids[i] == this.multipleSelection.rlId) {
+            this.$message.error("该产品已录入！");
+            return
+          }
+        }
+      }
 
-        },
+      let str = this.multipleSelection.zczbhhzbapzbh;
+      if (!isBlank(str) && str.search(",") != -1) {
+        this.currentCert = null;
+        this.certList = str.split(',');
+        this.dialogFormVisible = true;
+      } else {
+        this.combine();
+      }
     },
-    components: {udiRlDetailDialog},
 
-    created() {
-        if (this.$isNotBlank(this.data)) {
+    combine() {
+      this.loading = true;
+      let tQuery = {
+        productId: this.multipleSelection.rlId,
+        productName: this.multipleSelection.cpmctymc,
+        count: 1,
+        orderIdFk: this.pId,
+        supId: this.multipleSelection.customerId,
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
+      };
+      addPlanDetail(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.closeDialog(response.data);
+        } else {
+          if (response.code == 601) {
+            this.$alert(response.message, "提示", {
+              confirmButtonText: "确定",
+            });
+          } else
+            this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
 
-            // this.listQuery.nameCode = this.data.udi;
-            // if (this.data.billType != null) {
-            //     this.listQuery.billType = this.data.billType;
-            // } else
-            //     this.listQuery.billType = this.data.formData.billType;
+    },
+
+    selectCert() {
+      if (this.currentCert == null) {
+        this.$message.error("请先选择对应的注册证！");
+      } else {
+        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+        this.combine();
+      }
 
-            // if (this.data.formData != null) {
-            //     this.listQuery.corpId = this.data.formData.corpId;
-            // }
-            // this.orderEditor = this.data.orderEditor;
-            // this.orderId = this.data.orderId;
-            this.ids = [];
-            if (this.data.stockOrderLists.length > 0) {
-                for (var i = 0; i < this.data.stockOrderLists.length; i++) {
-                    this.ids.push(this.data.stockOrderLists[i].productId);
-                }
-            }
-        }
-        this.getList();
     },
+  },
+  components: {udiRlDetailDialog},
+
+  created() {
+    if (this.$isNotBlank(this.data)) {
+
+      // this.listQuery.nameCode = this.data.udi;
+      // if (this.data.billType != null) {
+      //     this.listQuery.billType = this.data.billType;
+      // } else
+      //     this.listQuery.billType = this.data.formData.billType;
+
+      // if (this.data.formData != null) {
+      //     this.listQuery.corpId = this.data.formData.corpId;
+      // }
+      // this.orderEditor = this.data.orderEditor;
+      // this.orderId = this.data.orderId;
+      this.ids = [];
+      if (this.data.stockOrderLists.length > 0) {
+        for (var i = 0; i < this.data.stockOrderLists.length; i++) {
+          this.ids.push(this.data.stockOrderLists[i].productId);
+        }
+      }
+    }
+    this.getList();
+  },
 };
 </script>
 
 <style scoped>
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 div /deep/ .el-table .warning-row {
-    background: #bebebe;
+  background: #bebebe;
 }
 
 div /deep/ .el-table .success-row {
-    background: #ffffff;
+  background: #ffffff;
 }
 </style>
diff --git a/src/views/purchase/purOrder/purOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderSelectProduct.vue
index b7736608..ba88c9f3 100644
--- a/src/views/purchase/purOrder/purOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderSelectProduct.vue
@@ -137,6 +137,7 @@ import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevan
 import store from "../../../store";
 import {addOrderDetail} from "@/api/purchase/purOrder"
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -339,7 +340,7 @@ export default {
         }
       }
       let str = this.multipleSelection.zczbhhzbapzbh;
-      if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;
diff --git a/src/views/purchase/purPlan/purOrderSelectProduct.vue b/src/views/purchase/purPlan/purOrderSelectProduct.vue
index 17399f2d..4ac7d18f 100644
--- a/src/views/purchase/purPlan/purOrderSelectProduct.vue
+++ b/src/views/purchase/purPlan/purOrderSelectProduct.vue
@@ -122,6 +122,7 @@ import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevan
 import store from "../../../store";
 import {addPlanDetail} from "@/api/purchase/purPlan"
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -314,7 +315,7 @@ export default {
         }
       }
       let str = this.multipleSelection.zczbhhzbapzbh;
-      if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;
diff --git a/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue b/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
index c223e99c..4feb2bc4 100644
--- a/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
+++ b/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
@@ -1,158 +1,161 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <div>
-                <el-form :inline="true" :model="listQuery" size="mini">
-                    <el-row style="margin-top: 15px;width: 1000px">
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.udiCode"
-                                      style="width: 600px"
-                                      placeholder="请扫描或输入UDI码"
-                                      clearable="true"
-                                      @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                    </el-row>
+  <div>
+    <el-card class="el-card">
+      <div>
+        <el-form :inline="true" :model="listQuery" size="mini">
+          <el-row style="margin-top: 15px;width: 1000px">
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.udiCode"
+                        style="width: 600px"
+                        placeholder="请扫描或输入UDI码"
+                        clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-row>
 
-                    <el-row>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
-                                      clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
-                        </el-form-item>
-                    </el-row>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-row>
 
-                    <el-row>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
-                                      clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.thrPiId" placeholder="第三方物资编码" clearable="true"></el-input>
-                        </el-form-item>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.thrPiId" placeholder="第三方物资编码" clearable="true"></el-input>
+            </el-form-item>
 
-                        <el-form-item>
-                            <el-button-group>
-                                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                                <el-button type="primary" icon="search" @click="search">查询</el-button>
-                                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
-                            </el-button-group>
-                        </el-form-item>
-                    </el-row>
-                </el-form>
+            <el-form-item>
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                <el-button type="primary" icon="search" @click="search">查询</el-button>
+                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-row>
+        </el-form>
 
-                <el-table
-                    :data="dataList"
-                    style="width: 100%"
-                    highlight-current-row="false"
-                    v-loading="loading"
-                    :row-class-name="tableRowClassName"
-                    @current-change="handleChange"
-                    ref="multipleTable"
-                >
-                    <!--                    <el-table-column-->
-                    <!--                        type="selection"-->
-                    <!--                        width="55">-->
-                    <!--                    </el-table-column>-->
-                    <el-table-column label width="45">
-                        <template slot-scope="scope">
-                            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="序号" type="index"></el-table-column>
-                    <el-table-column
-                        label="最小销售产品标识"
-                        prop="nameCode"
-                        width="140"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="物资编码"
-                        prop="thirdId"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="医疗器械注册人"
-                        prop="ylqxzcrbarmc"
-                        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="zczbhhzbapzbh"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="器械类别"
-                        prop="qxlb"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="配送企业"
-                        prop="companyName"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column label="操作" fixed="right" width="160">
-                        <template slot-scope="scope">
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native.stop="handleDetailClick(scope.row)"
-                            >详情
-                            </el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <el-pagination
-                    :page-size="listQuery.limit"
-                    @current-change="handleErpPageChange"
-                    layout="prev, pager, next"
-                    :total="pageTotal"
-                    :current-page="listQuery.page"
-                ></el-pagination>
-            </div>
-        </el-card>
-        <el-dialog
-            title="耗材字典详情"
-            :visible.sync="udiRlDetailVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            append-to-body
-            v-if="udiRlDetailVisible"
+        <el-table
+          :data="dataList"
+          style="width: 100%"
+          highlight-current-row="false"
+          v-loading="loading"
+          :row-class-name="tableRowClassName"
+          @current-change="handleChange"
+          ref="multipleTable"
         >
-            <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
-        </el-dialog>
+          <!--                    <el-table-column-->
+          <!--                        type="selection"-->
+          <!--                        width="55">-->
+          <!--                    </el-table-column>-->
+          <el-table-column label width="45">
+            <template slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="最小销售产品标识"
+            prop="nameCode"
+            width="140"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="物资编码"
+            prop="thirdId"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="医疗器械注册人"
+            prop="ylqxzcrbarmc"
+            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="zczbhhzbapzbh"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="器械类别"
+            prop="qxlb"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="配送企业"
+            prop="companyName"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" fixed="right" width="160">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="handleDetailClick(scope.row)"
+              >详情
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :page-size="listQuery.limit"
+          @current-change="handleErpPageChange"
+          layout="prev, pager, next"
+          :total="pageTotal"
+          :current-page="listQuery.page"
+        ></el-pagination>
+      </div>
+    </el-card>
+    <el-dialog
+      title="耗材字典详情"
+      :visible.sync="udiRlDetailVisible"
+      width="85%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="udiRlDetailVisible"
+    >
+      <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
+    </el-dialog>
 
-        <el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
-            <el-form :model="form">
-                <el-form-item label="" prop="isGive">
-                    <el-radio-group v-model="currentCert">
-                        <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="selectCert">确 定</el-button>
-                <el-button @click="dialogFormVisible = false">取 消</el-button>
-            </div>
-        </el-dialog>
+    <el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
+      <el-form :model="form">
+        <el-form-item label="" prop="isGive">
+          <el-radio-group v-model="currentCert">
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="selectCert">确 定</el-button>
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
 
-    </div>
+  </div>
 </template>
 
 <script>
@@ -160,282 +163,283 @@ import {getStockOrderDetailInstrumentById, stockOrderDetailFilterProduct} from "
 import store from "../../../store";
 import udiRlDetailDialog from "./../../";
 import {addApplyDetail} from "@/api/purchase/purApply";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
-    name: "stockOrderNewSelectProduct",
-    props: {
-        data: {
-            type: Object,
-            required: true,
-        },
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        purType: {
-            type: Object,
-            required: true,
-        },
-
+  name: "stockOrderNewSelectProduct",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
     },
 
-    data() {
-        return {
-            listQuery: {
-                udiCode: "",
-                unionCode: "",
-                cpmctymc: "",
-                ggxh: "",
-                ylqxzcrbarmc: "",
-                thrPiId: "",
-                page: 1,
-                limit: 10,
+  },
+
+  data() {
+    return {
+      listQuery: {
+        udiCode: "",
+        unionCode: "",
+        cpmctymc: "",
+        ggxh: "",
+        ylqxzcrbarmc: "",
+        thrPiId: "",
+        page: 1,
+        limit: 10,
+      },
+      combineQuery: {
+        thirdId: "",
+        relId: "",
+        erpName: "",
+        keys: [],
+      },
+      ids: [],
+      radioCheck: null,
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      loading: false,
+      udiRlDetailVisible: false,
+      thirdSys: [],
+      thirdSysFk: null,
+      busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            combineQuery: {
-                thirdId: "",
-                relId: "",
-                erpName: "",
-                keys: [],
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            ids: [],
-            radioCheck: null,
-            dataList: [],
-            pageTotal: 1,
-            total: 1,
-            currentRow: null,
-            loading: false,
-            udiRlDetailVisible: false,
-            thirdSys: [],
-            thirdSysFk: null,
-            busTypes: [],
-            actDateRange: [],
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-            orderEditor: false,
-            orderId: "",
-            currentCert: null,
-            certList: [],
-            dialogFormVisible: false,
-            multipleSelection: null,
-        };
+          },
+        ],
+      },
+      orderEditor: false,
+      orderId: "",
+      currentCert: null,
+      certList: [],
+      dialogFormVisible: false,
+      multipleSelection: null,
+    };
+  },
+  methods: {
+    onReset() {
+      // this.$router.push({
+      //     path: "",
+      // });
+      this.listQuery = {
+        udiCode: "",
+        unionCode: "",
+        cpmctymc: "",
+        ggxh: "",
+        ylqxzcrbarmc: "",
+        thrPiId: "",
+        page: 1,
+        limit: 10,
+      },
+        this.getList();
     },
-    methods: {
-        onReset() {
-            // this.$router.push({
-            //     path: "",
-            // });
-            this.listQuery = {
-                udiCode: "",
-                unionCode: "",
-                cpmctymc: "",
-                ggxh: "",
-                ylqxzcrbarmc: "",
-                thrPiId: "",
-                page: 1,
-                limit: 10,
-            },
-                this.getList();
-        },
-        tableRowClassName({row}) {
-            if (row.checked) return "warning-row";
-            return "";
-        },
-        checkSelectable(row) {
-            return !row.check;
-        },
-        handleCurrentChange(val) {
-            this.unionQuery.page = val;
-            this.getList();
-        },
-        handleChange(val) {
-            this.radioCheck = val.id;
-            this.currentRow = val;
-            this.multipleSelection = val
-        },
-        handleDetailClick(row) {
-            this.currentRow = row;
-            this.udiRlDetailVisible = true;
-
-        },
-        handleErpPageChange(val) {
-            this.listQuery.page = val;
-            this.getList();
-        },
-        keyup_submit(event) {
-            this.listQuery.page = 1;
-            this.getList();
-            event.target.select();
-        },
-        search() {
-            this.listQuery.page = 1;
-            this.getList();
-        },
-        getList() {
-
-            this.loading = true;
-            this.listQuery.customerId = store.getters.customerId;
-            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
-                this.listQuery.companyName=this.data.formData.corpName
-            }
-            if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){
-                this.listQuery.companyName=this.data.corpName
-            }
-
-            stockOrderDetailFilterProduct(this.listQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.dataList = response.data.list || [];
-                        this.pageTotal = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                        this.dataList = [];
-                        this.pageTotal = 0;
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.dataList = [];
-                    this.pageTotal = 0;
-                });
-        },
-        intentBack() {
-            this.closeDialog();
-        },
-
-
-        confirmSelect() {
-            if (this.multipleSelection == null) {
-                this.$message.error('未选择产品');
-                return;
-            }
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleChange(val) {
+      this.radioCheck = val.id;
+      this.currentRow = val;
+      this.multipleSelection = val
+    },
+    handleDetailClick(row) {
+      this.currentRow = row;
+      this.udiRlDetailVisible = true;
 
-            if (this.ids.length > 0) {
-                for (var i = 0; i < this.ids.length; i++) {
-                    if (this.ids[i] == this.multipleSelection.rlId) {
-                        this.$message.error("该产品已录入！");
-                        return
-                    }
-                }
-            }
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    keyup_submit(event) {
+      this.listQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+    search() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    getList() {
 
-            let str = this.multipleSelection.zczbhhzbapzbh;
-            if (str.search(",") != -1) {
-                this.currentCert = null;
-                this.certList = str.split(',');
-                this.dialogFormVisible = true;
-            } else {
-                this.combine();
-            }
-        },
+      this.loading = true;
+      this.listQuery.customerId = store.getters.customerId;
+      if (this.listQuery.customerId == 110 && this.data.formData != null && this.data.formData != undefined) {
+        this.listQuery.companyName = this.data.formData.corpName
+      }
+      if (this.listQuery.customerId != 110 && this.data != null && this.data != undefined) {
+        this.listQuery.companyName = this.data.corpName
+      }
 
-      combine() {
-        this.loading = true;
-        let tQuery = {
-          productId:this.multipleSelection.rlId,
-          productName:this.multipleSelection.cpmctymc,
-          count:1,
-          orderIdFk:this.pId,
-          supId:this.multipleSelection.customerId,
-          zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
-        };
-        addPlanDetail(tQuery).then((response) => {
+      stockOrderDetailFilterProduct(this.listQuery)
+        .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
-            this.closeDialog(response.data);
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
           } else {
-            if (response.code == 601) {
-              this.$alert(response.message, "提示", {
-                confirmButtonText: "确定",
-              });
-            } else
-              this.$message.error(response.message);
+            this.$message.error(response.message);
+            this.dataList = [];
+            this.pageTotal = 0;
           }
-        }).catch(() => {
+        })
+        .catch(() => {
           this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
         });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
 
-      },
 
-        selectCert() {
-            if (this.currentCert == null) {
-                this.$message.error("请先选择对应的注册证！");
-            } else {
-                this.multipleSelection.zczbhhzbapzbh = this.currentCert;
-                this.combine();
-            }
+    confirmSelect() {
+      if (this.multipleSelection == null) {
+        this.$message.error('未选择产品');
+        return;
+      }
+
+      if (this.ids.length > 0) {
+        for (var i = 0; i < this.ids.length; i++) {
+          if (this.ids[i] == this.multipleSelection.rlId) {
+            this.$message.error("该产品已录入！");
+            return
+          }
+        }
+      }
 
-        },
+      let str = this.multipleSelection.zczbhhzbapzbh;
+      if (!isBlank(str) && str.search(",") != -1) {
+        this.currentCert = null;
+        this.certList = str.split(',');
+        this.dialogFormVisible = true;
+      } else {
+        this.combine();
+      }
     },
-    components: {udiRlDetailDialog},
 
-    created() {
-        if (this.$isNotBlank(this.data)) {
+    combine() {
+      this.loading = true;
+      let tQuery = {
+        productId: this.multipleSelection.rlId,
+        productName: this.multipleSelection.cpmctymc,
+        count: 1,
+        orderIdFk: this.pId,
+        supId: this.multipleSelection.customerId,
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
+      };
+      addPlanDetail(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.closeDialog(response.data);
+        } else {
+          if (response.code == 601) {
+            this.$alert(response.message, "提示", {
+              confirmButtonText: "确定",
+            });
+          } else
+            this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
 
-            // this.listQuery.nameCode = this.data.udi;
-            // if (this.data.billType != null) {
-            //     this.listQuery.billType = this.data.billType;
-            // } else
-            //     this.listQuery.billType = this.data.formData.billType;
+    },
+
+    selectCert() {
+      if (this.currentCert == null) {
+        this.$message.error("请先选择对应的注册证！");
+      } else {
+        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+        this.combine();
+      }
 
-            // if (this.data.formData != null) {
-            //     this.listQuery.corpId = this.data.formData.corpId;
-            // }
-            // this.orderEditor = this.data.orderEditor;
-            // this.orderId = this.data.orderId;
-            this.ids = [];
-            if (this.data.stockOrderLists.length > 0) {
-                for (var i = 0; i < this.data.stockOrderLists.length; i++) {
-                    this.ids.push(this.data.stockOrderLists[i].productId);
-                }
-            }
-        }
-        this.getList();
     },
+  },
+  components: {udiRlDetailDialog},
+
+  created() {
+    if (this.$isNotBlank(this.data)) {
+
+      // this.listQuery.nameCode = this.data.udi;
+      // if (this.data.billType != null) {
+      //     this.listQuery.billType = this.data.billType;
+      // } else
+      //     this.listQuery.billType = this.data.formData.billType;
+
+      // if (this.data.formData != null) {
+      //     this.listQuery.corpId = this.data.formData.corpId;
+      // }
+      // this.orderEditor = this.data.orderEditor;
+      // this.orderId = this.data.orderId;
+      this.ids = [];
+      if (this.data.stockOrderLists.length > 0) {
+        for (var i = 0; i < this.data.stockOrderLists.length; i++) {
+          this.ids.push(this.data.stockOrderLists[i].productId);
+        }
+      }
+    }
+    this.getList();
+  },
 };
 </script>
 
 <style scoped>
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 div /deep/ .el-table .warning-row {
-    background: #bebebe;
+  background: #bebebe;
 }
 
 div /deep/ .el-table .success-row {
-    background: #ffffff;
+  background: #ffffff;
 }
 </style>
diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index 4d5baf31..e85f5467 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -954,6 +954,7 @@ export default {
         if (isPut) this.checkedBusTypes.push(obj);
       });
       this.addBusDialogVisible = false;
+
     },
     remveBus(index, row) {
       this.checkedBusTypes.splice(index, 1);
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index c9e4a646..6f064617 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -563,7 +563,7 @@ export default {
         this.subData.advanceType = this.subData.advanceType.toString();
         if (this.subData.parentCode != null && this.subData.parentCode != "") {
           this.isAdvanceTypeShow = true;
-          this.isShow = true;
+          this.isShow = false;
         } else {
           this.isAdvanceTypeShow = false;
           this.isShow = true
diff --git a/src/views/thirdSys/api/BasicThirdSysDetailModify.vue b/src/views/thirdSys/api/BasicThirdSysDetailModify.vue
index 6f8a2cc0..962d6944 100644
--- a/src/views/thirdSys/api/BasicThirdSysDetailModify.vue
+++ b/src/views/thirdSys/api/BasicThirdSysDetailModify.vue
@@ -6,7 +6,7 @@
           <div>
             <el-radio-group v-model="inputDetailQuery.fromType" :disabled="!inputDetailQuery.enabled"
                             style="margin-right: 20px" @change="agreeChange">
-              <el-radio-button :label="0" size="mini" disabled>接口实时获取</el-radio-button>
+              <el-radio-button :label="0" size="mini">接口实时获取</el-radio-button>
               <el-radio-button :label="3" size="mini">接口方式</el-radio-button>
               <el-radio-button :label="2" size="mini" disabled>第三方上传缓存</el-radio-button>
               <el-radio-button :label="1" size="mini">文件方式</el-radio-button>
@@ -20,33 +20,33 @@
       </el-row>
       <el-row :gutter="20" class="el-row" type="flex" align="middle" style="margin-top: 25px">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="接口名称">
+          <el-form-item label-width="120px" label="接口名称">
             <el-input
-                style="width: 80%"
-                splaceholder="请输入内容"
-                :disabled="true"
-                v-model="inputDetailQuery.name"
+              style="width: 80%"
+              splaceholder="请输入内容"
+              :disabled="true"
+              v-model="inputDetailQuery.name"
             ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20" class="el-row" type="flex" align="middle">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="接口地址">
+          <el-form-item label-width="120px" label="接口地址">
             <el-input
-                style="width: 80%"
-                splaceholder="请输入内容"
-                v-model="inputDetailQuery.value"
+              style="width: 80%"
+              splaceholder="请输入内容"
+              v-model="inputDetailQuery.value"
             ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="inputDetailQuery.fromType === 3" :gutter="20" class="el-row" type="flex" align="middle">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="请求时间">
+          <el-form-item label-width="120px" label="轮询时间(分钟)">
             <el-input
               style="width: 80%"
-              splaceholder="请输入请求时间 单位：分钟"
+              splaceholder="请输入轮序时间 单位：分钟"
               type="number"
               min="0"
               v-model="inputDetailQuery.time"
@@ -55,15 +55,29 @@
         </el-col>
       </el-row>
 
+      <el-row v-if="inputDetailQuery.fromType === 3" :gutter="20" class="el-row" type="flex" align="middle">
+        <el-col :span="24" class="el-col">
+          <el-form-item label-width="120px" label="下载范围(小时)">
+            <el-input
+              style="width: 80%"
+              splaceholder="请输入请求时间 单位：小时"
+              type="number"
+              min="0"
+              v-model="inputDetailQuery.dlLastTime"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-row :gutter="20" class="el-row" type="flex" align="middle">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="备注说明">
+          <el-form-item label-width="120px" label="备注说明">
             <el-input
-                style="width: 80%"
-                splaceholder="请输入内容"
-                type="textarea"
-                row="3"
-                v-model="inputDetailQuery.remark"
+              style="width: 80%"
+              splaceholder="请输入内容"
+              type="textarea"
+              row="3"
+              v-model="inputDetailQuery.remark"
             ></el-input>
           </el-form-item>
         </el-col>