提交

src/config/request/apiList/mdm/colour/index.js

+import config from "../config/index";
+let className = 'colour';
+let baseUrl = `${config.baseUrl}/${className}`
+
+export default {
+    [className]:{
+        'selectColour':{
+            url: `${baseUrl}/selectColour`,
+            method: 'get'
+        }
+    }
+}

src/config/request/apiList/mdm/index.js

 
 import materialinfo from './materialinfo/index'
+import colour from './colour/index'
 export default {
     ...materialinfo,
+    ...colour,
 }

src/config/request/apiList/plm/stylelibraryorder/index.js

@@ -10,6 +10,50 @@ export default {
         'details':{
             url: `${baseUrl}/details`,
             method: 'get'
+        },
+        // 潜在客户列表
+        'potentialCustomersPage':{
+            url: `${baseUrl}/potentialCustomersPage`,
+            method: 'post'
+        },
+        // 潜在客户详情 enterpriseId
+        'potentialCustomersDetails':{
+            url: `${baseUrl}/potentialCustomersDetails`,
+            method: 'get'
+        },
+        // 上架单列表
+        'listingList':{
+            url: `${baseUrl}/listingList`,
+            method: 'post'
+        },
+        // 上架单详情
+        'listingDetails':{
+            url: `${baseUrl}/listingList`,
+            method: 'get'
+        },
+        // 上架管理列表
+        'getToShelvesManagerList':{
+            url: `${baseUrl}/getToShelvesManagerList`,
+            method: 'get'
+        },
+        // 上架管理详情
+        'getStyleDetails':{
+            url: `${baseUrl}/getStyleDetails`,
+            method: 'get'
+        },
+        // 加入待上架
+        'addToShelves':{
+            url: `${baseUrl}/addToShelves`,
+            method: 'post'
+        },
+        // 一键上架
+        'oneClickListing':{
+            url: `${baseUrl}/oneClickListing`,
+            method: 'post'
+        },
+        'unlisted':{
+            url: `${baseUrl}/unlisted`,
+            method: 'post'
         }
     }
 }

src/pages/material/entrustItem.vue

@@ -8,47 +8,50 @@
     </u-navbar>
 
     <view class="body" :style="{ bottom: footerHeight + 'px', top: headerHeight+ 'px'}">
-      <view class="tip u-m-b-20">剩余59分1秒自动取消上架单</view>
+      <view class="tip u-m-b-20" v-if="detail.status === 1">剩余59分1秒自动取消上架单</view>
       <view class="u-p-r-30 u-p-l-30">
         <view class="bg-fff u-p-r-30 u-p-b-30 u-p-l-30 u-m-b-20">
           <view class="u-border-bottom u-l-height-44 u-flex">
             <text class="u-flex-1">款式明细</text>
-            <text>总共50款</text>
+            <text>总共{{detail.quantity}}款</text>
           </view>
-          <view class="u-p-t-20 u-p-b-20">
-            加厚荷兰绒绒布布料(3)
-          </view>
-          <view class="item u-flex">
-            <view class="item-img"></view>
+          <!--          <view class="u-p-t-20 u-p-b-20">-->
+          <!--            {{ detail.styleOrderCode }}-->
+          <!--          </view>-->
+          <view class="item u-flex" v-for="(item) in list" :key="item.id">
+            <view class="item-img">
+              <image :src="`${$IMG_URL}${item.originalImageCode}`" mode="widthFix"></image>
+            </view>
             <view class="u-flex-1 u-p-l-20">
-              <view class="item-title u-line-1 u-font-28">男装-上装-青年-时尚休闲</view>
+              <view class="item-title u-line-1 u-font-28">{{item.styleTag}}</view>
               <view class="u-flex u-m-t-6 u-m-b-6">
                 <view class="u-m-r-40 label u-font-24">款号</view>
                 <view class="u-line-1 u-flex-1 content u-font-24">
-                  11
+                  {{ item.styleCode }}
                 </view>
               </view>
               <view class="u-flex u-m-t-6 u-m-b-6">
                 <view class="u-m-r-40 label u-font-24">所选面料</view>
                 <view class="u-line-1 u-flex-1 content u-font-24">
