页面修改

src/components/assetsman/Quotation.vue

@@ -34,19 +34,19 @@
             </el-checkbox>
           </div>
           <div class="calendarItem_week">
-            <div title="星期天">日曜日</div>
-            <div title="星期一">月曜日</div>
-            <div title="星期二">火曜日</div>
-            <div title="星期三">水曜日</div>
-            <div title="星期四">木曜日</div>
-            <div title="星期五">金曜日</div>
-            <div title="星期六">土曜日</div>
+            <div title="星期天">日</div>
+            <div title="星期一">月</div>
+            <div title="星期二">火</div>
+            <div title="星期三">水</div>
+            <div title="星期四">木</div>
+            <div title="星期五">金</div>
+            <div title="星期六">土</div>
           </div>
           <div class="calendarItem_day">
             <div v-for="(subItem, index2) in item.days" :key="index2"
               :class="subItem.month===item.date?'nowMonth':'otherMonth'">
-              <div :class="stockColor(item,subItem)"
-                :style="subItem.month===item.date&&addMsg.DateList.indexOf(subItem.day)!==-1?'border-color: #089bab':''"
+              <div
+                :style="{'border-color':getBorderColor(item,subItem,addMsg.DateList),'background-color':stockColor(subItem)}"
                 @click="calendarDayOn(item, subItem)">
                 <el-popover placement="bottom" title="見積情報" width="330" trigger="hover"
                   v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
@@ -289,6 +289,10 @@
           month: ''
         },
         hotelInfo: {},
+        colorArray: ["#FF0000", "#FF60AF", "#D200D2", "#921AFF", "#2828FF", "#0080FF", "#00CACA",
+          "#02DF82", "#53FF53", "#A8FF24", "#F9F900", "#FFE66F", "#FFC78E", "#FF5809", "#C48888", "#B9B973",
+          "#6FB7B7", "#9999CC", "#C07AB8"
+        ]
       };
     },
     created() {
@@ -321,7 +325,7 @@
         if (this.addMsg.RuTangTax) {
           total += Number(this.addMsg.RuTangTax);
         }
-        if (this.addMsg.RMoney&&this.addMsg.RMoney!="-") {
+        if (this.addMsg.RMoney && this.addMsg.RMoney != "-") {
           total -= Number(this.addMsg.RMoney)
         }
         this.addMsg.CostPrice = total.toFixed(0);
@@ -359,13 +363,28 @@
             });
         });
       },
+      getBorderColor(item, subItem, DateList) {
+        var str = "";
+        if (subItem.month === item.date && DateList.indexOf(subItem.day) !== -1) {
+          str = "#089bab";
+        }
+        return str;
+      },
       //库存颜色
-      stockColor: function (item, item2, childItem) {
-        if (item.date === item2.month && item2.hasOwnProperty('data')) {
-          return 'hasStock_1';
+      stockColor: function (subItem) {
+        var bgColor = "";
+        if (subItem && subItem.hasOwnProperty('data')) {
+          if (subItem.data.SubList && subItem.data.SubList.length > 0) {
+            subItem.data.SubList.forEach(sItem => {
+              if (sItem.PriceType <= this.colorArray.length) {
+                bgColor = this.colorArray[sItem.PriceType];
               } else {
-          return;
+                bgColor = '#ff6363';
+              }
+            })
+          }
         }
+        return bgColor;
       },
       //日历点击事件
       calendarDayOn: function (item, item2) {