资质证书相关bug修改

src/api/basic/udiRelevance.js

@@ -25,6 +25,15 @@ export function getSmUdiInfos(query) {
   });
 }
 
+
+export function getCertUdis(query) {
+  return axios({
+    url: "/udi/cert/filterUdi",
+    method: "get",
+    params: query
+  });
+}
+
 export function deletetUdiInfos(query) {
   return axios({
     url: "/udi/udirel/deleteById",

src/views/basic/product/product.vue

@@ -300,6 +300,20 @@
                           </el-select>
                         </div>
                       </el-col>
+                      <el-col :span="12" class="el-col">
+                        <div class="text item">
+                          <div class="itemTag">
+                            <span>允许无序列号:&nbsp;</span>
+                          </div>
+                          <el-select v-model="editQuery.allowNoSerial" disabled style="width: 65%" size="small">
+                            <el-option label="是" :value="true"></el-option>
+                            <el-option label="否" :value="false"></el-option>
+                            <el-option label="否" :value="null"></el-option>
+                          </el-select>
+                        </div>
+                      </el-col>
+                    </el-row>
+                    <el-row>
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
@@ -312,8 +326,6 @@
                           </el-select>
                         </div>
                       </el-col>
-                    </el-row>
-                    <el-row :gutter="20" class="el-row" type="flex">
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
@@ -1223,6 +1235,7 @@ export default {
         allowNoBatch: null,
         allowNoExpire: null,
         allowNoProduct: null,
+        allowNoSerial:null,
         pId: null,
       },
       defaultSys: null,

src/views/basic/product/productEdit.vue

@@ -467,6 +467,29 @@
 
             <el-divider></el-divider>
 
+
+
+            <el-row>
+              <el-col span="5">
+                <span class="sptext">允许无序列号</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+
+                <el-select v-model="editQuery.allowNoSerial" style="width: 65%" placeholder="状态" clearable>
+                  <el-option label="允许" :value="true"></el-option>
+                  <el-option label="不允许" :value="false"></el-option>
+                </el-select>
+
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="13">
+                <span class="sptext">允许无序列号</span>
+              </el-col>
+            </el-row>
+
+            <el-divider></el-divider>
+
             <el-row>
               <el-col span="5">
                 <span class="sptext">是否必须维护资质材料</span>

src/views/inout/DialogSelectRl.vue

@@ -469,6 +469,9 @@
               <el-checkbox v-model="editQuery.allowNoProduct" disabled
               >允许无生产日期
               </el-checkbox>
+              <el-checkbox v-model="editQuery.allowNoSerial" disabled
+              >允许无序列号
+              </el-checkbox>
             </div>
           </el-col>
 

src/views/inout/InvoiceRegistration.vue

@@ -450,6 +450,7 @@ export default {
         mainAction: null,
         action: null,
         page: 1,
+        statusType: "supInvoice",
         limit: 10,
         startTime: null,
         endTime: null,
@@ -592,6 +593,7 @@ export default {
         action: null,
         page: 1,
         limit: 10,
+        statusType: "supInvoice",
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,

src/views/inout/IoSupSecAuditOrder.vue

@@ -787,7 +787,7 @@ export default {
     printOrder(row) {
       let tQuery = {
         action: row.action,
-        moduleId: 1,
+        moduleId: 2,
       }
       this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
@@ -796,7 +796,7 @@ export default {
             templateId: response.data,
             orderIdFk: row.billNo,
             action: row.action,
-            moduleId: 1,
+            moduleId: 2,
           }
           orderPDFFromTemplateFile(tQuery).then((response) => {
             //将pdf文件转换为url。

src/views/purchase/cert/supCertificationAdd.vue

@@ -41,7 +41,8 @@
       <el-divider style="margin: 15px"></el-divider>
 
 
-          <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row @current-change="supManufacturerClick">
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+                @current-change="supManufacturerClick">
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="企业名称" prop="companyName" width="250"></el-table-column>
         <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
@@ -64,8 +65,12 @@
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="addInfoDialog(scope.row)">编辑</el-button>
-                        <el-button type="text" size="small" :disabled="scope.row.auditStatus === 1" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
+            <el-button type="text" size="small" :disabled="scope.row.auditStatus === 1"
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus === 2" @click.native.stop="rejectInfo(scope.row)">说明</el-button>
+                       @click.native.stop="deleteDialog(scope.row)">删除
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus === 2"
+                       @click.native.stop="rejectInfo(scope.row)">说明
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -102,21 +107,25 @@
 
     <!---配送企业资质----->
     <el-card class="el-card">
-            <el-form :model="registrationQuery" class="query-form" style="margin-top: 5px" v-show="showSearch2" label-width="100px">
+      <el-form :model="registrationQuery" class="query-form" style="margin-top: 5px" v-show="showSearch2"
+               label-width="100px">
         <el-row>
           <el-col span="6">
             <el-form-item label="产品名称:">
-                        <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable placeholder="产品名称"></el-input>
+              <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable
+                        placeholder="产品名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col span="6">
             <el-form-item label="注册备案号:">
-                        <el-input v-model="registrationQuery.recordCode" style="width: 90%" clearable placeholder="注册备案号"></el-input>
+              <el-input v-model="registrationQuery.recordCode" style="width: 90%" clearable
+                        placeholder="注册备案号"></el-input>
             </el-form-item>
           </el-col>
           <el-col span="6">
             <el-form-item label="注册备案人:">
-                        <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%" clearable placeholder="注册备案人"></el-input>
+              <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%" clearable
+                        placeholder="注册备案人"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -133,8 +142,8 @@
       <el-divider style="margin: 15px"></el-divider>
 
 
-
+      <el-table v-loading="registrationLoading" :data="registrationList" style="width: 100%" border
-            <el-table v-loading="registrationLoading" :data="registrationList" style="width: 100%"  border highlight-current-row>
+                highlight-current-row>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column label="注册/备案产品名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
@@ -151,7 +160,9 @@
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="registrationDialog(scope.row)">编辑</el-button>
-                        <el-button type="text" size="small" :disabled="scope.row.auditStatus === 1" @click.native="deleteRegistration(scope.row)">删除</el-button>
+            <el-button type="text" size="small" :disabled="scope.row.auditStatus === 1"
+                       @click.native="deleteRegistration(scope.row)">删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/purchase/company/companyProducts.vue

@@ -3,37 +3,42 @@
     <el-card>
       <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
         <el-row>
-            <el-col :span="6">
+          <el-col :span="8">
-                <el-form-item label="产品编码:">
+            <el-form-item label="DI/物资编码:">
-                    <el-input v-model="filterQuery.unionCode"  style="width:90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input>
+              <el-input v-model="filterQuery.unionCode" style="width:90%" placeholder="请输入DI/物资编码"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="物资名称:">
-                    <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入物资名称" clearable="true"></el-input>
+              <el-input v-model="filterQuery.cpmctymc" style="width:90%" placeholder="请输入物资名称"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="6">
+          <el-col :span="8">
-                <el-form-item label="规格型号:">
-                    <el-input v-model="filterQuery.ggxh"  style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="6">
             <el-form-item label="生产企业:">
-                    <el-input v-model="filterQuery.ylqxzcrbarmc"  style="width: 90%" placeholder="请输入生产企业/注册备案人" clearable="true"></el-input>
+              <el-input v-model="filterQuery.manufactory" style="width: 90%" placeholder="请输入生产企业"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
-              <el-col :span="6">
+          <el-col :span="8">
-                <el-form-item label="配送企业:">
+            <el-form-item label="注册/备案人:">
-                    <el-input v-model="filterQuery.supName"  style="width: 90%" placeholder="请输入配送企业" clearable="true"></el-input>
+              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入注册/备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="统一社会信用号:">
+              <el-input v-model="filterQuery.tyshxydm" style="width: 90%" placeholder="请输入统一社会信用号"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
-              <el-col :span="6">
+          <el-col :span="8">
-                <el-form-item label="第三方产品编码:">
+            <el-form-item label="注册/备案号:">
-                    <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
+              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册/备案号"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -48,15 +53,16 @@
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
-        <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleSelectionChange"   border highlight-current-row>
+      <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleSelectionChange" border
+                highlight-current-row>
         <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></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="manufactory" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品类别" prop="cplb" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
+        <el-table-column label="分类编码" prop="classifyName" show-overflow-tooltip></el-table-column>
         <el-table-column width="60" label="操作">
           <template slot-scope="scope">
             <el-button
@@ -68,6 +74,8 @@
           </template>
         </el-table-column>
       </el-table>
+
+
       <el-dialog
         title="产品信息详情"
         :visible.sync="editDialogVisible"
@@ -77,189 +85,87 @@
         append-to-body
         v-if="editDialogVisible"
       >
-          <el-table :data="sysList" style="width: 100%" border highlight-current-row>
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
-            <el-table-column label="第三方产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
-            <el-table-column label="第三方产品ID" prop="thirdId" show-overflow-tooltip></el-table-column>
-          </el-table>
 
-          <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
+        <el-card>
-            <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+          <el-form :model="editQuery" ref="editQuery" label-width="140px" style="margin-top: 20px">
-            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-            <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
-            <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
-          </el-table>
-
-            <el-form :model="editQuery" :rules="rules" ref="editQuery" label-width="190px" style="margin-top: 20px">
             <el-row>
               <el-col :span="12">
                 <el-form-item label="产品名称" prop="cpmctymc">
-                    <el-input style="width: 90%" size="small" splaceholder="请输入产品名称" :disabled="true" v-model="editQuery.cpmctymc"></el-input>
+                  <el-input style="width: 90%" size="small" splaceholder="请输入产品名称" :disabled="true"
+                            v-model="editQuery.cpmctymc"></el-input>
                 </el-form-item>
               </el-col>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="产品标识" prop="nameCode">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品标识" v-model="editQuery.nameCode"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="规格型号" prop="ggxh">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ggxh"></el-input>
-                  </el-form-item>
-                </el-col>
-
               <el-col :span="12" class="el-col">
                 <el-form-item label="器械类别" prop="qxlb">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入器械类别" v-model="editQuery.qxlb"></el-input>
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入器械类别"
+                            v-model="editQuery.qxlb"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-
             <el-row>
               <el-col :span="12" class="el-col">
                 <el-form-item label="产品类别" prop="cplb">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品类别" v-model="editQuery.cplb"></el-input>
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品类别"
+                            v-model="editQuery.cplb"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="el-col">
                 <el-form-item label="分类编码" prop="flbm">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入分类编码" v-model="editQuery.flbm"></el-input>
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入分类编码"
+                            v-model="editQuery.flbm"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="商品条码" prop="sptm">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码" v-model="editQuery.sptm"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="医保编码" prop="ybbm">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医保编码" v-model="editQuery.ybbm"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
             <el-row>
               <el-col :span="12" class="el-col">
                 <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医疗器械注册人" v-model="editQuery.ylqxzcrbarmc"></el-input>
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医疗器械注册人"
+                            v-model="editQuery.ylqxzcrbarmc"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="el-col">
                 <el-form-item label="注册人英文名称" prop="ylqxzcrbarywmc">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册人英文名称" v-model="editQuery.ylqxzcrbarywmc"></el-input>
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册人英文名称"
+                            v-model="editQuery.ylqxzcrbarywmc"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-
             <el-row>
               <el-col :span="12" class="el-col">
                 <el-form-item label="统一社会信用号" prop="tyshxydm">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入统一社会信用号" v-model="editQuery.tyshxydm"></el-input>
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入统一社会信用号"
+                            v-model="editQuery.tyshxydm"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="el-col">
                 <el-form-item label="注册证/备案号" prop="zczbhhzbapzbh">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册证/备案号" v-model="editQuery.zczbhhzbapzbh"></el-input>
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册证/备案号"
-                  </el-form-item>
+                            v-model="editQuery.zczbhhzbapzbh"></el-input>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="上级产品编码" prop="sjcpbm">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入上级产品编码" v-model="editQuery.sjcpbm"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="包装级别" prop="packLevel">
-                    <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" :disabled="true" v-model="editQuery.packLevel"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="包装层级" prop="bzcj">
-                    <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="包含下级包装数量" prop="bhxjsl">
-                    <el-input style="width: 90%" size="small" splaceholder="请输入包含下级包装数量" :disabled="true" v-model="editQuery.bhxjsl"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="包含下级产品编码" prop="bhxjcpbm">
-                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含下级产品编码" v-model="editQuery.bhxjcpbm"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="包含最小销售包装数量" prop="bhzxxsbzsl">
-                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含最小销售包装数量" v-model="editQuery.bhzxxsbzsl"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="是否包含批号" prop="scbssfbhph">
-                          <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.scbssfbhph"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                          <el-form-item label="是否包含序列号" prop="scbssfbhxlh">
-                            <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhxlh" splaceholder="请输入内容"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
+          </el-form>
+        </el-card>
+        <el-card>
 
-                <el-row>
+          <el-table :data="detailList" style="width: 100%" @current-change="handleSelectionChange" border
-                    <el-col :span="12" class="el-col">
+                    highlight-current-row>
-                      <el-form-item label="是否包含生产日期" prop="scbssfbhscrq">
+            <el-table-column label="序号" type="index"></el-table-column>
-                        <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhscrq"></el-input>
+            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-                      </el-form-item>
+            <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-                    </el-col>
+            <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></el-table-column>
-                    <el-col :span="12" class="el-col">
+            <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
-                      <el-form-item label="是否包含失效日期" prop="scbssfbhsxrq">
+          </el-table>
-                        <el-input style="width: 90%" :disabled="true" v-model="editQuery.scbssfbhsxrq" ></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
 
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="产品描述" prop="cpms">
-                        <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.cpms"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="计量单位" prop="measname">
-                        <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row >
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="使用单元数量" prop="zxxsbzbhsydysl">
-                        <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
 
+          <pagination
+            v-show="detailTotal>0"
+            :total="detailTotal"
+            :limit.sync="detailQuery.limit"
+            :page.sync="detailQuery.page"
+            @pagination="handeleDetailChange"
+          ></pagination>
+        </el-card>
       </el-dialog>
 
       <pagination
@@ -279,7 +185,7 @@ import {
   getUdiInfos,
   updateErpProduct,
   thirdSysDetail,
-    getSmUdiInfos
+  getSmUdiInfos, getCertUdis
 } from "@/api/basic/udiRelevance";
 import {udiUpload} from "@/api/thrsys/smp"
 import {filterByUuid} from "@/api/basic/udiInfo";
@@ -321,7 +227,13 @@ export default {
         addType: 1,
         isDisable: false,
       },
-
+      detailTotal: 0,
+      detailQuery: {
+        cpmctymc: null,
+        manufactory: null,
+        page: 1,
+        limit: 20,
+      },
       editQuery: null,
       relevanceEdit: {
         id: null,
@@ -386,7 +298,7 @@ export default {
     getList() {
       this.loading = true;
       this.filterQuery.customerId = store.getters.customerId;
-            getSmUdiInfos(this.filterQuery)
+      getCertUdis(this.filterQuery)
         .then((response) => {
           this.loading = false;
           this.list = response.data.list || [];
@@ -401,14 +313,16 @@ export default {
 
     getDetailList(detailQuery) {
       this.loading = true;
-            filterByUuid(detailQuery)
+      getUdiInfos(detailQuery)
         .then((response) => {
           this.loading = false;
-                    this.detailList = response.data || [];
+          this.detailList = response.data.list || [];
+          this.detailTotal = response.data.total || 0;
         })
         .catch(() => {
           this.loading = false;
           this.detailList = [];
+          this.detailTotal = 0;
         });
     },
 
@@ -502,6 +416,12 @@ export default {
       this.multipleSelection = val;
     },
 
+
+    handeleDetailChange(val) {
+      this.detailQuery.page = val.page;
+      this.getDetailList();
+    },
+
     handleCurrentChange(val) {
       this.filterQuery.page = val.page;
       this.getList();
@@ -515,14 +435,14 @@ export default {
         isUseDy: row.isUseDy,
       };
       this.checked = row.isUseDy == 1;
-
+      this.detailQuery = {
-            let ttquery = {
+        cpmctymc: row.cpmctymc,
-                id: row.id,
+        manufactory: row.manufactory,
         page: 1,
         limit: 10,
       };
 
-            this.getDetailList(ttquery);
+      this.getDetailList(this.detailQuery);
       this.getThirdSysDetail();
     },
     closeUdi(val) {

src/views/purchase/product/supProductEditDialog.vue

@@ -4,12 +4,11 @@
       :model="inputQuery"
       :rules="rules"
       ref="inputQuery"
-      label-width="100px"
+      label-width="150px"
       style="margin-top: -30px"
     >
       <el-card class="el-card">
         <div style="float: right">
-
           <el-button
             type="primary"
             size="mini"
@@ -47,10 +46,9 @@
           </el-button
           >
         </div>
-
         <el-row :gutter="20" class="el-row" type="flex" style="margin-top:50px">
           <el-col :span="10" class="el-col">
-            <el-form-item label="所属供应商:" label-width="150px" prop="customerId">
+            <el-form-item label="所属供应商:" prop="customerId">
               <el-select
                 v-model="inputQuery.customerId"
                 filterable
@@ -76,7 +74,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" class="el-col">
-            <el-form-item label="所属生产企业:" label-width="150px" prop="manufacturerIdFk">
+            <el-form-item label="所属生产企业:" prop="manufacturerIdFk">
               <el-select
                 v-model="inputQuery.companyName"
                 filterable
@@ -104,7 +102,7 @@
 
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="10" class="el-col">
-            <el-form-item label="产品通用名称:" label-width="150px" prop="recordProductName">
+            <el-form-item label="产品通用名称:" prop="recordProductName">
               <el-input
                 size="small"
                 disabled
@@ -115,7 +113,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" class="el-col">
-            <el-form-item label="注册/备案人名称:" label-width="150px" prop="recordPeopleName">
+            <el-form-item label="注册/备案人名称:" prop="recordPeopleName">
               <el-input
                 size="small"
                 disabled
@@ -129,7 +127,7 @@
 
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="10" class="el-col">
-            <el-form-item label="产品类别:" label-width="150px" prop="hchzsb">
+            <el-form-item label="产品类别:" prop="hchzsb">
               <el-select
                 size="small"
                 disabled
@@ -143,7 +141,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" class="el-col">
-            <el-form-item label="器械类别:" label-width="150px" prop="qxlb">
+            <el-form-item label="器械类别:" prop="qxlb">
               <el-select
                 size="small"
                 v-model="inputQuery.productType"
@@ -160,7 +158,7 @@
 
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="10" class="el-col">
-            <el-form-item label="注册/备案号:" label-width="150px" prop="recordCode">
+            <el-form-item label="注册/备案号:" prop="recordCode">
               <el-input
                 size="small"
                 placeholder="请输入内容"
@@ -170,7 +168,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" class="el-col">
-            <el-form-item label="器械目录分类编码:" label-width="150px" prop="productDirectoryCode">
+            <el-form-item label="器械目录分类编码:" prop="productDirectoryCode">
               <el-input
                 size="small"
                 placeholder="请输入内容"
@@ -180,48 +178,78 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <!--                    <el-col :span="10" class="el-col">-->
-          <!--                        <el-form-item label="代理人名称:" label-width="150px" prop="agentName">-->
-          <!--                            <el-input-->
-          <!--                                size="small"-->
-          <!--                                placeholder="请输入内容"-->
-          <!--                                v-model="inputQuery.agentName"-->
-          <!--                                @input="change()"-->
-          <!--                            ></el-input>-->
-          <!--                        </el-form-item>-->
-          <!--                    </el-col>-->
         </el-row>
-
-
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="10" class="el-col">
-            <el-form-item label="产品描述:" label-width="150px" prop="cpms">
+            <el-form-item label="允许无批次号">
-              <el-input
+              <el-select v-model="inputQuery.allowNoBatch" style="width: 100%" size="small">
-                size="small"
+                <el-option label="是" :value="true"></el-option>
-                placeholder="请输入内容"
+                <el-option label="否" :value="false"></el-option>
-                v-model="inputQuery.cpms"
+                <el-option label="否" :value="null"></el-option>
-                @input="change()"
+              </el-select>
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="10" class="el-col">
-            <el-form-item label="规格型号:" label-width="150px" prop="specification">
+            <el-form-item label="允许无失效日期">
-              <el-input
+              <el-select v-model="inputQuery.allowNoExpire" style="width: 100%" size="small">
-                size="small"
+                <el-option label="是" :value="true"></el-option>
-                type="textarea"
+                <el-option label="否" :value="false"></el-option>
-                autosize
+                <el-option label="否" :value="null"></el-option>
-                placeholder="请输入内容"
+              </el-select>
-                v-model="inputQuery.specification"
+            </el-form-item>
-                @input="change()"
+          </el-col>
-              ></el-input>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="允许无批次号">
+              <el-select v-model="inputQuery.allowNoProduct" style="width: 100%" size="small">
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
+                <el-option label="否" :value="null"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="允许无序列号">
+              <el-select v-model="inputQuery.allowNoSerial" style="width: 100%" size="small">
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
+                <el-option label="否" :value="null"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
 
 
+        <!--        <el-row :gutter="20" class="el-row" type="flex">-->
+        <!--          <el-col :span="10" class="el-col">-->
+        <!--            <el-form-item label="产品描述:"  prop="cpms">-->
+        <!--              <el-input-->
+        <!--                size="small"-->
+        <!--                placeholder="请输入内容"-->
+        <!--                v-model="inputQuery.cpms"-->
+        <!--                @input="change()"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="10" class="el-col">-->
+        <!--            <el-form-item label="规格型号:"  prop="specification">-->
+        <!--              <el-input-->
+        <!--                size="small"-->
+        <!--                type="textarea"-->
+        <!--                autosize-->
+        <!--                placeholder="请输入内容"-->
+        <!--                v-model="inputQuery.specification"-->
+        <!--                @input="change()"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+
+
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="20" class="el-col">
-            <el-form-item label="备注:" label-width="150px" prop="remark">
+            <el-form-item label="备注:" prop="remark">
               <el-input
                 type="textarea"
                 size="small"
@@ -283,7 +311,8 @@
             </el-button
             >
             <el-button type="text" size="mini" @click.native="showImgViewer(scope.row)">预览</el-button>
-            <el-image-viewer  v-if="imgViewerVisible"    style="z-index:9999"  :on-close="closeImgViewer" :url-list="imgList" />
+            <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
+                             :url-list="imgList"/>
             <el-button
               type="text"
               size="small"
@@ -386,6 +415,7 @@ import supCertSetSelectDialog from "@/views/purchase/cert/supCertSetSelectDialog
 import companyProducts from "@/views/purchase/company/companyProducts";
 import {getUUID} from "@/utils/strUtil";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer"
+
 export default {
   name: "supProductEditDialog",
   props: {
@@ -638,8 +668,7 @@ export default {
     },
     isAssetTypeAnImage(ext) {
       return [
-        'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].
+        'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
-      indexOf(ext.toLowerCase()) !== -1;
     },
     showImgViewer(row) {
       var varindex = row.filePath.lastIndexOf(".");
@@ -654,7 +683,9 @@ export default {
           }
         });
         this.imgViewerVisible = true;
-        const m = (e) => { e.preventDefault() };
+        const m = (e) => {
+          e.preventDefault()
+        };
         document.body.style.overflow = 'hidden';
         document.addEventListener("touchmove", m, false); // 禁止页面滑动
       } else {
@@ -665,7 +696,9 @@ export default {
     },
     closeImgViewer() {
       this.imgViewerVisible = false;
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'auto';
       document.removeEventListener("touchmove", m, true);
     },

src/views/supplier/company/basicCompanyproductDetail.vue

@@ -11,8 +11,11 @@
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-          <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">关联</el-button>
+            <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">
-          <el-button type="text" @click.native.stop="removeErp(scope.row)" :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
+              关联
+            </el-button>
+            <el-button type="text" @click.native.stop="removeErp(scope.row)"
+                       :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
             </el-button>
           </template>
         </el-table-column>
@@ -28,10 +31,12 @@
       <div style=" float: right;
                         text-align: right;
                         margin-bottom: 8px;">
-      <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1" style="text-align:right">解绑DI器械信息
+        <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1"
+                   style="text-align:right">解绑DI器械信息
         </el-button>
       </div>
-    <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row @current-change="handleDetail">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row
+                @current-change="handleDetail">
         <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="packLevel" show-overflow-tooltip></el-table-column>
@@ -116,6 +121,20 @@
                   </el-select>
                 </div>
               </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>允许无序列号:&nbsp;</span>
+                  </div>
+                  <el-select v-model="editQuery.allowNoSerial" disabled style="width: 65%" size="small">
+                    <el-option label="是" :value="true"></el-option>
+                    <el-option label="否" :value="false"></el-option>
+                    <el-option label="否" :value="null"></el-option>
+                  </el-select>
+                </div>
+              </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
@@ -128,8 +147,6 @@
                   </el-select>
                 </div>
               </el-col>
-          </el-row>
-          <el-row :gutter="20" class="el-row" type="flex">
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
@@ -811,7 +828,8 @@
           </el-row>
           <el-row>
             <el-form-item label="包装单位:">
-            <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editSingleFormat.packUnit"></el-input>
+              <el-input style="width: 80%" size="small" splaceholder="请输入内容"
+                        v-model="editSingleFormat.packUnit"></el-input>
             </el-form-item>
           </el-row>
         </el-form>

src/views/supplier/company/basicProductEdit.vue

@@ -345,6 +345,9 @@
                             <el-checkbox v-model="editQuery.allowNoProduct" class="" disabled
                             >允许无生产日期
                             </el-checkbox>
+                          <el-checkbox v-model="editQuery.allowNoSerial" disabled
+                          >允许无序列号
+                          </el-checkbox>
                         </div>
                     </el-col>
                 </el-row>