-                  11
+                  {{ item.materialName }}
                 </view>
               </view>
               <view class="item-tags">
-                <view class="item-tag u-font-20">
-                  标签
-                </view>
-                <view class="item-tag u-font-20">
-                  标签
+                <view class="item-tag u-font-20"
+                      :key="tag.id"
+                      v-for="tag in item.styleLibraryTagVOList">
+                  {{tag.materialTagName}}
                 </view>
               </view>
             </view>
           </view>
-          <view class="u-p-b-20 u-border-bottom text-center" @click="toggle">
-            <text>展开<u-icon name="arrow-down" size="22" color="#000"></u-icon></text>
+          <view class="u-p-b-20 u-border-bottom text-center"
+                v-if="detail.styleLibraryTaskItemVOList.length > 3"
+                @click="toggle">
+            <text>{{end? '展开': '收起'}}<u-icon :name="end ? 'arrow-down': 'arrow-up'" size="22" color="#000"></u-icon></text>
           </view>
           <view class="price text-right u-m-t-30 u-p-r-30">
-            总金额 <text class="price-num u-m-l-40">2000</text>元
+            总金额 <text class="price-num u-m-l-40">{{ detail.price }}</text>元
           </view>
         </view>
         <!--订单信息-->
@@ -57,26 +60,26 @@
           <view class="u-flex u-m-t-18 u-m-b-8">
             <view class="u-m-r-40 label">订单编号</view>
             <view class="u-line-1 u-flex-1 content">
-              11
+              <!--              {{ item.createTime}}-->
             </view>
           </view>
           <view class="u-flex u-m-t-18 u-m-b-8">
             <view class="u-m-r-40 label">创建时间</view>
             <view class="u-line-1 u-flex-1 content" >
-              111
-            </view>付款时间
+              {{ detail.createTime}}
+            </view>
           </view>
           <view class="u-flex u-m-t-18 u-m-b-8">
             <view class="u-m-r-40 label">付款时间</view>
             <view class="u-line-1 u-flex-1 content">
-              11
+              {{ detail.createTime}}
             </view>
           </view>
         </view>
       </view>
 
     </view>
-    <view class="footer" id="footer">
+    <view class="footer" id="footer" v-if="detail.status === 1">
       <view class="footer-btn">
         <view class="button button-default">
           立刻付款
@@ -95,12 +98,38 @@ export default {
     return {
       title: '待付款',
       detail:{
-
-      }
+        styleLibraryTaskItemVOList:[]
+      },
+      end: true
+    }
+  },
+  computed:{
+    list(){
+      let data = this.detail.styleLibraryTaskItemVOList || [];
+      return this.end === true && data.length > 3
+          ? data.slice(0,3) : data;
     }
   },
+  created() {
+    let { id} = this.$Route.query;
+    this.getItem(id)
+  },
   methods:{
-    toggle(){}
+    toggle(){
+      this.end = !this.end;
+    },
+    getItem(id){
+      this.$http("stylelibraryorder.listingDetails",id).then(res =>{
+        let {
+          code, data
+        } = res;
+        if(code === 200){
+          if(Object.keys(data).length > 0){
+            this.detail = data;
+          }
+        }
+      })
+    },
   }
 }
 </script>

src/pages/material/entrustList.vue

@@ -29,38 +29,43 @@
         <view class="item-header u-flex">
           <view class="u-flex-1 u-line-1 u-font-32 u-flex">
             <view class="item-header-tip u-m-r-10"></view>
-            AS2312424234
+            {{item.styleOrderCode}}
           </view>
-          <view class="item-header-status u-flex-1 u-line-1 u-font-28">
-            待付款倒计时：59分21秒
+          <view class="item-header-status u-flex-1 u-line-1 u-font-28 text-right">
+            <!--            待付款倒计时：59分21秒-->
+            <!--            1-待付款、2-已付款、3-已取消-->
+            {{
+              item.status === 1 ? '待付款' :
+                  item.status === 2 ? '已付款' : '已取消'
+            }}
           </view>
         </view>
         <view class="item-body ">
           <view class="item-desc u-m-t-28 u-m-b-22">
             <text class="u-m-r-20 item-desc-label">上架款数</text>
