240116

src/components/echart/echart-Allbar-row.vue

@@ -79,9 +79,9 @@ const initEcharts = () => {
                         x2: 0,
                         y2: 1,
                         colorStops: [
-                        { offset: 0, color: 'rgb(51,205,184)' },
-                                    { offset: 0.5, color: 'rgb(51,205,184)' },
-                                    { offset: 1, color: 'rgb(51,205,184)' }
+                            { offset: 0, color: 'rgb(51,205,184)' },
+                            { offset: 0.5, color: 'rgb(51,205,184)' },
+                            { offset: 1, color: 'rgb(51,205,184)' }
                         ],
                         globalCoord: false // 缺省为 false
                     },
@@ -92,6 +92,7 @@ const initEcharts = () => {
     }
 }
 defineExpose({
-    myChart,setEchartFun
+    myChart,echartData,findBarRowFun,
+    setEchartFun,initEcharts
 })
 </script>

src/plugins/rulesData.ts

@@ -19,7 +19,7 @@ export const syrulesData = {
 //入库
 export let columnsTable = [
     { prop: 'quantity', label: '数量', width: 0 },
-    { prop: 'unit_price', label: '购进单价', width: 0 },
+    { prop: 'unit_price', label: '单价', width: 0 },
     { prop: 'operator', label: '经办人', width: 0 },
     { prop: 'forwarding_unit', label: '发货单位', width: 0 },
     { prop: 'date', label: '入库日期', width: 0 },
@@ -30,7 +30,7 @@ export let columnsTable = [
 //入库
 export let scanCodeTable = [
     { prop: 'quantity', label: '数量', width: 0 },
-    { prop: 'unitPrice', label: '购进单价', width: 0 },
+    { prop: 'unitPrice', label: '单价', width: 0 },
     { prop: 'operator', label: '经办人', width: 0 },
     { prop: 'forwardingUnit', label: '发货单位', width: 0 },
     { prop: 'date', label: '入库日期', width: 0 },
@@ -40,7 +40,7 @@ export let scanCodeTable = [
 //出库
 export let columnsTableOut = [
     { label: '数量', prop: 'quantity', width: 0 },
-    { label: '销售单价', prop: 'unit_price', width: 0 },
+    // { label: '销售单价', prop: 'unit_price', width: 0 },
     { label: '经办人', prop: 'operator', width: 0 },
     { label: '收货单位', prop: 'receiving_unit', width: 0 },
     { label: '出库日期', prop: 'date', width: 0 },
@@ -50,7 +50,7 @@ export let columnsTableOut = [
 //出库
 export let scanCodeTableOut = [
     { label: '数量', prop: 'quantity', width: 0 },
-    { label: '销售单价', prop: 'unitPrice', width: 0 },
+    // { label: '销售单价', prop: 'unitPrice', width: 0 },
     { label: '经办人', prop: 'operator', width: 0 },
     { label: '收货单位', prop: 'receivingUnit', width: 0 },
     { label: '出库日期', prop: 'date', width: 0 },

src/views/home/index.vue

@@ -12,15 +12,15 @@
       </bgPure>
     </div>
     <div class="home-echarts">
-      <cards class="home-echarts-card2">
+      <cards class="home-echarts-card2" :class="fixedstyleRef?'fixedstyle':''">
         <template #card-tit>
           库存统计-图表
         </template>
         <template #card-subhead>
-          <div style="text-decoration: underline;cursor: pointer;" @click="showDialogVisible">更多数据</div>
+          <!-- <div style="text-decoration: underline;cursor: pointer;" @click="showDialogVisible">更多数据</div> -->
         </template>
         <template #card-content v-show="data.lineData.length == 0">
-          <echartBarRow id="bar1" :lineData="data.lineData"></echartBarRow>
+          <echartBarRow id="bar1" :lineData="data.lineData" ref="echartAllBarRowRef"></echartBarRow>
         </template>
       </cards>
       <cards class="home-echarts-card1">
@@ -87,6 +87,7 @@ import echartbar from '@/components/echart/echart-bar.vue'
 import echartBarRow from '@/components/echart/echart-bar-row.vue'
 import echartAllBarRow from '@/components/echart/echart-Allbar-row.vue'
 
+import { findBarRowFun } from "@/plugins/findData";
 import bgPure from '@/components/bgPure.vue'
 import cards from '@/components/card.vue'
 import statistics from '@/components/statistics.vue'
@@ -99,14 +100,18 @@ const TableRef = ref()
 const dialogVisible = ref()
 const echartAllBarRowRef = ref()
 
+const fixedstyleRef = ref(false)
+
+
+
 //函数
 const showDialogVisible = async ()=>{
   dialogVisible.value = true
-  nextTick(()=>{
-    console.log('show',echartAllBarRowRef.value.setEchartFun())
-    echartAllBarRowRef.value.setEchartFun()
-
-  })
+  // fixedstyleRef.value = !fixedstyleRef.value
+  // nextTick(()=>{
+  //   // echartAllBarRowRef.value.dataStyle.height = '100vh'
+  //   console.log('show',echartAllBarRowRef.value)
+  // })
 }
 // 渲染表格
 const columns: any = [
@@ -194,7 +199,6 @@ const findMap = (arr: any, obj: any) => {
 <style lang="scss">
 .home {
   overflow-y: auto;
-
   &-main {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
@@ -207,4 +211,14 @@ const findMap = (arr: any, obj: any) => {
     grid-gap: 20px;
   }
 }
+.fixedstyle{
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  z-index: 99999 !important;
+  border: 1px solid red;
+}
 </style>

src/views/layout/logo.vue

@@ -14,7 +14,8 @@
     display: flex;
     align-items: center;
     &-text {
-        font-family: fontLED1;
+        // font-family: fontLED1;
+        font-weight: bold;
         color: #409eff;
         margin-top: 5px;
         background: var(--theme_bg_color);

src/views/salesmanagement/sellManage/index.vue

@@ -91,18 +91,20 @@ const remoteMethod = async(query: string) => {
 // 渲染表格
 const columns: any = [
     { prop: 'date', label: '日期', width: 120 },
-    { prop: 'receiving_unit', label: '购货单位', width: 150 },
-    { prop: 'product_name', label: '品种', width: 150 },
-    { prop: 'enterprise_name', label: '生产企业', width: 150 },
-    { prop: 'spec_name', label: '规格（剂/支或粒）', width: 150 },
-    { prop: 'dosage_form_name', label: '剂型', width: 100 },
-    { prop: 'batch_number', label: '血液制品批号', width: 150 },
-    { prop: 'quantity', label: '数量', width: 70 },
-    { prop: 'unit_name', label: '单位', width: 70 },
-    { prop: 'purchase_unit_price', label: '购进单价', width: 100 },
-    { prop: 'purchase_money', label: '购进金额', width: 150 },
-    { prop: 'sales_unit_price', label: '销售单价', width: 100 },
-    { prop: 'sales_money', label: '销售金额', 'min-width': 150 },
+    { prop: 'receiving_unit', label: '购货单位'},
+    { prop: 'product_name', label: '品种'},
+    { prop: 'enterprise_name', label: '生产企业'},
+    { prop: 'spec_name', label: '规格（剂/支或粒）'},
+    { prop: 'dosage_form_name', label: '剂型'},
+    { prop: 'batch_number', label: '血液制品批号'},
+    { prop: 'quantity', label: '数量'},
+    { prop: 'unit_name', label: '单位'},
+    { prop: 'unit_price', label: '单价'},
+    { prop: 'money', label: '金额'},
+    // { prop: 'purchase_unit_price', label: '购进单价', width: 100 },
+    // { prop: 'purchase_money', label: '购进金额', width: 150 },
+    // { prop: 'sales_unit_price', label: '销售单价', width: 100 },
+    // { prop: 'sales_money', label: '销售金额', 'min-width': 150 },
     // { prop: 'operation', label: '操作', fixed: 'right', width: 200 }
 ]
 

src/views/salesmanagement/storageOrderGoods/down.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
     <div class="">
-        <el-button round type="primary" :icon="Download" @click="dialogFormVisible = true">导出/打印</el-button>
+        <el-button round type="primary" :icon="Download" @click="showDialog">导出/打印</el-button>
         <el-dialog v-model="dialogFormVisible" title="导出/打印" :append-to-body="true" draggable width="30%">
             <el-form :model="initParam" ref="formRef">
                 <el-form-item label="下单日期" :label-width="formLabelWidth"
@@ -66,8 +66,8 @@ const props = defineProps({
     }
 })
 interface initFrom {
-    date:string,
-    receivingUnit:string,
+    date:any,
+    receivingUnit:any,
     drawer:string,
     consigner: string,
     finance: string,
@@ -105,7 +105,14 @@ const printFun = async (formEl: FormInstance | undefined) => {
     })
 }
 
-
+//函数
+const showDialog = async ()=>{
+    dialogFormVisible.value = true
+    // props.initParam.date!=null||props.initParam.date!=""?initParam.date = props.initParam.date:initParam.date = ''
+    initParam.date = props.initParam.date
+    initParam.receivingUnit = props.initParam.receivingUnit
+    // props.initParam.receivingUnit?initParam.receivingUnit = props.initParam.receivingUnit:initParam.receivingUnit = ""
+}
 
 onMounted(async() => {
     const result:any = await stockunit({type:2,name:''})

src/views/salesmanagement/storageOrderGoods/index.vue

@@ -80,8 +80,8 @@ const columns: any = [
     { prop: 'approval_number', label: '批准文号', width: 120 },
     { prop: 'quantity', label: '数量', width: 120 },
     { prop: 'unit_name', label: '单位', width: 80 },
-    { prop: 'sales_unit_price', label: '销售单价', width: 120 },
-    { prop: 'sales_money', label: '销售金额', 'min-width': 120 },
+    { prop: 'sales_unit_price', label: '单价', width: 120 },
+    { prop: 'sales_money', label: '金额', 'min-width': 120 },
 ]
 
 //请求参数

src/views/stockcontrol/storageFrom/Labour.vue

@@ -19,9 +19,9 @@
                 <el-form-item class="el-form-item-main" label="数量" :label-width="formLabelWidth" prop="quantity">
                     <el-input v-model.number="initParam.quantity" autocomplete="off" class="inputWidth" />
                 </el-form-item>
-                <el-form-item class="el-form-item-main" label="销售单价" :label-width="formLabelWidth">
+                <!-- <el-form-item class="el-form-item-main" label="销售单价" :label-width="formLabelWidth">
                     <el-input v-model="initParam.unitPrice" autocomplete="off" class="inputWidth"/>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item class="el-form-item-main" label="出库日期" :label-width="formLabelWidth" prop="date">
                     <el-date-picker v-model="initParam.date" type="date" placeholder="出库日期" value-format="YYYY-MM-DD" clearable style="width: 200px;" />
                 </el-form-item>

src/views/stockcontrol/storagePut/Labour.vue

@@ -28,7 +28,7 @@
                 <el-form-item class="el-form-item-main" label="数量" :label-width="formLabelWidth" prop="quantity">
                     <el-input v-model.number="initParam.quantity" autocomplete="off" class="inputWidth" />
                 </el-form-item>
-                <el-form-item class="el-form-item-main" label="购进单价" :label-width="formLabelWidth">
+                <el-form-item class="el-form-item-main" label="单价" :label-width="formLabelWidth">
                     <el-input v-model="initParam.unitPrice" autocomplete="off" class="inputWidth" />
                 </el-form-item>
                 <el-form-item class="el-form-item-main" label="入库日期" :label-width="formLabelWidth" prop="date">

src/views/stockcontrol/transmitReceive/downing.vue

@@ -3,8 +3,8 @@
     <el-button el-button type="primary" icon="Download" @click="dialogFormVisible1 = true">运输登记表</el-button>
     <el-dialog v-model="dialogFormVisible" title="收发登记表" :append-to-body="true" draggable width="30%">
         <el-form :model="initParam" ref="ruleFormRef" :rules="rules">
-            <el-form-item label="疫苗名称" :label-width="formLabelWidth" prop="productId">
-                <el-select v-model.number="initParam.productId" filterable remote reserve-keyword placeholder="疫苗名称"
+            <el-form-item label="品名" :label-width="formLabelWidth" prop="productId">
+                <el-select v-model.number="initParam.productId" filterable remote reserve-keyword placeholder="品名"
                     :remote-method="remoteMethod1" :loading="loading" clearable style="width: 100%;"
                     @clear="initParam.productId = null" @click="click1">
                     <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value" />