Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/purchase/cert/supCertAddDialog.vue

.env.production

@@ -8,12 +8,13 @@ ENV = 'production'
 #林纪裕
 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
 
-# 测试服务器
+# 吴总测试服务器
-VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
+# 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/'
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'

src/layout/components/Sidebar/Logo.vue

@@ -72,7 +72,8 @@ export default {
 
     & .sidebar-logo {
       width: 100px;
-      height: 100px;
+      height: 73px;
+      margin-top: 12px;
       vertical-align: middle;
       margin-right: 12px;
     }
@@ -92,7 +93,7 @@ export default {
 
   &.collapse {
     .sidebar-logo {
-      width: 32px;
+      width: 44px;
       height: 32px;
       margin-right: 0px;
     }

src/views/inout/InvoiceRegister.vue

@@ -69,9 +69,7 @@
 
 <script>
 
-import {filterCertSet, selectAllCert} from "@/api/purchase/supCertSet";
+import { getBizDetailList, insertInvoice } from '@/api/inout/orderDetailBiz'
-import {getResultDetailList} from "@/api/inout/orderDetailResult";
-import {insertInvoice} from '@/api/inout/orderDetailBiz'
 
 
 export default {
@@ -117,7 +115,7 @@ export default {
     getList() {
       this.loading = true;
       this.bizQuery.orderIdFk=this.inputQueryId;
-      getResultDetailList(this.bizQuery)
+      getBizDetailList(this.bizQuery)
         .then(response => {
           this.loading = false;
           this.list = response.data.list || [];

src/views/inout/InvoiceRegistration.vue

@@ -428,7 +428,6 @@ import InvoiceRegister from "@/views/inout/InvoiceRegister";
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
 import {getDeptListByUser} from "@/api/auth/authDept";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
-import { getCodeDetailList } from '@/api/inout/orderDetailCode'
 
 
 const formJson = {
@@ -831,7 +830,7 @@ export default {
 
       this.codeQuery.orderIdFk = this.currentRow.billNo;
       this.codeDetailLoading = true;
-      getCodeDetailList(this.codeQuery).then((res) => {
+      getBizDetailList(this.codeQuery).then((res) => {
         this.codeDetailLoading = false;
         if (res.code === 20000) {
           this.codeDetailList = res.data.list || [];

src/views/inout/IoSupAduitOrder.vue

@@ -411,6 +411,7 @@ import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/ap
 import AcceptOrder from "@/views/inout/DialogThrReviewOrder";
 import {getDeptListByUser} from "@/api/auth/authDept";
 import DialogCheck from "@/views/inout/DialogCheck";
+import { getBizDetailList } from '@/api/inout/orderDetailBiz'
 
 const formJson = {
   site_id: "",
@@ -725,7 +726,7 @@ export default {
       }
       this.bizDetailLoading = true;
       this.bizQuery.orderIdFk = this.currentRow.billNo;
-      getResultDetailList(this.bizQuery).then((res) => {
+      getBizDetailList(this.bizQuery).then((res) => {
         this.bizDetailLoading = false;
         if (res.code === 20000) {
           this.bizDetailList = res.data.list || [];

src/views/inout/IoSupSecAuditOrder.vue

@@ -437,6 +437,8 @@ import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/ap
 import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import {getDeptListByUser} from "@/api/auth/authDept";
 import DialogCheck from "@/views/inout/DialogCheck";
+import {getBizDetailList} from "@/api/inout/orderDetailBiz";
+
 
 
 const formJson = {
@@ -765,7 +767,7 @@ export default {
       }
       this.bizDetailLoading = true;
       this.bizQuery.orderIdFk = this.currentRow.billNo;
-      getResultDetailList(this.bizQuery).then((res) => {
+      getBizDetailList(this.bizQuery).then((res) => {
         this.bizDetailLoading = false;
         if (res.code === 20000) {
           this.bizDetailList = res.data.list || [];

src/views/supplier/products/supDiProductsCheck.vue

@@ -75,6 +75,7 @@
         <el-table-column label="规格型号" prop="standard" show-overflow-tooltip></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册证编号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
         <el-table-column label="审核状态" prop="status" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ checkMap[scope.row.status] }}</span>

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1:9993`,
+        target: `http://192.168.0.166:9993/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''