From 06b298d6ed14c97bb808f6ebdc264d4b4f56cecd Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 31 Mar 2023 18:46:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=9B=B8=E5=85=B3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/busType.js                      | 19 +++++++
 src/views/basic/locUdi/UdiSupplement.vue      | 44 ++++++++--------
 src/views/inout/InvoiceRegister.vue           | 51 ++++++++++++-------
 src/views/inout/PanelCreateOrderBizDetail.vue | 11 ++++
 src/views/myLogin.vue                         | 23 +++++++--
 .../supplier/products/supProductsAddDi.vue    | 16 +++---
 src/views/system/param/busTypePreModify.vue   |  6 +--
 src/views/system/print/pdfPrintSet.vue        | 16 +++---
 8 files changed, 124 insertions(+), 62 deletions(-)

diff --git a/src/api/basic/busType.js b/src/api/basic/busType.js
index 7270496..3809ffd 100644
--- a/src/api/basic/busType.js
+++ b/src/api/basic/busType.js
@@ -82,6 +82,7 @@ export function getBusTypeListByUser(params) {
     params: params
   });
 }
+
 export function filterUnUse(params) {
   return axios({
     url: "/udiwms/localBusType/filterUnUse",
@@ -100,3 +101,21 @@ export function findByInvUser(query) {
 }
 
 
+export function findChangeOrigin(query) {
+  return axios({
+    url: "/udiwms/busType/change/origin",
+    method: "get",
+    params: query
+  });
+}
+
+
+export function findChangeTarget(query) {
+  return axios({
+    url: "/udiwms/busType/change/target",
+    method: "get",
+    params: query
+  });
+}
+
+
diff --git a/src/views/basic/locUdi/UdiSupplement.vue b/src/views/basic/locUdi/UdiSupplement.vue
index d780441..61371a5 100644
--- a/src/views/basic/locUdi/UdiSupplement.vue
+++ b/src/views/basic/locUdi/UdiSupplement.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card class="el-card">
       <div>
-        <el-form :model="unionQuery" size="mini" label-width="125px" v-show="showSearch">
+        <el-form :model="unionQuery" size="mini" label-width="100px" v-show="showSearch">
           <el-row>
             <el-col :span="18">
               <el-form-item class="query-form-item" label="UDI码:">
@@ -14,10 +14,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
-
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item class="query-form-item" label="批次号">
                 <el-input
                   v-model="unionQuery.batchNo" clearable="true"
@@ -26,18 +24,18 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item class="query-form-item" label="产品通用名称:">
+            <el-col :span="8">
+              <el-form-item class="query-form-item" label="物资名称:">
                 <el-input
                   v-model="unionQuery.cpmctymc" clearable="true"
                   size="mini"
-                  placeholder="请输入产品通用名称"
+                  placeholder="请输入物资名称"
                 ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="规格型号:" class="query-form-item">
                 <el-input
                   v-model="unionQuery.ggxh" clearable="true"
@@ -46,7 +44,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="创建时间:">
                 <el-date-picker
                   :picker-options="pickerOptions"
@@ -64,6 +62,8 @@
             </el-col>
           </el-row>
         </el-form>
+
+        <el-divider></el-divider>
         <div class="top-right-btn" style="display:flex;">
           <el-button-group>
             <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏
@@ -95,22 +95,22 @@
             width="280"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
-            label="批次号"
-            prop="batchNo"
-            width="120"
-            show-overflow-tooltip
-          ></el-table-column>
           <el-table-column
             label="产品名称"
             prop="cpmctymc"
-            width="80"
+            width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             label="规格型号"
             prop="ggxh"
-            width="80"
+            width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+            width="120"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
@@ -143,11 +143,11 @@
           <el-table-column
             label="备注"
             prop="remark"
-            width="120"
+            width="160"
             show-overflow-tooltip
           ></el-table-column>
 
-          <el-table-column label="操作">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <el-button
                 type="text"
@@ -267,8 +267,8 @@ export default {
     };
   },
   methods: {
-    closeCodeDialog(){
-      this.selectDialog=false;
+    closeCodeDialog() {
+      this.selectDialog = false;
       this.getList();
     },
 
@@ -285,7 +285,7 @@ export default {
         cpmctymc: "",
         ggxh: ""
       };
-      this.actDateRange=[];
+      this.actDateRange = [];
       this.getList();
     },
     searchList() {
diff --git a/src/views/inout/InvoiceRegister.vue b/src/views/inout/InvoiceRegister.vue
index a82cf6b..cf2a6f1 100644
--- a/src/views/inout/InvoiceRegister.vue
+++ b/src/views/inout/InvoiceRegister.vue
@@ -8,47 +8,64 @@
         <el-button type="primary" size="small" @click="selectSet()">选入</el-button>
       </div>
 
-      <el-table v-loading="loading" :data="list" style="width: 100%"   border highlight-current-row @selection-change="handleCheckedChange">
-        <el-table-column type="selection" width="55"></el-table-column>
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+
+                @selection-change="handleCheckedChange">
+        <el-table-column type="selection" width="55" fixed="left"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
-          label="物资名称称"
+          label="物资名称"
           prop="coName"
+          width="150"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           label="规格型号"
+          width="150"
           prop="spec"
-          show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           label="批次号"
+          width="100"
           prop="batchNo"
-          show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          label="生产日期"
-          prop="productDate"
-        ></el-table-column>
-        <el-table-column
-          label="失效日期"
-          prop="expireDate"
+          label="数量"
+          prop="count"
+          width="100"
         ></el-table-column>
         <el-table-column
-          label="单据数量"
+          label="扫码数量"
           prop="reCount"
+          width="100"
         ></el-table-column>
         <el-table-column
           label="价格"
           prop="price"
+          width="100"
+        ></el-table-column>
+
+        <el-table-column
+          label="生产日期"
+          prop="productDate"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          label="失效日期"
+          prop="expireDate"
+          width="100"
         ></el-table-column>
+        <el-table-column width="100" label="计量单位" prop="measname">
+        </el-table-column>
         <el-table-column
-          label="生产厂家"
+          label="生产企业"
           prop="manufacturer"
+          width="160"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          label="注册/备案凭证号"
+          label="注册/备案号"
+          width="160"
           prop="certCode"
           show-overflow-tooltip
         ></el-table-column>
@@ -69,7 +86,7 @@
 
 <script>
 
-import { getBizDetailList, insertInvoice } from '@/api/inout/orderDetailBiz'
+import {getBizDetailList, insertInvoice} from '@/api/inout/orderDetailBiz'
 
 
 export default {
@@ -114,7 +131,7 @@ export default {
 
     getList() {
       this.loading = true;
-      this.bizQuery.orderIdFk=this.inputQueryId;
+      this.bizQuery.orderIdFk = this.inputQueryId;
       getBizDetailList(this.bizQuery)
         .then(response => {
           this.loading = false;
@@ -130,7 +147,7 @@ export default {
 
 
     selectSet() {
-      var a=JSON.parse(JSON.stringify(this.multipleSelection))
+      var a = JSON.parse(JSON.stringify(this.multipleSelection))
       insertInvoice(a)
         .then(response => {
           if (response.code === 20000) {
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index ec8b696..6d60f75 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -319,6 +319,10 @@ export default {
       this.currentRow = val;
       if (this.currentRow.batchNo == '')
         this.currentRow.batchNo = null;
+      if (this.currentRow.produceDate == '')
+        this.currentRow.produceDate = null;
+      if (this.currentRow.expireDate == '')
+        this.currentRow.expireDate = null;
       this.selectedIndex = val.index;
     },
 
@@ -385,6 +389,13 @@ export default {
       if (row.batchNo == '') {
         row.batchNo = null;
       }
+      if (row.produceDate == '') {
+        row.produceDate = null;
+      }
+      if (row.expireDate == '') {
+        row.expireDate = null;
+      }
+
       updateBizProduct(row)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue
index e624bca..20b4459 100644
--- a/src/views/myLogin.vue
+++ b/src/views/myLogin.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="login-container">
     <div>
-      <h3 class="toptitle">协和医院平潭分院</h3>
+      <el-row>
+        <h3 class="toptitle">协和医院平潭分院</h3>
+      </el-row>
+      <el-row>
+        <h3 class="topSubtitle">医院UDI管理系统</h3>
+      </el-row>
     </div>
     <el-form
       class="card-box login-form"
@@ -15,7 +20,7 @@
         <div style="text-align: center; margin-top: 10px;margin-bottom: 15px">
           <img alt="element-logo" src="@/assets/logo/logo.png"/>
         </div>
-        <h3 class="title">用户登录</h3>
+        <h3 class="title">供应商自助管理系统</h3>
         <el-form-item prop="username" class="item" style="margin-top: -20px">
           <el-input prefix-icon="el-icon-user" placeholder="账号" name="username" autocomplete="on" v-model="loginForm.username">
             <i slot="prefix" class="el-input__icon">
@@ -305,16 +310,24 @@ $light_gray: #eee;
 
   .toptitle {
     position: absolute;
-    font-size: 55px;
+    font-size: 45px;
     color: #FFFFFF;
-    margin: 50px auto 0.5333rem 50px;
+    margin: 120px auto 0.5333rem 180px;
+    text-align: center;
+    font-weight: bold;
+  }
+  .topSubtitle {
+    position: absolute;
+    font-size: 45px;
+    color: #fcd38b;
+    margin: 200px auto 0.5333rem 180px;
     text-align: center;
     font-weight: bold;
   }
 
   .login-form {
     //@include fxied-center;
-    margin: 0px 80px auto auto;
+    margin: 0px 60px auto auto;
     width: 50em;
     /*background-color: silver;*/
     /*background: #fff;*/
diff --git a/src/views/supplier/products/supProductsAddDi.vue b/src/views/supplier/products/supProductsAddDi.vue
index 30e0cf0..a1ae40b 100644
--- a/src/views/supplier/products/supProductsAddDi.vue
+++ b/src/views/supplier/products/supProductsAddDi.vue
@@ -3,32 +3,34 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="DI产品标识:">
               <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入DI产品标识" clearable
                         @keyup.enter.native="keyupErp_submit($event)"
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="产品名称:">
               <el-input v-model="filterQuery.name" style="width: 90%" clearable placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="规格型号:">
               <el-input v-model="filterQuery.spec" style="width: 90%" clearable placeholder="请输入规格型号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="注册证编号:">
               <el-input v-model="filterQuery.registerNo" style="width: 90%" clearable
                         placeholder="请输入注册证编号"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
+
             <el-form-item label="审核状态:">
               <el-select v-model="filterQuery.checkStatus" style="width: 90%" placeholder="请选择审核状态">
                 <el-option label="全部" value=""></el-option>
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 7170c40..400cd08 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -161,7 +161,7 @@
 
 <script>
 
-import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
+import {findChangeOrigin, findChangeTarget, getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
 import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
@@ -235,7 +235,7 @@ export default {
       let query = {
         enable: true
       };
-      getBusTypeList(query).then((res) => {
+      findChangeOrigin(query).then((res) => {
         if (res.code === 20000) {
           this.originBusTypes = res.data.list || [];
         }
@@ -246,7 +246,7 @@ export default {
       let query = {
         enable: true
       };
-      getBusTypeList(query).then((res) => {
+      findChangeTarget(query).then((res) => {
         if (res.code === 20000) {
           this.targetTypes = res.data.list || [];
         }
diff --git a/src/views/system/print/pdfPrintSet.vue b/src/views/system/print/pdfPrintSet.vue
index 0ac105b..1bf6dfc 100644
--- a/src/views/system/print/pdfPrintSet.vue
+++ b/src/views/system/print/pdfPrintSet.vue
@@ -129,14 +129,14 @@
                       placeholder="请输入"></el-input>
           </template>
         </el-table-column>
-        <el-table-column label="打印方式" prop="remark1" show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.printType" placeholder="打印方式">
-              <el-option label="批次号" :value=0></el-option>
-              <el-option label="条码清单" :value=1></el-option>
-            </el-select>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="打印方式" prop="remark1" show-overflow-tooltip="true">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-select v-model="scope.row.printType" placeholder="打印方式">-->
+<!--              <el-option label="批次号" :value=0></el-option>-->
+<!--              <el-option label="条码清单" :value=1></el-option>-->
+<!--            </el-select>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="操作" width="150" prop="price">
           <template slot-scope="scope">
             <el-button