Merge branch 'master' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin

src/views/bigViews/dataView1/components/accessoryStatistics.vue

@@ -78,13 +78,13 @@
 		width: 25%;
 		height: 50%;
 		.title {
-			font-size: 14px;
+			font-size: 12px;
 			color: #ffffff;
 			margin-bottom: 8px;
 		}
 		.num {
 			color: #33a8c9;
-			font-size: 18px;
+			font-size: 14px;
 			font-weight: bold;
 		}
 	}

src/views/bigViews/dataView1/components/orderAmountTrend.vue

@@ -10,6 +10,7 @@
 import * as echarts from 'echarts';
 import moduleEnclosure from '@/components/moduleEnclosure.vue';
 import { getOrderTrend } from '@/api/bigView.js';
+import { csize } from '@/utils/const.js';
 
 export default {
   components: {
@@ -83,16 +84,16 @@ export default {
           top: '16',
           right: '10',
           textStyle: {
-            color: '#ffffff',
+            color: '#A9BBCC'
           },
           data: ['新增销售金额', '新增辅材金额', '新增配件金额', '新增增值金额'],
           
         },
         grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
+          x: csize(40),
+          y: csize(40),
+          x2: csize(20),
+          y2: csize(20),
         },
         toolbox: {
           // feature: {
@@ -102,9 +103,12 @@ export default {
         xAxis: {
           type: 'category',
           boundaryGap: false,
+          axisLabel: {
+            fontSize: csize(12),
+          },
           axisLine: {
             lineStyle: {
-              color: '#ffffff', // x轴文字颜色
+              color: '#8AB1DC', // x轴文字颜色
             }
           },
           splitLine: {
@@ -123,9 +127,12 @@ export default {
             nameLocation: "start",
             align: 'right'
           },
+          axisLabel: {
+            fontSize: csize(12),
+          },
           axisLine: {
             lineStyle: {
-              color: '#ffffff', // y轴文字颜色
+              color: '#8AB1DC', // y轴文字颜色
             }
           },
           splitLine: {

src/views/bigViews/dataView1/components/orderStatistics.vue

@@ -76,12 +76,19 @@
   justify-content: space-between;
   .row {
     display: flex;
+    align-items: center;
     &.th {
       font-weight: bold;
       color: #26A3CE;
     }
     &.td {
       color: #ffffff;
+			div:last-child {
+				color: #e4f824;
+			}
+      div:nth-child(1) {
+        font-size: 12px;
+      }
     }
     div {
       flex: 1;

src/views/bigViews/dataView1/components/orderTrend.vue

@@ -92,14 +92,14 @@ export default {
           right: '10',
           data: ['新增销售单', '新增辅材单', '新增配件单', '新增增值单'],
           textStyle: {
-            color: '#ffffff',
+            color: '#A9BBCC',
           },
         },
         grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
+          x: csize(50),
+          y: csize(50),
+          x2: csize(20),
+          y2: csize(20),
         },
         xAxis: [
           {
@@ -109,6 +109,7 @@ export default {
               interval: Math.floor(times.length / 10),
               showMinLabel: true, //是否显示最小 tick 的 label
               showMaxLabel: true, //是否显示最大 tick 的 label
+              fontSize: csize(12),
             },
             axisLine: {
               show: false,

src/views/bigViews/dataView1/components/workOrderStatistics.vue

@@ -84,6 +84,7 @@
   justify-content: space-between;
   .row {
     display: flex;
+    align-items: center;
     &.th {
       font-weight: bold;
       color: #26A3CE;
@@ -93,6 +94,9 @@
 			div:last-child {
 				color: #e4f824;
 			}
+      div:nth-child(1) {
+        font-size: 12px;
+      }
     }
     div {
       flex: 1;

src/views/bigViews/dataView1/components/workOrderTrend.vue

@@ -1,17 +1,12 @@
 <template>
   <moduleEnclosure title="近30天工单趋势">
-    <template v-slot:rightce>
-      <v-scroll-view :x="true" :y="false" slidingBgClassName="slidingBgClassName"
-        slidingBlockClassName="slidingBlockClassName">
-        <div class="tabbar">
-          <div class="tab" :class="tabCurrent == item ? 'active' : ''" v-for="(item, index) in tabList" :key="index"
-            @click="changeTab(item)">
-            {{ item }}
-          </div>
-        </div>
-      </v-scroll-view>
-    </template>
-    <div class="all-container" @mouseenter="mouseenter" @mouseleave="dingshishuaxin">
+	  <template v-slot:rightce>
+      <el-tabs v-model="tabCurrent" type="card" @tab-click="changeTab">
+        <el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item" :name="item"></el-tab-pane>
+      </el-tabs>
+	    
+	  </template>
+		<div class="all-container">
       <div id="workorderEcharts1" style="width: 100%; height: 100%"></div>
     </div>
   </moduleEnclosure>
@@ -22,6 +17,7 @@ import vScrollView from 'v-scroll-view'
 import moduleEnclosure from '@/components/moduleEnclosure.vue';
 import * as echarts from 'echarts';
 import { getWorkorderTrend } from '@/api/bigView.js';
+import { csize } from '@/utils/const.js';
 
 export default {
   components: {
@@ -84,7 +80,8 @@ export default {
     },
 
     changeTab(item) {
-      this.tabCurrent = item;
+      this.tabCurrent = item.name;
+      this.initEcharts();
     },
 
     initData() {
@@ -136,26 +133,35 @@ export default {
           right: '10',
           data: ['已完工', '未完工'],
           textStyle: {
-            color: '#ffffff',
+            color: '#A9BBCC'
           },
         },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
-        },
+        // grid: {
+        //   left: '3%',
+        //   right: '4%',
+        //   bottom: '3%',
+        //   containLabel: true
+        // },
         toolbox: {
           // feature: {
           //   saveAsImage: {}
           // }
         },
+        grid: {
+          x: csize(40),
+          y: csize(40),
+          x2: csize(20),
+          y2: csize(20),
+        },
         xAxis: {
           type: 'category',
           boundaryGap: false,
+          axisLabel: {
+            fontSize: csize(12),
+          },
           axisLine: {
             lineStyle: {
-              color: '#ffffff', // x轴文字颜色
+              color: '#8AB1DC', // x轴文字颜色
             }
           },
           splitLine: {
@@ -174,9 +180,12 @@ export default {
             nameLocation: "start",
             // align: 'right'
           },
+          axisLabel: {
+            fontSize: csize(12),
+          },
           axisLine: {
             lineStyle: {
-              color: '#ffffff', // y轴文字颜色
+              color: '#8AB1DC', // y轴文字颜色
             }
           },
           splitLine: {
@@ -219,45 +228,47 @@ export default {
 </script>
 
 <style scoped lang="scss">
-::v-deep .slidingBgClassName {
-  background: rgba(0, 0, 0, 0) !important;
-}
 
-::v-deep .slidingBlockClassName {
-  background: rgba(0, 0, 0, 0) !important;
-}
-
-.all-container {
+::v-deep .el-tabs {
   width: 100%;
-  height: 100%;
-  box-sizing: border-box;
-  padding-top: 16px;
-}
-
-.tabbar {
-  width: fit-content;
-  display: flex;
-
-  .tab {
-    flex-shrink: 0;
+  .el-tabs__header {
+    margin-bottom: 0;
+    border-bottom: none;
+  }
+  .el-tabs__nav {
+    border: none;
+  }
+  .el-tabs__nav-prev {
+    line-height: 30px;
+  }
+  .el-tabs__nav-next {
+    line-height: 30px;
+  }
+  .el-tabs__item {
     width: 50px;
+    height: 30px;
+    line-height: 30px;
     color: #ffffff;
-    border: 1px solid #254280;
+    border: 1px solid #254280 !important;
     font-size: 12px;
     font-weight: bold;
-    padding: 2px 0;
     margin-right: 10px;
+    padding: 0 !important;
     text-align: center;
-    cursor: pointer;
-
     &:last-child {
       margin-right: 0;
     }
+    &.is-active {
+      border: 1px solid #153781 !important;
+      color: #1a8dc8;
+    }
   }
+}
 
-  .active {
-    border: 1px solid #153781;
-    color: #1a8dc8;
-  }
+.all-container {
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  padding-top: 16px;
 }
 </style>

src/views/mallManagement/old_machine/index.vue

@@ -687,7 +687,7 @@ export default {
         if (valid) {
           if(this.oldList.some(o => o.isEdit)) return this.$errorMsg('旧机信息存在未保存信息');
 
-          let orderSmallTypeText = this.orderTypeList.find(o => o.id == this.formData.orderSmallType).orderSmallTypeText;
+          let orderSmallTypeText = this.formData.orderSmallType ? this.orderTypeList.find(o => o.id == this.formData.orderSmallType).orderSmallTypeText : '';
           let oldList = this.oldList.map(item => {
             return {
               id: item.specId,

src/views/mallManagement/order/order_list/index.vue

@@ -1663,13 +1663,10 @@ export default {
 						html += `
               <tr align="center">
               <td>${item.goodsName || ''}</td>
-              <td>${item.goodsSpecName || ''}</td>
               <td>${item.goodsMaterialUnit ? unitMap[item.goodsMaterialUnit] : ''}</td>
               <td>${item.num}</td>
               <td>${item.price}</td>
               <td>${item.payAmount}</td>
-              <td>${data.storageName || ''}</td>
-              <td>${data.remark || ''}</td>
               </tr>
             `
 					})
@@ -1762,23 +1759,19 @@ export default {
 	          word-wrap: break-word;
 	          word-break: break-all;">
 				<tr align="center">
-					<td>商品名称</td>
-					<td>规格</td>
+					<td width="400">商品名称</td>
 					<td>单位</td>
 					<td>数量</td>
 					<td>单价</td>
 					<td>金额</td>
-					<td>仓库</td>
-					<td>备注</td>
 				</tr>
 	            ${html}
 				<tr align="center" align="center">
 				  <td>小计: </td>
-				  <td colspan="2"></td>
+				  <td colspan="1"></td>
 				  <td>${num}</td>
 				  <td></td>
 				  <td>${totalAmount}</td>
-				  <td colspan="2">金额总计: ${totalAmount}</td>
 				</tr>
 	        </table>
 	      </div>

src/views/mallManagement/order/sales_return_order_list/index.vue

@@ -438,12 +438,7 @@
                   <el-input v-model="screenForm.deliveryId" placeholder="请输入发货单号"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="商品名称" prop="goodsName">
-                  <el-input v-model="screenForm.goodsName" placeholder="请输入商品名称"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24" class="tr">
+              <el-col :span="8" class="tr">
                 <el-form-item label="">
                   <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
                   <el-button size="small" @click="resetScreenForm">清空</el-button>
@@ -672,7 +667,7 @@ export default {
           this.formData.deliverStorageName = dData.storageStockName;
           dData.orderDetailSendList.forEach(item => {
             item.waitRefundNum = item.sendNum;
-            item.waitRefundPrice = item.price;
+            item.waitRefundPrice = item.payAmount;
           })
           this.goodsList = dData.orderDetailSendList;
           getOrderDetail({ orderId: dData.orderId }).then((res) => {
@@ -805,9 +800,10 @@ export default {
 
                 data.orderOfflineRefundItems.forEach(item => {
                   item.waitRefundNum = item.refundNum;
-                  item.waitRefundPrice = item.refundAmount;
+                  item.waitRefundPrice = item.payAmount;
                   item.refundNum = item.retiredNum;
-                  item.refundAmount = item.retiredAmount;
+                  // item.refundAmount = item.retiredAmount;
+                  item.refundAmount = item.payAmount;
                 })
 
                 this.goodsList = data.orderOfflineRefundItems;
@@ -998,7 +994,7 @@ export default {
         this.formData.deliverStorageName = data.storageStockName;
         data.orderDetailSendList.forEach(item => {
           item.waitRefundNum = item.sendNum;
-          item.waitRefundPrice = item.price;
+          item.waitRefundPrice = item.payAmount;
         })
         this.goodsList = data.orderDetailSendList;
       })