Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/bpm/processInstance/detail.vue

@@ -160,6 +160,10 @@ export default {
         return false
       }
       const map = {
+      "shippingDetail": {
+          component: "shippingDetail",
+          processId: this.processInstance.businessKey,
+        },
         // 报价单特价审核，原来配置的组件名
         "special-discount": {
           component: 'OfferSpecialDetail',

src/views/ecw/productPrice/edit.vue

@@ -350,6 +350,12 @@ export default {
         if(this.form.needPay){
           this.needPay = true
         }
+        if(res.data.validateStartDate){
+          this.form.validateStartDate = parseTime(res.data.validateStartDate)
+        }
+        if(res.data.validateEndDate){
+          this.form.validateEndDate = parseTime(res.data.validateEndDate)
+        }
         this.lineList = [res.data]
       })
     }