Browse Source

'下单制1.0验收上线版本'

魏志佳 4 years ago
parent
commit
8bad6436af

+ 2 - 2
src/views/modules/Statistics/newPlanStatic/newPlanStatic.vue

@@ -766,7 +766,7 @@ export default {
       SHOW_PARENT,
 
       type:3,
-      dateValue:[moment().subtract(7,'days'), moment()],
+      dateValue:[moment().subtract(7, 'days'), moment().subtract(1, 'days')],
 
       operate:'',
       operateList:[],
@@ -927,7 +927,7 @@ export default {
     tabChange(key){
       console.log(key);
       this.treeValue=[];
-      this.operate=''
+      this.operate=undefined;
       if(key==1){
         // toutiao
         this.treeData=this.TTaccountList;

src/views/modules/autoLaunch/setCreate.vue → src/views/modules/autoLaunch/configLaunchInfo.vue


File diff suppressed because it is too large
+ 1083 - 0
src/views/modules/autoLaunch/configLaunchList.vue


+ 1 - 2
src/views/modules/autoLaunch/index.vue

@@ -23,8 +23,7 @@ export default {
     },
     components:{   
         createStrategy: () => import('./createStrategy'), 
-        setDirectional: () => import('./setDirectional'), 
-        setCreate: () => import('./setCreate'), 
+        setDirectional: () => import('./setDirectional'),  
         previewStrategy: () => import('./previewStrategy'), 
         
     },

+ 7 - 9
src/views/modules/autoLaunch/setDirectional.vue

@@ -1507,17 +1507,15 @@ export default {
                     postAction('/kuaishouStrategy/add',params).then(res=>{
                         console.log(res)
                         this.goNextloading=false
-                        if(res.success){
-                            
-                            // this.$parent.strategyInfo={}
-                            // this.$router.replace('/autoLaunch/autoLaunchList')
-                            // this.$bus.$emit('remove', '/autoLaunch/newStrategy')
-                            
+                        if(res.success){                            
+                            this.$parent.strategyInfo={}
+                            this.$router.replace('/autoLaunch/autoLaunchList')
+                            this.$bus.$emit('remove', '/autoLaunch/newStrategy')                            
                         }else{
                             this.$messgae.error(res.message)
-                            // this.$parent.strategyInfo={}
-                            // this.$router.replace('/autoLaunch/autoLaunchList')
-                            // this.$bus.$emit('remove', '/autoLaunch/newStrategy')
+                            this.$parent.strategyInfo={}
+                            this.$router.replace('/autoLaunch/autoLaunchList')
+                            this.$bus.$emit('remove', '/autoLaunch/newStrategy')
                         }
                     })
 

+ 2 - 2
src/views/modules/workBench/materialList.vue

@@ -1461,8 +1461,8 @@ export default {
 
         beforeUpload(file) {
 
-            // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
-            this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
+            this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
+            // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             // this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)

+ 2 - 2
src/views/modules/workBench/orderDetail.vue

@@ -1872,9 +1872,9 @@ export default {
 
 
         beforeUpload(file) {
-            // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
             // this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
-            this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
 
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)

+ 3 - 2
src/views/modules/workBench/placeOrder.vue

@@ -512,6 +512,7 @@ export default {
             }else if(this.$parent.role=='design'){
                 this.$parent.currentTabComponent='operatorPlatform'
             }
+            this.$parent.isEdit=false;
         },
         disabledDate(current) {
             return current && current < moment().subtract(1,'days')
@@ -701,8 +702,8 @@ export default {
 
         beforeUpload(file) {
             // ${this.form.project}
-            // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadAttachment?projectId=772`
-            this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadAttachment?projectId=772`
+            this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadAttachment?projectId=772`
+            // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadAttachment?projectId=772`
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
             const fileName = file.name