Merge remote-tracking branch 'origin/dev_drug' into dev_drug

src/api/basic/ybNotCode.js

@@ -3,28 +3,28 @@ import axios from "@/utils/request";
 
 export function ybNotCodePage(query) {
   return axios({
-    url: "/udispms/ybNotCode/page",
+    url: "/udi/ybNotCode/page",
     method: "post",
     data: query
   });
 }
 export function ybNotCodeAdd(query) {
   return axios({
-    url: "/udispms/ybNotCode/add",
+    url: "/udi/ybNotCode/add",
     method: "post",
     data: query
   });
 }
 export function ybNotCodeDelete(query) {
   return axios({
-    url: "/udispms/ybNotCode/delete",
+    url: "/udi/ybNotCode/delete",
     method: "post",
     data: query
   });
 }
 export function ybNotCodeUpdate(query) {
   return axios({
-    url: "/udispms/ybNotCode/update",
+    url: "/udi/ybNotCode/update",
     method: "post",
     data: query
   });
@@ -32,7 +32,7 @@ export function ybNotCodeUpdate(query) {
 
 export function ybNotCodeExport(query) {
   return axios({
-    url: "/udispms/ybNotCode/export",
+    url: "/udi/ybNotCode/export",
     method: 'get',
     responseType: 'blob'
     , params: query

src/views/basic/product/basicYbNotCode.vue

@@ -18,16 +18,16 @@
 
           <el-col :span="7" class="el-col">
 
-          <el-form-item label="无码类型:" prop="type">
-            <el-select class="query-form-item"  v-model="filterQuery.notCodeType" placeholder="无码类型" >
-              <el-option label="全部" :value="-1"></el-option>
-
-              <el-option label="部分早期未赋予追溯码" :value="1"></el-option>
-              <el-option label="最小包装无追溯码" :value="5"></el-option>
-              <el-option label="无追溯码" :value="6"></el-option>
-              <el-option label="其他原因" :value="7"></el-option>
-            </el-select>
-          </el-form-item>
+            <el-form-item label="无码类型:" prop="type">
+              <el-select class="query-form-item"  v-model="filterQuery.notCodeType" placeholder="无码类型" >
+                <el-option label="全部" :value="-1"></el-option>
+
+                <el-option label="部分早期未赋予追溯码" :value="1"></el-option>
+                <el-option label="最小包装无追溯码" :value="5"></el-option>
+                <el-option label="无追溯码" :value="6"></el-option>
+                <el-option label="其他原因" :value="7"></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
 
         </el-row>
@@ -39,7 +39,7 @@
 
       <div class="top-right-btn" style="display: flex; align-items: center;">
         <el-button-group>
-<!--          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>-->
+          <!--          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>-->
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
           <el-button type="primary" icon="el-icon-search" @click="addYbNotCode">新增</el-button>
@@ -102,6 +102,7 @@
                   style="width: 80%"
                   clearable
                   size="small"
+                  :disabled="this.type==2"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -112,7 +113,6 @@
                   style="width: 80%"
                   clearable
                   size="small"
-                  :disabled="this.type==2"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -161,26 +161,7 @@
         </chooseDrug>
       </el-dialog>
 
-      <el-dialog
-        title="药品字典-从指定系统添加药品字典"
-        :visible.sync="chooseHouseDrugVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="85%"
-        v-if="chooseHouseDrugVisible"
-      >
-        <chooseHouseDrug
-          :closeDialog="closeDialog"
-          :uuid="uuid"
-          :relId="relId"
-          :isImport="isImport"
-          :data="thisData"
-          :defaultSys="defaultSys"
-          :mainIds="mainIds"
-          @closeUdi="closeDialog"
-          :supEnable="false"
-        ></chooseHouseDrug>
-      </el-dialog>
+
 
     </el-card>
 
@@ -198,16 +179,13 @@ import {
 
 } from '@/api/basic/ybNotCode'
 
-import drugAdd from '@/views/basic/product/drug/drugAdd'
-import chooseDrug from '@/views/basic/product/drug/chooseDrug'
-import chooseHouseDrug from '@/views/basic/product/drug/chooseHouseDrug'
 import { getAdminId, getToken } from '@/utils/auth'
 import { executeFuc, getHead } from '@/utils/customConfig'
 import Treeselect from '@riophae/vue-treeselect'
 import { addDrug, updatetDrug } from '@/api/basic/product/drugUdiinfos'
 
 export default {
-  components: { Treeselect, drugAdd, chooseDrug, chooseHouseDrug },
+  components: { Treeselect },
   name: 'drugMaintain',
   data() {
     return {
@@ -453,7 +431,11 @@ export default {
   created() {
 
     this.getList()
+  },
+  mounted() {
+
   }
+
 }
 </script>
 
@@ -472,6 +454,6 @@ export default {
   display: inline-flex; /* 确保上传组件与其他按钮在同一行 */
 }
 .query-form-item {
-  width: 350px;
+  width: 300px;
 }
 </style>

src/views/inout/InvoiceCkeck.vue

@@ -498,6 +498,19 @@ export default {
         this.$message.error("日期不能为空！");
         return;
       }
+      console.log('this.invoiceRow',this.invoiceRow)
+
+      this.invoiceRow[0].ggxh = this.inputQuery.ggxh
+      this.invoiceRow[0].machineNo = this.inputQuery.machineNo
+      this.invoiceRow[0].invoiceCode = this.inputQuery.invoiceCode
+      this.invoiceRow[0].invoiceEncode = this.inputQuery.invoiceEncode
+      this.invoiceRow[0].price = this.inputQuery.price
+      this.invoiceRow[0].invoiceDate = this.inputQuery.invoiceDate
+      this.invoiceRow[0].remark = this.inputQuery.remark
+      this.invoiceRow[0].licenseUrl = this.inputQuery.licenseUrl
+
+
+
       this.inputQuery.list = this.invoiceRow;
       let mount = 0;
       for (var i = 0; i < this.invoiceRow.length; i++) {