新增退货补单流程，诏安两个分库问题，单据明细打印问题，证书显示规格型号

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://192.168.0.166:9991'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 

.env.production

@@ -14,9 +14,10 @@ ENV = 'production'
 
 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.127:9160/UDI_WMS_MC/'
 
 # 平潭正式
-VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 漳州中医院
 # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'

src/api/inout/orderDetailResult.js

@@ -33,3 +33,22 @@ export function printOrder(data) {
     data: data
   });
 }
+
+
+export function excelInoutImport(params) {
+  return axios({
+    url: "/udiwms/inout/resultDetail/exportExcel",
+    method: "get",
+    responseType: 'blob',
+    params: params
+  });
+}
+
+export function postExcelInoutImport(data) {
+  return axios({
+    url: "/udiwms/inout/resultDetail/selectExportExcel",
+    method: "post",
+    responseType: 'blob',
+    data: data
+  });
+}

src/views/inout/DialogSelectInvProduct.vue

@@ -72,6 +72,7 @@
         <el-table-column label="DI/物资编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" width="90"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="90"></el-table-column>
         <el-table-column label="价格" prop="price"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="90"></el-table-column>

src/views/inout/receive/DialogNewReceive.vue

@@ -59,8 +59,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item class="query-form-item" prop="targetInvCode" label="领用仓库:">
+            <el-form-item class="query-form-item" prop="targetInvCode" label="到货仓库:">
-              <el-select v-model="formData.targetInvCode" placeholder="请选择领用仓库" @change="getTargerType"
+              <el-select v-model="formData.targetInvCode" placeholder="请选择到货仓库" @change="getTargerType"
                          clearable="true"
                          style="width: 100%"
               >

src/views/inventory/supInoutSearchOrder.vue

@@ -110,6 +110,8 @@
           <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-document" @click="selectExport">选中导出Excel</el-button>
+          <el-button type="primary" icon="el-icon-document" @click="searchExport">结果导出Excel</el-button>
           <el-button type="primary" icon="el-icon-printer" @click="optinPrint">选中打印</el-button>
           <el-button type="primary" icon="el-icon-printer" @click="selectPrint">查询结果打印</el-button>
 
@@ -159,9 +161,16 @@
 </template>
 
 <script>
-import {getResultDetailList, getResultOrderList, verifyTemplateFile, printOrder} from '@/api/inout/orderDetailResult'
+import {
+  getResultDetailList,
+  getResultOrderList,
+  verifyTemplateFile,
+  printOrder,
+  excelInoutImport, postExcelInoutImport
+} from '@/api/inout/orderDetailResult'
 import {findByInvUser, getLocalJoinByUser} from "@/api/basic/busType";
 import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
+import {excelImport} from "@/api/inout/statData";
 
 export default {
   name: "supInoutSearchOrder",
@@ -386,8 +395,6 @@ export default {
 
     },
     selectPrint() {
-
-
       this.$confirm("是否确定打印所有查询结果数据", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -446,9 +453,74 @@ export default {
       return;
 
 
+    },
+
+    selectExport() {
+      this.$confirm("是否确定导出选中出入库明细, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (this.orderSelection == null || this.orderSelection.length <= 0) {
+            return this.$message.error("请选择需要导出的明细！");
           }
+          let printParams = {
+            list: this.orderSelection
+          };
+          postExcelInoutImport(printParams).then((response) => {
+            let blob = new Blob([response], {type: "application/vnd.ms-excel"});
+            let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+            let a = document.createElement("a");
+            a.href = url;
+            a.click();
+            this.$message("成功")
+          })
+        });
+
+
+    },
+    searchExport() {
+      this.$confirm("是否确定打印所有查询结果数据", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+
+          let printParams = {
+            orderIdFk: this.filterQuery.orderIdFk,
+            nameCode: this.filterQuery.nameCode,
+            coName: this.filterQuery.coName,
+            spec: this.filterQuery.spec,
+            batchNo: this.filterQuery.batchNo,
+            zczbhhzbapzbh: this.filterQuery.zczbhhzbapzbh,
+            manufacturer: this.filterQuery.manufacturer,
+            actionType: this.filterQuery.actionType,
+            keyWords: this.filterQuery.keyWords,
+            mainAction: this.filterQuery.mainAction,
+            action: this.filterQuery.action
+
+          };
+          if (this.actDateRange !== null) {
+            printParams.startAduditTime = this.actDateRange[0];
+            printParams.endAduditTime = this.actDateRange[1];
+          } else {
+            printParams.startAduditTime = null;
+            printParams.endAduditTime = null;
           }
-  ,
+          excelInoutImport(printParams).then((response) => {
+            let blob = new Blob([response], {type: "application/vnd.ms-excel"});
+            let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+            let a = document.createElement("a");
+            a.href = url;
+            a.click();
+            this.$message("成功")
+          })
+
+        });
+    }
+  },
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();

