no message

src/packageMaterial/pages/newSale/orderList.vue

@@ -324,7 +324,7 @@ export default {
     flex: 1;
   }
   .date {
-    width: 180rpx;
+    width: 240rpx;
     display: flex;
     align-items: center;
     justify-content: space-between;

src/packageMaterial/pages/sale/orderList.vue

@@ -324,7 +324,7 @@ export default {
     flex: 1;
   }
   .date {
-    width: 180rpx;
+    width: 240rpx;
     display: flex;
     align-items: center;
     justify-content: space-between;

src/packageMaterial/pages/stock/stockDetail.vue

@@ -5,30 +5,32 @@
     :isScroll="true"
     :refresherTriggered="refresherTriggered"
     @refresherrefresh="refresherrefresh"
-    @scrolltolower="scrolltolower">
+    @scrolltolower="scrolltolower"
+  >
     <view class="top-container">
-      <view class="row1">{{detail.goodsName}}<text></text></view>
+      <view class="row1">{{ detail.goodsName }}<text></text></view>
       <view class="row2">结余库存</view>
-      <view class="row3">{{detail.qty}}{{detail.unit}}</view>
+      <view class="row3">{{ detail.qty }}{{ detail.unit }}</view>
     </view>
 
     <view class="screen-container">
       <u-tabs
-      	:scrollable="true"
-      	:list="tabList"
-      	:current="tabCurrent"
-      	@click="changeTab"
-      	lineColor="#3D8FFD"
-      	:activeStyle="{
-      		color: '#3D8FFD'
-      	}"
-      	:inactiveStyle="{
-      		color: '#666666'
-      	}"
-      	itemStyle="height: 88rpx;">
+        :scrollable="true"
+        :list="tabList"
+        :current="tabCurrent"
+        @click="changeTab"
+        lineColor="#3D8FFD"
+        :activeStyle="{
+          color: '#3D8FFD'
+        }"
+        :inactiveStyle="{
+          color: '#666666'
+        }"
+        itemStyle="height: 88rpx;"
+      >
       </u-tabs>
       <view class="date" @tap="isShowDatePicker = true">
-        <view class="text">{{date || '请选择月份'}}</view>
+        <view class="text">{{ date || '请选择月份' }}</view>
         <u-icon name="arrow-down" size="12"></u-icon>
       </view>
     </view>
@@ -36,59 +38,62 @@
     <view class="list-container">
       <view class="item" v-for="(item, index) in dataList" :key="index">
         <view class="top">
-          <view class="left">{{item.directFlag == 'ADD' ? '购买':'使用'}}{{item.goodsType == 'M' ? '辅材' : '配件'}}<text>（{{item.flag | statusFilter}}）</text></view>
-          <view class="right">当前库存 {{item.closeQty}}</view>
+          <view class="left"
+            >{{ item.directFlag == 'ADD' ? '购买' : '使用' }}{{ item.goodsType == 'M' ? '辅材' : '配件'
+            }}<text>（{{ item.flag | statusFilter }}）</text></view
+          >
+          <view class="right">当前库存 {{ item.closeQty }}</view>
         </view>
         <block v-if="item.directFlag == 'ADD'">
           <view class="row">
             <view class="label">申请单号</view>
-            <view class="value">{{item.ref}}</view>
+            <view class="value">{{ item.ref }}</view>
           </view>
           <view class="row">
             <view class="label">购买网点</view>
-            <view class="value">{{item.websitName}}</view>
+            <view class="value">{{ item.websitName }}</view>
           </view>
           <view class="row">
             <view class="label">下单时间</view>
-            <view class="value">{{item.sdate}}</view>
+            <view class="value">{{ item.sdate }}</view>
           </view>
           <view class="row">
             <view class="label">购买数量</view>
-            <view class="value green">+{{item.changeQty}}{{item.unit}}</view>
+            <view class="value green">+{{ item.changeQty }}{{ item.unit }}</view>
           </view>
           <view class="row">
             <view class="label">采购金额</view>
