款式委托 新增

src/components/hs-material-thumbnail/hs-material-thumbnail.vue

@@ -3,15 +3,15 @@
     <image style="width: 100%;height: 160rpx;" src="@/static/images/home/1@2x.png" mode=""></image>
     <view class="order_tit">
       <view class="u-flex justify-between u-font-32">
-        <span class="color_DDA973 u-line-1">加厚荷兰绒绒布布料备份加厚荷兰绒绒布布料备份</span>
+        <span class="color_DDA973 u-line-1">{{item.name}}</span>
         <span><u-icon size="24" color="#fff" name="arrow-right"></u-icon></span>
       </view>
       <view class="u-font-24 u-m-t-20 color_6F6F72">
-        <span class="u-m-r-10">针织</span>
+        <span class="u-m-r-10">{{item.mdmMaterialCategory}}</span>
         |
-        <span class="u-m-l-10 u-m-r-10">180cm</span>
+        <span class="u-m-l-10 u-m-r-10">{{ item.mdmMaterialClothWidth }}cm</span>
         |
-        <span class="u-m-l-10">100%面备份面备份面备份面备份面备份面备份面备份面备份</span>
+        <span class="u-m-l-10">{{item.mdmMaterialComponent}}</span>
       </view>
     </view>
   </view>

src/pages/designCommissioned/addItem.vue

@@ -11,7 +11,7 @@
       <view class="u-p-30 bg-fff u-m-b-20">
         <hs-tip-title title="所选面料"></hs-tip-title>
         <view >
-          <hs-material-thumbnail></hs-material-thumbnail>
+<!--          <hs-material-thumbnail></hs-material-thumbnail>-->
         </view>
       </view>
       <!--面料颜色要求-->
@@ -75,7 +75,7 @@
           <view class="u-font-28 u-m-t-18 u-m-b-8">参考品牌(选填)</view>
           <view class="u-flex">
             <view class="u-line-1 u-flex-1 u-font-32">
-              <u-input v-model="detail.brand"></u-input>
+              <u-input v-model="detail.referToBrand"></u-input>
             </view>
           </view>
         </view>
@@ -93,8 +93,8 @@
     <view class="footer" id="footer">
       <view class="footer-btn">
         <view class="custom-style-round-circle custom-style-btn custom-style">
-          <view class="custom-style-left save">保存</view>
-          <view class="custom-style-right submit">
+          <view class="custom-style-left save" @click="saveData">保存</view>
+          <view class="custom-style-right submit" @click="submitData">
             <view class="title">立即发布</view>
           </view>
         </view>
@@ -193,7 +193,7 @@ export default {
         ],
         colourList: [],     //选中颜色
         expirationDate: "", //截止日期
-        // brand: "",
+        referToBrand: "",  // 参考品牌
         otherDescribe: "", //其他描述
       },
       brandSelectList: [], // 风格 tree
