Merge remote-tracking branch 'origin/dev2.0' into 20231126-yw

src/api/basic/busType.js

@@ -19,6 +19,15 @@ export function getLocalJoinByUser(params) {
 }
 
 
+export function getOrderDetailBus(params) {
+  return axios({
+    url: "/udiwms/orderDetail/busTypes",
+    method: "get",
+    params: params
+  });
+}
+
+
 export function insertBusType(data) {
   return axios({
     url: "/udiwms/bussinessType/insert",

src/layout/components/Navbar.vue

@@ -406,6 +406,7 @@ export default {
                 this.inv = store.getters.locInvName
                 this.deptName = store.getters.locDeptName
               });
+              window.location.reload()
             } else {
               this.$message.error(res.message);
             }

src/views/inventory/supInoutSearchOrder.vue

@@ -1,81 +1,61 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="出入库单号:">
+            <el-form-item label="出入库单号:">
               <el-input v-model="filterQuery.orderIdFk" placeholder="请输入出入库单号" style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="DI/物资编码:">
+            <el-form-item label="DI/物资编码:">
               <el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码" style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="物资名称:">
+            <el-form-item label="物资名称:">
               <el-input v-model="filterQuery.coName" placeholder="请输入物资名称" style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="规格型号:">
+            <el-form-item label="规格型号:">
               <el-input v-model="filterQuery.spec" placeholder="请输入规格型号" style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="批次号:">
+            <el-form-item label="批次号:">
               <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="注册/备案号:">
+            <el-form-item label="注册/备案号:">
               <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="生产企业:">
+            <el-form-item label="生产企业:">
               <el-input v-model="filterQuery.manufacturer" placeholder="生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="出入库时间:">
+            <el-form-item label="往来单位:">
-              <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="width: 90%"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item class="query-form-item" label="往来单位:">
               <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="出入库类型:">
+            <el-form-item label="出入库类型:">
               <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
                 <el-option label="全部" value=""></el-option>
                 <el-option label="入库" value="WareHouseIn"></el-option>
@@ -83,7 +63,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item prop="action" label="单据类型:">
               <el-select
@@ -102,7 +81,31 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+          <el-col :span="6">
+            <el-form-item label="打印状态:">
+              <el-select v-model="filterQuery.inoutPrintStatus" placeholder="请选择打印状态" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="未打印" :value="0"></el-option>
+                <el-option label="已打印" :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出入库时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -168,7 +171,7 @@ import {
   printOrder,
   excelInoutImport, postExcelInoutImport
 } from '@/api/inout/orderDetailResult'
-import {findByInvUser, getLocalJoinByUser} from "@/api/basic/busType";
+import {findByInvUser, getLocalJoinByUser, getOrderDetailBus} from "@/api/basic/busType";
 import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
 import {excelImport} from "@/api/inout/statData";
 
@@ -193,6 +196,8 @@ export default {
         actionType: null,
         fromCorp: null,
         keyWords: null,
+        inoutPrintStatus: null,
+
       },
 
       printMap: {
@@ -302,8 +307,9 @@ export default {
       let query = {
         code: this.$store.getters.locInvCode,
         enabled: true,
+        detailType: this.actionType
       };
-      getLocalJoinByUser(query)
+      getOrderDetailBus(query)
         .then((response) => {
           this.busTypeOptions = response.data.list || [];
         })
@@ -481,7 +487,7 @@ export default {
 
     },
     searchExport() {
-      this.$confirm("是否确定打印所有查询结果数据", "提示", {
+      this.$confirm("是否确定导出所有查询结果数据", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -500,8 +506,14 @@ export default {
             keyWords: this.filterQuery.keyWords,
             mainAction: this.filterQuery.mainAction,
             action: this.filterQuery.action
-
           };
+
+          if (this.filterQuery.actionType == 'preInDetail') {
+            printParams.invCode = '1000001'
+          } else if (this.filterQuery.actionType == 'preDetail') {
+            printParams.invCode = '1000002'
+          }
+
           if (this.actDateRange !== null) {
             printParams.startAduditTime = this.actDateRange[0];
             printParams.endAduditTime = this.actDateRange[1];

src/views/purchase/purApply/purOrderSelectProduct.vue

@@ -109,7 +109,6 @@
         <el-table-column label="医疗器械注册人" width="160" prop="ylqxzcrbarmc"></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" width="100" show-overflow-tooltip></el-table-column>
         <el-table-column label="供应商" prop="companyName" width="160" show-overflow-tooltip></el-table-column>
-
         <el-table-column
           v-if="productRemarkSet.remarkEnable1"
           :label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1" width="140"
@@ -118,7 +117,14 @@
           v-if="productRemarkSet.remarkEnable2"
           :label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2" width="140"
           show-overflow-tooltip></el-table-column>
-
+        <el-table-column
+          v-if="productRemarkSet.remarkEnable3"
+          :label="productRemarkSet.remarkTitle3" prop="basicPrductRemak3" width="140"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column
+          v-if="productRemarkSet.remarkEnable4"
+          :label="productRemarkSet.remarkTitle4" prop="basicPrductRemak4" width="140"
+          show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="80" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>