-            <text class="item-desc-value">50款</text>
-          </view>
-          <view class="item-images">
-            <image src="" fit="fit" class="item-image"></image>
-            <image src="" fit="fit" class="item-image"></image>
-            <image src="" fit="fit" class="item-image"></image>
-            <image src="" fit="fit" class="item-image"></image>
-            <image src="" fit="fit" class="item-image"></image>
-            <image src="" fit="fit" class="item-image"></image>
+            <text class="item-desc-value">{{item.quantity}}款</text>
           </view>
         </view>
         <view class="item-hr"></view>
         <view class="item-footer u-flex">
-          <view class="item-desc u-flex-1 u-line-1">
+          <view class="item-desc u-flex-1 u-line-1" v-if="item.status === 1">
             <text class="u-m-r-20 item-desc-label">待支付:</text>
-            <text class="item-desc-value item--status">23211元</text>
+            <text class="item-desc-value item--status">{{ item.price }}元</text>
           </view>
-          <view class="item-buttons u-flex-1 u-flex">
-            <view class="button button-plain button-plain--default u-m-r-20">取消上架</view>
-            <view class="button button-default">付款</view>
+          <view class="item-buttons u-flex-1 u-flex" >
+            <!--            v-if="item.putawayStatus === 3"-->
+            <view class="button button-plain button-plain--default u-m-r-20" @click.stop.self="cancel(item)" >取消上架</view>
+            <view class="button button-default" v-if="item.status === 1">付款</view>
           </view>
         </view>
       </view>
+      <!-- 加载更多 -->
+      <u-loadmore v-if="!isEmpty" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
+      <!-- 缺省页 -->
+      <hs-empty  v-if="isEmpty" tipText="没有数据"
+                 marginTop="100rpx"
+                 :image="emptyImage"></hs-empty>
+      <u-toast ref="uToast" />
     </view>
   </view>
 </template>