-            <view class="value">{{item.price}}元/{{item.unit}}</view>
+            <view class="value">{{ item.price }}元/{{ item.unit }}</view>
           </view>
         </block>
         <block v-else>
           <view class="row">
             <view class="label">订单单号</view>
-            <view class="value">{{item.ref}}</view>
+            <view class="value">{{ item.ref }}</view>
           </view>
           <view class="row">
             <view class="label">关联工单</view>
-            <view class="value">{{item.workerOrderNo}}</view>
+            <view class="value">{{ item.workerOrderNo }}</view>
           </view>
           <view class="row">
             <view class="label">销售方式</view>
-            <view class="value">{{item.settlementType | saleFilter}}</view>
+            <view class="value">{{ item.settlementType | saleFilter }}</view>
           </view>
           <view class="row">
             <view class="label">下单时间</view>
-            <view class="value">{{item.sdate}}</view>
+            <view class="value">{{ item.sdate }}</view>
           </view>
           <view class="row">
             <view class="label">使用数量</view>
-            <view class="value red">-{{item.changeQty}}{{item.unit}}</view>
+            <view class="value red">-{{ item.changeQty }}{{ item.unit }}</view>
           </view>
           <view class="row" v-if="item.goodsType == 'M'">
             <view class="label">收费标准</view>
-            <view class="value">{{item.price}}元/{{item.unit}}</view>
+            <view class="value">{{ item.price }}元/{{ item.unit }}</view>
           </view>
           <view class="row" v-else>
             <view class="label">销售金额</view>
-            <view class="value">{{item.price}}元/{{item.unit}}</view>
+            <view class="value">{{ item.price }}元/{{ item.unit }}</view>
           </view>
         </block>
       </view>
@@ -105,163 +110,165 @@
       @close="isShowDatePicker = false"
       @confirm="confirmDate"
     ></u-datetime-picker>
-
   </zj-page-layout>
   <!-- #endif -->
 
   <!-- #ifndef H5 -->
-  <web-view :src="webViewHref(`/packageMaterial/pages/stock/stockDetail`, pam, crossPagePam)" @message="crossPage.$listener"></web-view>
+  <web-view
+    :src="webViewHref(`/packageMaterial/pages/stock/stockDetail`, pam, crossPagePam)"
+    @message="crossPage.$listener"
+  ></web-view>
   <!-- #endif -->
 </template>
 
 <script>