src/views/purchase/cert/supCertAudit.vue

@@ -275,6 +275,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>

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"
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native.stop="editCompany(scope.row)">详情</el-button>
+                       @click.native.stop="editCompany(scope.row)">审核
-                        <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>
+            <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"
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native.stop="addInfoDialog(scope.row)">详情</el-button>
+                       @click.native.stop="addInfoDialog(scope.row)">审核
-                        <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>
+            <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>
@@ -167,17 +185,20 @@
         <el-row style="width: 100%">
           <el-col :span="6">
             <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-col>
           <el-col :span="6">
             <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-col>
           <el-col :span="6">
             <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-col>
         </el-row>
@@ -192,9 +213,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>
@@ -210,9 +233,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"
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native.stop="registrationDialog(scope.row)">详情</el-button>
+                       @click.native.stop="registrationDialog(scope.row)">审核
-                        <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>
+            <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>
@@ -247,7 +276,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";

src/views/purchase/cert/supCertificationAdd.vue

@@ -146,6 +146,11 @@
                 highlight-current-row>
         <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>

src/views/system/param/busTypePreModify.vue

@@ -99,6 +99,7 @@
               <el-option label="向上级仓库补单" :value="2"></el-option>
               <el-option label="预验收转入库补单" :value="3"></el-option>
               <el-option label="寄售转入库补单" :value="4"></el-option>
+              <el-option label="退货补单" :value="5"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -116,6 +117,22 @@
 
           </el-form-item>
         </el-col>
+
+        <el-col :span="11">
+          <el-form-item label="默认补单仓库" prop="defaultInvCode">
+            <el-select v-model="inputQuery.defaultInvCode" placeholder="默认补单仓库" clearable size="small"
+                       @change="invChange"
+                       style="width: 90%">
+              <el-option
+                v-for="item in fromInvs"
+                :key="item.name"
+                :label="item.name"
+                :value="item.code">
+                <span style="float: left"> {{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-divider content-position="left">生成业务单</el-divider>
       <el-row>
@@ -174,7 +191,7 @@
 <script>
 
 import {findChangeOrigin, findChangeTarget, getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
-import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
+import {filterSubAll, findByFrom, getInvWarehouseList} from "@/api/system/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
 
@@ -263,7 +280,8 @@ export default {
 
     getTargetBusType() {
       let query = {
-        enable: true
+        enable: true,
+        invCode: this.inputQuery.defaultInvCode,
       };
       findChangeTarget(query).then((res) => {
         if (res.code === 20000) {
@@ -295,10 +313,10 @@ export default {
 
     getFromInv() {
       let params = {
-        locInvCode: this.inputQuery.invCode,
+        // locInvCode: this.inputQuery.invCode,
-        filter: 2
+        // filter: 2
       };
-      findByFrom(params).then((res) => {
+      getInvWarehouseList(params).then((res) => {
         if (res.code === 20000) {
           this.fromInvs = res.data;
         }
@@ -306,16 +324,10 @@ export default {
     },
 
     invChange() {
-      if (!isBlank(this.inputQuery.invCode)) {
-        this.getFromInv();
-
-      } else {
-        this.inputQuery.action = null;
       this.targetTypes = [];
-      }
+      this.getTargetBusType()
     },
   },
-
   created() {
     if (this.inputQuery.originAction == null) {
       this.isAdd = true;