证书加规格型号

2 years ago · a6663be10b
parent 7cb8f7407e
commit a6663be10b
5 changed files with 790 additions and 743 deletions
--- a/.env.production
+++ b/.env.production
@ -15,13 +15,13 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'

 # 平潭
-VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'

 # 文明懂
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'

 # 刘恩典
-# VUE_APP_BASE_API = 'http://192.168.0.243:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/'

 # 漳州中医院
 # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
@ -29,6 +29,10 @@ VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 # 平和
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'

+# 长泰医院
+# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
+
+

 # 应用访问路径 例如使用前缀 /admin/

--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@ -276,6 +276,7 @@
                style="width: 100%">
        <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="ggxh" show-overflow-tooltip></el-table-column>
        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
--- a/src/views/purchase/cert/supCertSearch.vue
+++ b/src/views/purchase/cert/supCertSearch.vue
@ -7,12 +7,14 @@
        <el-row>
          <el-col span="6">
            <el-form-item label="配送企业名称:">
-                        <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称" clearable></el-input>
+              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称"
+                        clearable></el-input>
            </el-form-item>
          </el-col>
          <el-col span="6">
            <el-form-item label="统一社会信用号:">
-                        <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号" clearable></el-input>
+              <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号"
+                        clearable></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@ -28,7 +30,8 @@

      <el-divider style="margin: 15px"></el-divider>

-            <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @row-click="supCompanyClick">
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+                @row-click="supCompanyClick">
        <el-table-column type="index" label="序号" width="50"></el-table-column>
        <el-table-column label="配送企业名称" prop="companyName" show-overflow-tooltip></el-table-column>
        <el-table-column label="统一社会信用号" prop="creditNum"></el-table-column>
@ -44,9 +47,15 @@

        <el-table-column label="操作" width="180">
          <template slot-scope="scope">
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3" @click.native.stop="editCompany(scope.row)">审核</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native.stop="editCompany(scope.row)">详情</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native="printSupCertPdf(scope.row)">打印</el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"
+                       @click.native.stop="editCompany(scope.row)">审核
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native.stop="editCompany(scope.row)">详情
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native="printSupCertPdf(scope.row)">打印
+            </el-button>
          </template>
        </el-table-column>
      </el-table>
@ -84,12 +93,14 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="生产企业名称">
-                        <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%" placeholder="请输入生产企业名称" clearable></el-input>
+              <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%" placeholder="请输入生产企业名称"
+                        clearable></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="统一社会信用号">
-                        <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%" placeholder="请输入统一社会信用号" clearable></el-input>
+              <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%" placeholder="请输入统一社会信用号"
+                        clearable></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@ -105,7 +116,8 @@
      </div>
      <el-divider style="margin: 15px"></el-divider>

-          <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%" border highlight-current-row @row-click="supManufacturerClick">
+      <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%" border
+                highlight-current-row @row-click="supManufacturerClick">
        <el-table-column label="序号" type="index"></el-table-column>
        <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
@ -127,9 +139,15 @@

        <el-table-column label="操作" width="180">
          <template slot-scope="scope">
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3" @click.native.stop="addInfoDialog(scope.row)">审核</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native.stop="addInfoDialog(scope.row)">详情</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native="printSupCertManufacturerPdf(scope.row)">打印</el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"
+                       @click.native.stop="addInfoDialog(scope.row)">审核
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native.stop="addInfoDialog(scope.row)">详情
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native="printSupCertManufacturerPdf(scope.row)">打印
+            </el-button>
          </template>
        </el-table-column>
      </el-table>
@ -166,13 +184,16 @@
      <el-form :model="registrationQuery" class="query-form" label-width="100px" v-show="showSearch2">
        <el-row style="width: 100%">
          <el-form-item label="物资名称:">
-                        <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable="true" placeholder="请输入物资名称"></el-input>
+            <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable="true"
+                      placeholder="请输入物资名称"></el-input>
          </el-form-item>
          <el-form-item label="注册备案号:">
-                        <el-input v-model="registrationQuery.recordCode" style="width: 90%"  clearable="true" placeholder="请输入注册备案号"></el-input>
+            <el-input v-model="registrationQuery.recordCode" style="width: 90%" clearable="true"
+                      placeholder="请输入注册备案号"></el-input>
          </el-form-item>
          <el-form-item label="注册备案人:">
-                        <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%"  clearable="true" placeholder="请输入注册备案人"></el-input>
+            <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%" clearable="true"
+                      placeholder="请输入注册备案人"></el-input>
          </el-form-item>
        </el-row>
      </el-form>
@ -186,9 +207,11 @@
      </div>
      <el-divider style="margin: 15px"></el-divider>

-            <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row style="width: 100%">
+      <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row
+                style="width: 100%">
        <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="ggxh" show-overflow-tooltip></el-table-column>
        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
@ -204,9 +227,15 @@

        <el-table-column label="操作" width="180">
          <template slot-scope="scope">
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3" @click.native.stop="registrationDialog(scope.row)">审核</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native.stop="registrationDialog(scope.row)">详情</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native="printSupCertProductionPdf(scope.row)">打印</el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"
+                       @click.native.stop="registrationDialog(scope.row)">审核
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native.stop="registrationDialog(scope.row)">详情
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native="printSupCertProductionPdf(scope.row)">打印
+            </el-button>
          </template>
        </el-table-column>
      </el-table>
@ -241,7 +270,15 @@
 </template>

 <script>
-import {getSupComapnys, delSupComapnys, printSupCert, verifyTemplateFile,filterCompanyCertIdList,printSupCertManufacturer,printSupCertProduction} from "@/api/purchase/supCompany";
+import {
+  getSupComapnys,
+  delSupComapnys,
+  printSupCert,
+  verifyTemplateFile,
+  filterCompanyCertIdList,
+  printSupCertManufacturer,
+  printSupCertProduction
+} from "@/api/purchase/supCompany";
 import supCompanyEditAdudit from "@/views/purchase/company/supCompanyAduditDialog";
 import supManufacturerAuditDialog from "@/views/purchase/manufacturer/supManufacturerAuditDialog";
 import {deleteCompany, getCompanyList} from "@/api/purchase/supManufacturer";
--- a/src/views/purchase/cert/supCertificationAdd.vue
+++ b/src/views/purchase/cert/supCertificationAdd.vue
@ -234,6 +234,11 @@
          prop="recordProductName"
          show-overflow-tooltip
        ></el-table-column>
+        <el-table-column
+          label="规格型号"
+          prop="ggxh"
+          show-overflow-tooltip
+        ></el-table-column>
        <el-table-column
          label="注册/备案号"
          prop="recordCode"