Merge branch 'dev' of http://47.110.145.204:8085/lixingjian/hs-app-project into dev

src/config/request/apiList/modeling.js

-
-// let base = "/gdep-plm/modelingTaskCategory"
 let base = "/gdep-plm/modelingtask";
 export default {
     modeling:{
-        category: {
-            url: `/gdep-plm/modelingTaskCategory/page`,
-            method: "POST",
-        },
+        // 新建 修改
         submit:{
             url: `${base}/submit`,
             method: "POST",
         },
+        // 详情
         detail:{
             url: `${base}/detail`,
             method: "GET",
         },
+        // 催单
 		reminders:{
             url: `${base}/reminders`,
             method: "post",
         },
+        // 寄样
+        sendSamples:{
+            url: `${base}/sendSamples`,
+            method: "post",
+        },
+        // 列表
+        selectModelingTaskPage: {
+            url: `${base}/selectModelingTaskPage`,
+            method: "get",
+        },
+        // 确认建模任务
+        confirm:{
+            url: `${base}/confirm`,
+            method: "post",
+        }
     }
 }

src/config/request/apiList/modelingTaskCategory.js

+
+let base = "/gdep-plm/modelingTaskCategory"
+export default {
+    modelingTaskCategory:{
+        list:{
+            url: `${base}/list`,
+            method: "GET",
+        },
+
+    }
+}

src/config/request/apis.js

@@ -4,17 +4,19 @@
 import user from './apiList/user.js'
 import auth from './apiList/auth.js'
 import color from './apiList/colors.js'
-import orderTicket from './apiList/orderTicket.js'
+// import orderTicket from './apiList/orderTicket.js'
+// 建模任务表接口
 import modeling from './apiList/modeling.js'
+// 建模品类表接口
+import modelingTaskCategory from './apiList/modelingTaskCategory.js'
 import plm from './apiList/plm.js'
-// import goods from './apiList/goods.js'
-// import base from './apiList/base.js'
 
 export default {
 	...user,
 	...auth,
 	...color,
-	...orderTicket,
+	// ...orderTicket,
 	...modeling,
-	...plm
+	...plm,
+	...modelingTaskCategory
 };

src/mixins/utils.js

+export default {
+    methods:{
+        previewImage(url){
+            uni.previewImage({
+                urls: typeof url === 'string' ? [url]: url
+            })
+        },
+        callPhone(phoneNumber){
+            uni.makePhoneCall({
+                phoneNumber
+            })
+        }
+    }
+}

src/pages/fabricModeling/modelingOrder.vue

@@ -358,11 +358,11 @@ export default {
 			if (val == '即刻发布') {
 				this.$Router.push(`/pages/modeling/addItem?id=${item.id}`);
 			} else if (val == '选款') {
-				// this.$Router.push(`/pages/designCommissioned/addItem?id=${item.id}&status=2`);
+				this.$Router.push(`/pages/modeling/item?id=${item.id}`);
 			} else if (val == '马上寄送') {
-				this.$Router.push(`/pages/designCommissioned/addItem?id=${item.id}`);
+				this.$Router.push(`/pages/modeling/item?id=${item.id}`);
 			} else {
-				this.$Router.push('/pages/designCommissioned/listSelectToAdd');
+				this.$Router.push('/pages/modeling/addItem');
 			}
 		}
 	}

src/pages/home/tenantSelection.vue

@@ -48,7 +48,7 @@ export default {
       // 向宿主App发送事件
       uni.sendNativeEvent('getTenantList', {}, ret => {
         this.list = JSON.parse(ret).filter((item) =>{
-          return item.tenantPlat === 'sass'
+          return item.tenantPlat === 'saas'
         });
       })
       // #endif

src/pages/modeling/addItem.vue

@@ -64,7 +64,7 @@
           </u-form-item>
           <!--指定面料颜色数量-->
           <u-form-item label="指定面料颜色数量" prop="component" required>
-            <u-number-box v-model="detail.clothRowColourQuantity" @blur="addModelingTaskColourDTOList"></u-number-box>
+            <u-number-box v-model="detail.clothRowColourQuantity" @change="addModelingTaskColourDTOList"></u-number-box>
           </u-form-item>
           <view class="brandList-tips u-p-t-24 u-p-r-30 u-p-b-24 u-p-l-30" >
             <view class="u-border-bottom u-flex u-p-b-8 ">
@@ -305,23 +305,19 @@ export default {
       this.detail.price = extra;
     },
     init(){
-      this.$http("modeling.category",{
-        "current": 1,
-        "size": 10
-      })
+      this.$http("modelingTaskCategory.list")
       .then(res =>{
         let {
           code,data
         } = res;
         if(code === 200){
-          this.modelingTaskCategory = data.records.map((item) =>{
+          this.modelingTaskCategory = data.map((item) =>{
             return {
               label: item.name,
               value: item.id,
               extra: item.price,
             }
           });
-          // console.log(data)
         }
       })
     },
@@ -344,9 +340,24 @@ export default {
       let {modelingTaskPictureDTOList, ...onther} = this.detail;
       this.$http("modeling.submit",Object.assign({},
           onther,
-          { operationType:type, modelingTaskPictureDTOList: modelingTaskPictureDTOList.concat(this.delModelingTaskPictureDTOList)})
+          {
+            designAgencyColourQuantity: this.designAgencyColourQuantity,
+            operationType:type,
+            modelingTaskPictureDTOList: modelingTaskPictureDTOList.concat(this.delModelingTaskPictureDTOList)})
       ).then(res =>{
-
+          let {
+            code,msg
+          } = res;
+          if(code === 200){
+            this.$refs.uToast.show({
+              title: msg,
+              back: true
+            });
+          }else{
+            this.$refs.uToast.show({
+              title: msg
+            });
+          }
       })
     },
 
@@ -358,6 +369,7 @@ export default {
       for (let i = 0; i < item.value; i++) {
         res.push(this.getDefaultColor())
       }
+
       this.modelingTaskColourDTOList = res;
     },
     validateColors(){
@@ -401,8 +413,9 @@ export default {
                  modelingTaskColourDTOList: data['modelingTaskColourList'],
                  modelingTaskPictureDTOList: data['modelingTaskPictureList']
                });
-               console.log(data['modelingTaskPictureList'])
-               this.modelingTaskColourList = data['modelingTaskColourList']
+               this.$nextTick(() =>{
+                 this.modelingTaskColourDTOList = data['modelingTaskColourList'];
+               })
              }
           })
     },

src/pages/modeling/read.md

+1-待发布  发布
+2-任务待审批
+3-待接单
+4-待寄样  寄样 选快递 填单号
+5-建模中
+6-建模待审批 
+7-待确认 评审 
+8-已完成 
+
+撤回 3
+
+催单 

src/pages/modeling/editItem.vue → src/pages/modeling/reviewHistory.vue

 <template>
+  <view>
 
+  </view>
 </template>
 
 <script>
 export default {
-  name: "editItem"
+  name: "reviewHistory",
+  data(){
+
+  }
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 
 </style>