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

src/api/system/dept.js

@@ -131,3 +131,23 @@ export function redMoneyDetailList(query) {
     params: query
   })
 }
+
+// 导出部门红包明细
+export function exportRedMoneyDetail(deptId) {
+  return request({
+    url: '/system/dept/exportRedMoneyDetail',
+    method: 'get',
+    params: { deptId: deptId },
+    responseType: 'blob'
+  })
+}
+
+// 导出部门流量明细
+export function exportFlowDetail(deptId) {
+  return request({
+    url: '/system/dept/exportFlowDetail',
+    method: 'get',
+    params: { deptId: deptId },
+    responseType: 'blob'
+  })
+}

src/views/hisStore/storeProduct/index.vue

@@ -99,15 +99,15 @@
           />
         </el-form-item>
 
-        <el-form-item label="批号" prop="batchNumber">
-          <el-input
-            v-model="queryParams.batchNumber"
-            placeholder="请输入批号"
-            clearable
-            size="small"
+<!--        <el-form-item label="批号" prop="batchNumber">-->
+<!--          <el-input-->
+<!--            v-model="queryParams.batchNumber"-->
+<!--            placeholder="请输入批号"-->
+<!--            clearable-->
+<!--            size="small"-->
 
-          />
-        </el-form-item>
+<!--          />-->
+<!--        </el-form-item>-->
 
         <el-form-item label="上市许可持有人" prop="mah">
           <el-input
@@ -587,11 +587,11 @@
             </el-row>
 
             <el-row>
-              <el-col :span="12">
-                <el-form-item label="批号" prop="batchNumber">
-                  <el-input v-model="form.batchNumber" placeholder="请输入批号"/>
-                </el-form-item>
-              </el-col>
+<!--              <el-col :span="12">-->
+<!--                <el-form-item label="生产批号/序列号" prop="batchNumber">-->
+<!--                  <el-input v-model="form.batchNumber" placeholder="请输入生产批号/序列号"/>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
               <el-col :span="12">
                 <el-form-item label="规格" prop="prescribeSpec">
                   <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>
@@ -1409,19 +1409,19 @@ export default {
           this.debounceCheckStoreLicense();
         }
         // 动态调整批号的验证规则
-        this.$nextTick(() => {
-          if (this.isMedicalDeviceCategory) {
-            // 是器械时，批号为必填
-            if (!this.rules.batchNumber?.some(rule => rule.required)) {
-              this.rules.batchNumber = [{ required: true, message: "批号不能为空", trigger: "blur" }, ...(this.rules.batchNumber || [])];
-            }
-          } else {
-            // 非器械时，移除批号必填规则
-            if (this.rules.batchNumber) {
-              this.rules.batchNumber = this.rules.batchNumber.filter(rule => !rule.required);
-            }
-          }
-        });
+        // this.$nextTick(() => {
+        //   if (this.isMedicalDeviceCategory) {
+        //     // 是器械时，批号为必填
+        //     if (!this.rules.batchNumber?.some(rule => rule.required)) {
+        //       this.rules.batchNumber = [{ required: true, message: "批号不能为空", trigger: "blur" }, ...(this.rules.batchNumber || [])];
+        //     }
+        //   } else {
+        //     // 非器械时，移除批号必填规则
+        //     if (this.rules.batchNumber) {
+        //       this.rules.batchNumber = this.rules.batchNumber.filter(rule => !rule.required);
+        //     }
+        //   }
+        // });
       },
       immediate: true
     },
@@ -1714,9 +1714,9 @@ export default {
         unitPrice: [
           {required: true, message: "单价不能为空", trigger: "blur"}
         ],
-        batchNumber: [
-          {required: true, message: "批号不能为空", trigger: "blur"}
-        ],
+        // batchNumber: [
+        //   {required: true, message: "批号不能为空", trigger: "blur"}
+        // ],
         mah: [
           {required: true, message: "上市许可持有人不能为空", trigger: "blur"}
         ],

src/views/hisStore/storeProductAudit/index.vue

@@ -247,11 +247,11 @@
             </el-row>
 
             <el-row>
-              <el-col :span="12">
-                <el-form-item label="批号" prop="batchNumber">
-                  <el-input v-model="form.batchNumber" placeholder="请输入批号"/>
-                </el-form-item>
-              </el-col>
+<!--              <el-col :span="12">-->
+<!--                <el-form-item label="生产批号/序列号" prop="batchNumber">-->
+<!--                  <el-input v-model="form.batchNumber" placeholder="请输入生产批号/序列号"/>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
               <el-col :span="12">
                 <el-form-item label="规格" prop="prescribeSpec">
                   <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>
@@ -1049,9 +1049,9 @@ export default {
         unitPrice: [
           { required: true, message: "单价不能为空", trigger: "blur" }
         ],
-        batchNumber: [
-          { required: true, message: "批号不能为空", trigger: "blur" }
-        ],
+        // batchNumber: [
+        //   { required: true, message: "批号不能为空", trigger: "blur" }
+        // ],
         mah: [
           { required: true, message: "上市许可持有人不能为空", trigger: "blur" }
         ],

src/views/system/dept/index.vue

@@ -287,6 +287,9 @@
 
     <!-- 流量明细对话框 -->
     <el-dialog title="部门流量明细" :visible.sync="openFlowDetail" width="1200px" append-to-body>
+      <div style="margin-bottom: 10px;">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExportFlowDetail">导出</el-button>
+      </div>
       <el-table v-loading="flowDetailLoading" :data="flowDetailList">
         <el-table-column label="操作时间" align="center" prop="createTime" width="180">
           <template slot-scope="scope">
@@ -329,6 +332,9 @@
 
     <!-- 红包明细对话框 -->
     <el-dialog title="部门红包明细" :visible.sync="openRedMoneyDetail" width="1200px" append-to-body>
+      <div style="margin-bottom: 10px;">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExportRedMoneyDetail">导出</el-button>
+      </div>
       <el-table v-loading="redMoneyDetailLoading" :data="redMoneyDetailList">
         <el-table-column label="操作时间" align="center" prop="createTime" width="180">
           <template slot-scope="scope">
@@ -372,7 +378,7 @@
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild, updatePadNum, addRedMoney, addFlowNum, deductFlowNum, flowDetailList, redMoneyDetailList, deductRedMoney } from "@/api/system/dept";
+import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild, updatePadNum, addRedMoney, addFlowNum, deductFlowNum, flowDetailList, redMoneyDetailList, deductRedMoney, exportRedMoneyDetail, exportFlowDetail } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { addOrEditDeptResource, getDeptResource } from '@/api/system/resourceManagement'
@@ -657,6 +663,16 @@ export default {
         this.redMoneyDetailLoading = false;
       });
     },
+    /** 导出流量明细 */
+    handleExportFlowDetail() {
+      this.download('/system/dept/exportFlowDetail?deptId=' + this.flowDetailQuery.deptId, {
+      }, `部门流量明细_${new Date().getTime()}.xlsx`);
+    },
+    /** 导出红包明细 */
+    handleExportRedMoneyDetail() {
+      this.download('/system/dept/exportRedMoneyDetail?deptId=' + this.redMoneyDetailQuery.deptId, {
+      }, `部门红包明细_${new Date().getTime()}.xlsx`);
+    },
     formatBalance(flow){
       //对流量值进行判断，换算成GB或TB
       if(!flow){