@@ -390,7 +390,7 @@ export default {
     brandSelectCallback(e){
       this.detail.designRequirementsDTOList.push({
         quantity: 0,
-        styleId: e[e.length - 1].id,
+        styleId: e[e.length - 1].value,
         isDeleted: false,
         name: e.map((item) => {
           return item.label
@@ -417,8 +417,23 @@ export default {
       } = e;
       this.detail.expirationDate = [year,month,day].join("-")
     },
-    submit(){
+    submit(data){
+      this.$http("orderTicket.save",{
+        ...data,
+        ...this.detail
+      }).then(res => {
 
+      })
+    },
+    saveData(){
+      this.submit({
+        operationType: 1
+      })
+    },
+    submitData(){
+      this.submit({
+        operationType: 2
+      })
     }
   }
 }

src/pages/designCommissioned/splitItem.vue

@@ -9,18 +9,20 @@
 
     <view class="u-p-30 bg-fff">
       <hs-tip-title title="所选面料"></hs-tip-title>
-      <view ></view>
+      <view >
+        <hs-material-thumbnail :item="mdmMaterial"></hs-material-thumbnail>
+      </view>
     </view>
     <view class="u-p-30 bg-fff">
       <hs-tip-title title="风格款数要求"></hs-tip-title>
-      <view v-for="(item,index) in brandList" :key="index" class="u-p-t-16 u-p-b-30 u-border-bottom">
+      <view v-for="(item,index) in detail.orderTicketStyleRequirementsVOList" :key="index" class="u-p-t-16 u-p-b-30 u-border-bottom">
         <view class="u-flex u-p-b-16">
           <view class="u-line-1 u-flex-1">
             {{item.name}}
           </view>
-          <text class="del" @click="del">删除</text>
+          <text class="del" @click="showDelModal(index)">删除</text>
         </view>
-        <u-number-box v-model="item.num"></u-number-box>
+        <u-number-box v-model="item.quantity"></u-number-box>
       </view>
       <u-button plain @click="addBrandList"  type="primary">+添加风格</u-button>
     </view>
@@ -28,12 +30,14 @@
     <u-select
         @confirm="brandSelectCallback"
         safe-area-inset-bottom v-model="brandSelectShow" :list="brandSelectList" mode="mutil-column-auto"></u-select>
+    <!-- 删除风格款数模态框 -->
+    <u-modal v-model="modal.show" :content="modal.content"  @confirm="modalConfirm" ></u-modal>
 
     <view class="footer" id="footer">
       <view class="footer-btn">
         <view class="custom-style-round-circle custom-style-btn custom-style">
-          <view class="custom-style-left save">保存</view>
-          <view class="custom-style-right submit">
+          <view class="custom-style-left save" @click="save">保存</view>
+          <view class="custom-style-right submit" @click="submit">
             <view class="title">立即发布</view>
             <view class="desc">将被拆分为<text class="color">2个委托</text></view>
           </view>
@@ -44,66 +48,68 @@
 </template>
 
 <script>
+import styleTree from "./mixins/styleTree"
 import HsTipTitle from "../../components/hs-tip-title/hs-tip-title";
 export default {
   name: "splitItem",
   components: {HsTipTitle},
+  mixins:[styleTree],
   data(){
     return{
-      brandList: [
-        {name: '男装｜上装｜25～35岁｜时尚休闲', num: 12},
-        {name: '男装｜上装｜15～25岁｜时尚休闲时尚休闲时', num: 12},
-      ],
+
+      modal:{
+        show: false,
+        content: "确认删除?"
+      },
       brandSelectShow: false,
       timePickerShow: true,
-      brandSelectList: [
-        {
-          value: 1,
-          label: '男装',
-          children: [
-            {
-              value: 11,
-              label: '上装',
-              children:[
-                {
-                  value: 21,
-                  label: '18-25岁',
-                  children:[
-                    {
-                      value: 31,
-                      label: '时尚休闲',
-                    },
-                    {
-                      value: 32,
-                      label: '运动',
-                    }
-                  ]
-                },
-                {
-                  value: 22,
-                  label: '25-35岁',
-                  children:[
-                    {
-                      value: 33,
-                      label: '时尚休闲',
-                    },
-                    {
-                      value: 34,
-                      label: '运动',
-                    }
-                  ]
-                },
-              ]
-            }
-          ]
-        }
-      ],
+      activeIndex: -1,
+      brandSelectList: [],
+      detail: {
+        orderTicketStyleRequirementsVOList: [
+
+        ],
+      },
+    }
+  },
+  onLoad({id}) {
+    this.getItemMsg(id);
+    this.getStyleTreeList();
+  },
+  computed:{
+    mdmMaterial(){
+       return {
+          name: this.detail.mdmMaterialName,
+          ...this.detail,
+          // name: item.mdmMaterialName,
+      }
     }
   },
   methods:{
+    // 显示删除模态框
+    showDelModal(index){
+      this.modal.show = true;
+      this.activeIndex = index;
+    },
+    // 显示删除模态框
+    modalConfirm(){
+      this.delItem(this.activeIndex);
+    },
+    delItem(index){
+      this.detail.orderTicketStyleRequirementsVOList.splice(index,1);
+    },
+    getItemMsg(id){
+      this.$http("orderTicket.detail",1).then(res =>{
+        let {
+          code, data
+        } = res;
+
+      })
+    },
     addBrandList(){
       this.brandSelectShow = true;
     },
+
     brandSelectCallback(e){
       this.brandList.push({
         num: 0,
@@ -111,8 +117,13 @@ export default {
           return item.label
         }).join("｜")
       })
-    }
+    },
+    submit(){
+
+    },
+    save(){
 
+    },
   }
 }
 </script>

src/pages/user/register.vue

@@ -278,7 +278,9 @@ export default {
         ]
       },
       form2:{
-        subsidiaryInfoDTOList:[],
+        subsidiaryInfoDTOList:[
+          {stallAddress: ''}
+        ],
         brandInfoDTOList: [
           // {
           //   "brandName": "品牌名称", //品牌名称
@@ -442,7 +444,9 @@ export default {
               ...item,
               stallAddress: item.detailedAddress,
             }
-          }) : []
+          }) : [
+            {stallAddress: ''}
+          ]
           this.form2.brandInfoDTOList = brandInfoList.map((item) => {
             return{
               ...item,