-  // #ifdef H5
-  export default {
-    filters: {
-      statusFilter(val) {
-        const MAP = {
-          ING: '在途',
-          TAKE: '已提货',
-          USED: '已使用',
-          REFUND: '退货',
-          INIT: '初始化',
-        }
-        return MAP[val];
-      },
-      saleFilter(val) {
-        const MAP = {
-          OWM: '自有',
-          OUT: '外购'
-        }
-        return MAP[val];
+// #ifdef H5
+export default {
+  filters: {
+    statusFilter(val) {
+      const MAP = {
+        ING: '在途',
+        TAKE: '已提货',
+        USED: '已使用',
+        REFUND: '退货',
+        INIT: '初始化',
       }
+      return MAP[val];
     },
-
-    data() {
-      return {
-        id: null,
-        goodsId: null,
-        refresherTriggered: false,
-        tabList: [
-        	{name: '全部', value: 0},
-        	{name: '购买辅材', value: 1},
-        	{name: '使用辅材', value: 2},
-        ],
-        tabCurrent: 0, // 当前选择值
-        detail: {},
-        dataList: [],
-        pageNum: 1,
-				loadStatus: 0,
-        isShowDatePicker: false,
-        datePickerValue: Number(new Date()),
-        date: '',
+    saleFilter(val) {
+      const MAP = {
+        OWM: '自有',
+        OUT: '外购'
       }
-    },
+      return MAP[val];
+    }
+  },
 
-    async onLoad({id, goodsId}) {
-      this.id = id;
-      this.goodsId = goodsId;
-      await this.getDetail();
-      await this.getList();
-    },
+  data() {
+    return {
+      id: null,
+      goodsId: null,
+      refresherTriggered: false,
+      tabList: [
+      	{name: '全部', value: 0},
+      	{name: '购买辅材', value: 1},
+      	{name: '使用辅材', value: 2},
+      ],
+      tabCurrent: 0, // 当前选择值
+      detail: {},
+      dataList: [],
+      pageNum: 1,
+		loadStatus: 0,
+      isShowDatePicker: false,
+      datePickerValue: Number(new Date()),
+      date: '',
+    }
+  },
+
+  async onLoad({id, goodsId}) {
+    this.id = id;
+    this.goodsId = goodsId;
+    await this.getDetail();
+    await this.getList();
+  },
 
-    methods: {
-      async getDetail() {
-        return new Promise((resolve, reject) => {
-          this.$api.post('/material/worker/stock/detail', {
-            id: this.id
-          }).then(res => {
-            this.detail = res.data;
-          }).finally(() => {
-            resolve(1);
-          })
+  methods: {
+    async getDetail() {
+      return new Promise((resolve, reject) => {
+        this.$api.post('/material/worker/stock/detail', {
+          id: this.id
+        }).then(res => {
+          this.detail = res.data;
+        }).finally(() => {
+          resolve(1);
         })
-      },
+      })
+    },
 
-      async getList() {
-        this.loadStatus = 1;
-        return new Promise((resolve, reject) => {
-          const MAP = {
-            0: '',
-            1: 'ADD',
-            2: 'SUB',
+    async getList() {
+      this.loadStatus = 1;
+      return new Promise((resolve, reject) => {
+        const MAP = {
+          0: '',
+          1: 'ADD',
+          2: 'SUB',
+        }
+        this.$api.post('/material/worker/stock/acc/list', {
+          websitGoodsId: this.goodsId,
+          pageNum: this.pageNum,
+          pageSize: 10,
+          directFlag: MAP[this.tabCurrent],
+          month: this.date,
+        }).then(res => {
+          this.loadStatus = 0;
+          let list = res.data.records;
+          if (list.length < 10) {
+            this.loadStatus = 2;
           }
-          this.$api.post('/material/worker/stock/acc/list', {
-            websitGoodsId: this.goodsId,
-            pageNum: this.pageNum,
-            pageSize: 10,
-            directFlag: MAP[this.tabCurrent],
-            month: this.date,
-          }).then(res => {
-            this.loadStatus = 0;
-            let list = res.data.records;
-            if (list.length < 10) {
-              this.loadStatus = 2;
-            }
-            this.dataList = this.dataList.concat(list);
-          }).finally(() => {
-            resolve(1);
-          })
+          this.dataList = this.dataList.concat(list);
+        }).finally(() => {
+          resolve(1);
         })
-      },
-
-      changeTab(e) {
-        this.tabCurrent = e.value;
-        this.refreshList();
-      },
+      })
+    },
 
-      resetDate() {
-        this.isShowDatePicker = false;
-        this.date = '';
-        this.refreshList();
-      },
+    changeTab(e) {
+      this.tabCurrent = e.value;
+      this.refreshList();
+    },
 
-      confirmDate(e) {
-        this.isShowDatePicker = false;
-        let time = new Date(e.value)
-        let y = time.getFullYear();
-        let m = (time.getMonth()+1) < 10 ? '0' + (time.getMonth()+1) : time.getMonth()+1;
-        this.date = `${y}-${m}`;
-        this.refreshList();
-      },
+    resetDate() {
+      this.isShowDatePicker = false;
+      this.date = '';
+      this.refreshList();
+    },
 
-      async refreshList() {
-      	this.dataList = [];
-      	this.pageNum = 1;
-      	await this.getList();
-      },
+    confirmDate(e) {
+      this.isShowDatePicker = false;
+      let time = new Date(e.value)
+      let y = time.getFullYear();
+      let m = (time.getMonth()+1) < 10 ? '0' + (time.getMonth()+1) : time.getMonth()+1;
+      this.date = `${y}-${m}`;
+      this.refreshList();
+    },
 
-      // 下拉刷新
-      async refresherrefresh() {
-        this.refresherTriggered = true;
-        await this.getDetail();
-        await this.refreshList();
-        this.refresherTriggered = false;
-      },
+    async refreshList() {
+    	this.dataList = [];
+    	this.pageNum = 1;
+    	await this.getList();
+    },
 
-      // 触底加载
-      scrolltolower() {
-        if (this.loadStatus === 0) {
-        	this.pageNum++;
-        	this.getList();
-        }
-      }
+    // 下拉刷新
+    async refresherrefresh() {
+      this.refresherTriggered = true;
+      await this.getDetail();
+      await this.refreshList();
+      this.refresherTriggered = false;
     },
-  }
 
-  // #endif
-  // #ifndef H5
-  export default {
-    data() {
-      return {
-        pam: {},
+    // 触底加载
+    scrolltolower() {
+      if (this.loadStatus === 0) {
+      	this.pageNum++;
+      	this.getList();
       }
-    },
-    onLoad(pam) {
-      this.pam = pam;
     }
+  },
+}
+
+// #endif
+// #ifndef H5
+export default {
+  data() {
+    return {
+      pam: {},
+    }
+  },
+  onLoad(pam) {
+    this.pam = pam;
   }
-  // #endif
+}
+// #endif
 </script>
 
 <style lang="scss" scoped>
@@ -307,7 +314,7 @@
     flex: 1;
   }
   .date {
-    width: 180rpx;
+    width: 240rpx;
     display: flex;
     align-items: center;
     justify-content: space-between;

src/packageMaterial/pages/stock/useRecord.vue

@@ -229,7 +229,7 @@ export default {
     flex: 1;
   }
   .date {
-    width: 180rpx;
+    width: 240rpx;
     display: flex;
     align-items: center;
     justify-content: space-between;

src/packageWorkorder/pages/orderList.vue

@@ -244,6 +244,7 @@ export default {
         { name: '待接单', value: 'DJD', num: 0 },
         { name: '服务中', value: 'FWZ', num: 0 },
         { name: '已完工', value: 'YWG', num: 0 },
+        { name: '待处理', value: 'DCL', num: 0 },
         { name: '异常待处理', value: 'YCD', num: 0 }
       ],
       curMainTab: '',
@@ -420,7 +421,8 @@ export default {
           this.mainTabs[2].num = data.djd || 0
           this.mainTabs[3].num = data.fwz || 0
           this.mainTabs[4].num = data.ywg || 0
-          this.mainTabs[5].num = data.ycd || 0
+          this.mainTabs[5].num = data.wwg || 0
+          this.mainTabs[6].num = data.ycd || 0
         })
     },
 

src/pages/workorder/index.vue

@@ -142,6 +142,13 @@ export default {
           icon: 'icon-bannianwangong',
           color: '#D8F6D8',
           url: '/packageMaterial/pages/partsApply/list?tab=END'
+        },
+        {
+          name: '待处理',
+          num: 0,
+          icon: 'icon-bannianwangong',
+          color: '#D8F6D8',
+          url: '/packageWorkorder/pages/orderList?tab=DCL'
         }
       ],
 
@@ -209,6 +216,7 @@ export default {
             this.statsList[3].num = res.data.dqd
             this.statsList[4].num = res.data.jrwg
             this.statsList[5].num = res.data.jbnwg
+            this.statsList[8].num = res.data.wwg
           })
           .finally(res => {
             resolve(1)