@@ -73,25 +78,72 @@ export default {
   mixins:[dom],
   data(){
     return{
+      emptyImage :require("@/static/images/components/empty/empty.png"),
       activeStatus: 0,
       statusList: [
-        {label: '全部',value: '1'},
-        {label: '待付款',value: '2'},
-        {label: '已付款',value: '3'},
-        {label: '已取消',value: '4'},
+        {label: '全部',value: 0},
+        {label: '待付款',value: 1},
+        {label: '已付款',value: 2},
+        {label: '已取消',value: 3},
       ],
-      list: [
-        {}
-      ]
+      loadStatus: 'loadmore',
+      pageOptions: {
+        current: 1,
+        size: 10,
+        pages: 10,
+      },
+      list: []
+    }
+  },
+  created() {
+    this.getList()
+  },
+  computed:{
+    isEmpty(){
+      return this.list.length === 0
     }
   },
   methods:{
     setStatus(index){
       this.activeStatus = index;
-      this.getList();
+      this.getList(true);
+    },
+    getList(isReload){
+      this.loadStatus = 'loading';
+      this.$http("stylelibraryorder.listingList",{
+        ...this.pageOptions,
+        "status": this.statusList[this.activeStatus].value,
+      }).then(res =>{
+        let {
+          code, data
+        } = res;
+        if(code === 200){
+          if(Object.keys(data).length > 0){
+            this.list = isReload ? data.records : this.list.concat(data.records);
+            this.pageOptions.pages = data.total;
+            this.loadStatus = this.list.length  < data.total ? 'loadmore' : 'nomore';
+          }else{
+            this.list = []
+            this.loadStatus = 'nomore';
+          }
+        }
+      })
     },
-    getList(){
-      // this.
+    cancel(item){
+
+      this.$http("stylelibraryorder.unlisted", { id: item.id})
+          .then(res => {
+            let {
+              code,msg
+            } = res;
+            if(code === 200){
+              this.getList(true);
+            }else{
+              this.$refs.uToast.show({
+                title: msg
+              })
+            }
+          })
     },
     goEntrustItemPage({id}){
       this.$Router.push({
@@ -109,7 +161,9 @@ export default {
 $activeColor: #DDA973;
 $mainColor: #000;
 $subColor: rgba(0,0,0,0.40);
-
+.flex-row-reverse{
+  flex-direction: row-reverse;
+}
 .bg-fff{
   background: #fff;
 }

src/pages/material/entrustManagementItem.vue

 <template>
   <view>
     <view>
-      <u-image height="750rpx"></u-image>
+      <u-image height="750rpx" :src="`${$IMG_URL}${item.originalImageCode}`"></u-image>
     </view>
     <view class="u-p-t-20 u-p-r-30 u-p-l-30 ">
       <view class="bg-fff u-p-t-20 u-p-r-30 u-p-b-30 u-p-l-30 item">
         <view class="u-flex">
-          <text class="u-flex-1">男装-上装-青年-时尚</text>
-          <text class="active">待上架</text>
+          <text class="u-flex-1">{{ item.styleTag}}</text>
+          <text class="active">{{item.status | filterStatus}}</text>
         </view>
         <view class="u-flex">
-          <text class="u-flex-1 u-font-28">AS23124</text>
+          <text class="u-flex-1 u-font-28">{{ item.styleCode}}</text>
           <text class="u-font-24">
-            加入日期：2021-12-11
+            加入日期：{{ item.createTime.split(' ')[0]}}
           </text>
         </view>
         <view class="item-tags">
-          <view class="item-tag u-font-20">
-            标签
-          </view>
-          <view class="item-tag u-font-20">
-            标签
+          <view class="item-tag u-font-20"
+                :key="tag.id"
+                v-for="tag in item.styleLibraryTagVOList">
+            {{ tag.materialTagName }}
           </view>
         </view>
       </view>
-      <view class="bg-fff u-p-r-30 u-p-b-30 u-p-l-30 item">
+      <view class="bg-fff u-p-r-30 u-p-b-30 u-p-l-30 item ">
         <view class="u-border-bottom u-line-88">所选面料</view>
         <view class="u-m-t-30 u-m-b-56">
-          <hs-material-thumbnail :item="item"></hs-material-thumbnail>
+          <hs-material-thumbnail :item="materialInfo"></hs-material-thumbnail>
         </view>
-        <view class="u-flex">
+        <view class="u-flex  base-line ">
           <view class="">
             <view>主图颜色</view>
             <view class="image">
-              <image src="" style="width: 100%;height: 100%"></image>
-              <view class="image-tip u-line-1">颜色</view>
+              <image :src="`${$IMG_URL}${mainPic.fileCode}`" style="width: 100%;height: 100%"></image>
+              <view class="image-tip u-line-1">{{mainPic.describes}}</view>
             </view>
           </view>
           <view class="overflow u-flex-1">
             <view>其他颜色</view>
             <view>
-              <view class="image u-m-r-10">
-                <image src="" style="width: 100%;height: 100%"></image>
-                <view class="image-tip u-line-1">颜色</view>
-              </view>
-              <view class="image u-m-r-10">
-                <image src="" style="width: 100%;height: 100%"></image>
-                <view class="image-tip u-line-1">颜色</view>
-              </view>
-              <view class="image u-m-r-10">
-                <image src="" style="width: 100%;height: 100%"></image>
-                <view class="image-tip u-line-1">颜色</view>
+              <view class="image u-m-r-10" v-for="pic in subPic" :key="pic.id">
+                <image :src="`${$IMG_URL}${item.fileCode}`" style="width: 100%;height: 100%"></image>
+                <view class="image-tip u-line-1">{{pic.describes}}</view>
               </view>
             </view>
           </view>
@@ -67,7 +58,60 @@ export default {
   components: {HsMaterialThumbnail},
   data(){
     return{
-      item:{}
+      item:{
+        createTime: '',
+        colourApiList: []
+      }
+    }
+  },
+  computed:{
+    mainPic(){
+      return this.item.colourApiList.filter((item) => item.isMain)[0]
+    },
+    subPic(){
+      return this.item.colourApiList.filter((item) => !item.isMain)
+    },
+    materialInfo(){
+      let item = this.item.materialInfo || {};
+      return Object.assign({}, item,{
+        materialCategory: item.category,
+        materialDoorWidth: item.fabricWidth,
+        materialElement: item.saoriStandard,
+      })
+    }
+  },
+  filters:{
+    filterStatus(v){
+      // 1-待领取、2-待处理、3-待审核、4-已启动、5-已停用
+      switch (v) {
+        case 1:
+          return '待领取'
+        case 2:
+          return '待处理'
+        case 3:
+          return '待审核'
+        case 4:
+          return '已启动'
+        case 5:
+          return '已停用'
+      }
+    }
+  },
+  created() {
+    let { id} =this.$Route.query;
+    this.getItem(id);
+  },
+  methods:{
+    getItem(id){
+      this.$http("stylelibraryorder.getStyleDetails",id)
+          .then(res =>{
+            let{
+              code, data
+            } = res;
+            if(code === 200){
+              this.item = data;
+            }
+          })
     }
   }
 }
@@ -78,7 +122,7 @@ $h-color: #AF8D66;
 $activeColor: #DDA973;
 $color: rgba(175,141,102,0.10);
 $main-color: #fff;
-
+.base-line{     align-items: baseline;}
 .u-line-88{
   line-height: 88rpx;
 }

src/pages/material/mixins/material.js

+export default {
+    data(){
+        return {
+            MaterialList: [],
+            materialDetail: {}
+        }
+    },
+    computed:{
+        title(){
+            return this.materialDetail.materialName;
+        },
+    },
+    methods:{
+        getMaterialList(){
+            this.$http("materialinfo.getMaterialList",{
+                isDisabled: false,
+                materialType: "面料",
+                current: 1,
+                size: 10,
+            }).then(res =>{
+                let {
+                    code, data
+                } = res;
+                if(code === 200){
+                    this.MaterialList = data.page.records;
+                }
+            })
+        },
+        // 获取面料详情
+        getMaterialItem(id,callback){
+            this.$http("materialinfo.getMaterialById", id)
+                .then(res =>{
+                    let {
+                        code, data
+                    } = res;
+                    if(code === 200){
+                        if(callback){
+                            callback(data)
+                        }else{
+                            this.materialDetail = data;
+                        }
+                    }
+                })
+        },
+    }
+}

src/pages/material/mixins/step.js

+export default {
+    data(){
+        return{
+            offset :{
+                x: 0
+            },
+            startTime: 0,
+            lineStepWidth: 0,
+            lineWidth: 0,
+            lineOffset: 0,
+        }
+    },
+    computed:{
+        // 角度
+        angle(){
+            let { lineOffset,offset,lineWidth} = this;
+            let left = (offset.x - lineOffset.left) / lineWidth * 100;
+            return Math.ceil((left-50) / 50 * 180);
+        },
+    },
+    methods:{
+        // 重置调整的进度条
+        initStep(){
+            this.uGetRect("#line").then(res => {
+                this.lineWidth = res.width;
+                this.lineOffset = {
+                    left: res.left,
+                    right: res.right,
+                };
+                this.offset.x = res.width / 2  + res.left;
+            })
+            this.uGetRect("#line-step").then(res => {
+                this.lineStepWidth = res.width;
+            })
+        },
+        resetStep(){
+            this.offset.x = this.lineWidth  / 2  + this.lineOffset.left;
+        },
+        touchMove(e){
+            let left =  e.changedTouches[0].pageX;
+            this.offset.x = this.filterStartEnd(left)
+        },
+        touchEnd(e){
+            let left =  e.changedTouches[0].pageX;
+            this.offset.x = this.filterStartEnd(left)
+        },
+        touchStart(e){
+            this.offset.x = e.changedTouches[0].pageX;
+        },
+        filterStartEnd(num){
+            let { left,right } = this.lineOffset;
+            if(num < left){
+                return left
+            }else if(num > right){
+                return right
+            }else{
+                return num
+            }
+        }
+    },
+    mounted() {
+        this.initStep()
+    },
+}

src/pages/material/selectType.vue

@@ -174,6 +174,7 @@ export default {
       this.loadStatus = 'loading';
       this.$http('stylelibraryorder.page', {
         styleTag: this.keyword,
+        status: 0,
         materialTagIdList,
         ...this.pageOptions
       }).then(res => {