Merge branch 'optionsys' of http://124.70.211.186:3000/zhangqi/yos_web into optionSystem

src/HManagement/clueManage/m_activity/modules/add copy.vue

@@ -1,60 +1,73 @@
 <template>
   <div>
-    <el-button type="primary" size="small" @click="dialogFormVisible = true">新 建</el-button>
-    <el-dialog title="新建活动" append-to-body :visible.sync="dialogFormVisible" width="500px">
-      <el-form :model="form" :rules="rules" ref="form" label-width="100px" size="small">
-        <el-form-item label="活动名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入活动类型" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="活动类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择类型" style="width:100%" clearable>
-            <el-option
-              v-for="item in campaigntypeList()"
-              :key="item.index"
-              :label="item.value"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="负责人">
-          <el-input v-model="form.director" placeholder="请输入负责人"></el-input>
-        </el-form-item>
-        <el-form-item label="地址">
-          <el-input v-model="form.address" placeholder="请输入地址"></el-input>
-        </el-form-item>
-        <el-form-item label="开始日期" prop="begdate">
-          <el-date-picker
-            v-model="form.begdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期"
-            style="width:100%">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束日期" prop="enddate">
-          <el-date-picker
-            v-model="form.enddate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期"
-            style="width:100%">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="small" style="width:120px" @click="dialogFormVisible = false">取 消</el-button>
-        <el-button size="small" style="width:120px" type="primary" @click="add()">确 定</el-button>
+    <el-button type="primary" size="small" @click="onShow">新 建</el-button>
+    <el-drawer
+      title="新建活动"
+      :visible.sync="drawer"
+      size="800px"
+      direction="rtl"
+      append-to-body
+      @close="onClose"
+      :show-close="false">
+      <div class="drawer__panel">
+        <el-form :model="form" :rules="rules" ref="form" label-width="100px" size="small">
+          <el-form-item label="活动名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入活动名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="活动类型" prop="type">
+            <el-select v-model="form.type" placeholder="请选择类型" style="width:100%" clearable>
+              <el-option
+                v-for="item in campaigntypeList()"
+                :key="item.index"
+                :label="item.value"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="活动负责人" prop="director">
+            <selectLeader ref="leader" @selectLeader="selectLeader">
+              <el-input @focus="$refs.leader.dialogTableVisible=true" slot="input" type="text" size="small" v-model="form.director" placeholder="请选择活动负责人"></el-input>
+            </selectLeader>
+          </el-form-item>
+          <el-form-item label="地址" prop="address">
+            <el-input v-model="form.address" placeholder="请输入地址"></el-input>
+          </el-form-item>
+          <el-form-item label="开始日期" prop="begdate">
+            <el-date-picker
+              v-model="form.begdate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+              style="width:100%">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="结束日期" prop="enddate">
+            <el-date-picker
+              v-model="form.enddate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+              style="width:100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
       </div>
-    </el-dialog>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="drawer = false,$refs.form.resetFields()" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="add()" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
+import selectLeader from './selectAgent/index'
 export default {
   inject:['campaigntypeList'],
+  components:{selectLeader},
   data () {
     return {
-      dialogFormVisible:false,
+      drawer:false,
       form:{
         "sat_campaignid":0,
         "name":"",
@@ -77,10 +90,18 @@ export default {
         enddate: [
           { validator:this.validateEndDate, trigger: 'change' }
         ],
-      }
+      },
+      options:[]
     }
   },
   methods:{
+    onShow () {
+      this.drawer = true
+    },
+    selectLeader (data) {
+      console.log(data);
+      this.form.director = data.name
+    },
     validateEndDate(rule, value, callback){
       let start = (new Date(this.form.begdate)).getTime()
       let end = (new Date(this.form.enddate)).getTime()
@@ -102,16 +123,32 @@ export default {
           "content": this.form
         })
         this.tool.showMessage(res,()=>{
-          this.dialogFormVisible = false
+          this.drawer = false
           this.$refs.form.resetFields()
           this.$emit('onSuccess')
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/marketing_activityDetails',query:{tabIndex:1,id:res.data.sat_campaignid,rowindex:res.data.rowindex}})
         })
       });
     },
-    
+    onClose () {
+      this.form = {
+        "sat_campaignid":0,
+        "name":"",
+        "director":"",
+        "address":"",
+        "type":"",
+        "begdate":"",
+        "enddate": ""
+      }
+    }
   }
 }
 
 </script>
-<style>
+<style scoped>
+.dialog-footer{
+  margin-top:32px;
+  text-align: center;
+}
 </style>

src/HManagement/clueManage/m_activity/modules/add.vue

@@ -7,50 +7,9 @@
       size="800px"
       direction="rtl"
       append-to-body
-      @close="onClose"
       :show-close="false">
       <div class="drawer__panel">
-        <el-form :model="form" :rules="rules" ref="form" label-width="100px" size="small">
-          <el-form-item label="活动名称" prop="name">
-            <el-input v-model="form.name" placeholder="请输入活动名称" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="活动类型" prop="type">
-            <el-select v-model="form.type" placeholder="请选择类型" style="width:100%" clearable>
-              <el-option
-                v-for="item in campaigntypeList()"
-                :key="item.index"
-                :label="item.value"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="活动负责人" prop="director">
-            <selectLeader ref="leader" @selectLeader="selectLeader">
-              <el-input @focus="$refs.leader.dialogTableVisible=true" slot="input" type="text" size="small" v-model="form.director" placeholder="请选择活动负责人"></el-input>
-            </selectLeader>
-          </el-form-item>
-          <el-form-item label="地址" prop="address">
-            <el-input v-model="form.address" placeholder="请输入地址"></el-input>
-          </el-form-item>
-          <el-form-item label="开始日期" prop="begdate">
-            <el-date-picker
-              v-model="form.begdate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"
-              style="width:100%">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="结束日期" prop="enddate">
-            <el-date-picker
-              v-model="form.enddate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"
-              style="width:100%">
-            </el-date-picker>
-          </el-form-item>
-        </el-form>
+        <customForm ref="form" formname="addForms"></customForm>
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="drawer = false,$refs.form.resetFields()" class="normal-btn-width">取 消</el-button>
@@ -62,85 +21,23 @@
 
 <script>
 import selectLeader from './selectAgent/index'
+import customForm from '@/components/customForm/customForm'
 export default {
   inject:['campaigntypeList'],
-  components:{selectLeader},
+  components:{customForm},
   data () {
     return {
       drawer:false,
-      form:{
-        "sat_campaignid":0,
-        "name":"",
-        "director":"",
-        "address":"",
-        "type":"",
-        "begdate":"",
-        "enddate": ""
-      },
-      rules:{
-        name:[
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
-        ],
-        type:[
-          { required: true, message: '请选择活动类型', trigger: 'change' }
-        ],
-        begdate: [
-          { required: true, message: '请选择开始日期', trigger: 'change' }
-        ],
-        enddate: [
-          { validator:this.validateEndDate, trigger: 'change' }
-        ],
-      },
-      options:[]
     }
   },
   methods:{
     onShow () {
       this.drawer = true
     },
-    selectLeader (data) {
-      console.log(data);
-      this.form.director = data.name
-    },
-    validateEndDate(rule, value, callback){
-      let start = (new Date(this.form.begdate)).getTime()
-      let end = (new Date(this.form.enddate)).getTime()
-      if (value === '' || !value) {
-        this.form.enddate = ''
-        callback();
-      } else if (end < start) {
-         callback(new Error('结束日期不能小于开始日期'))
-      } else {
-        callback();
-      }
-    },
     add () {
-      this.$refs['form'].validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "classname":"webmanage.saletool.orderclue.ordercluecampaign",
-          "method": "insertormodify_campaign",
-          "content": this.form
-        })
-        this.tool.showMessage(res,()=>{
-          this.drawer = false
-          this.$refs.form.resetFields()
-          this.$emit('onSuccess')
-          this.$store.dispatch('changeDetailDrawer',true)
-          this.$router.push({path:'/marketing_activityDetails',query:{tabIndex:1,id:res.data.sat_campaignid,rowindex:res.data.rowindex}})
-        })
-      });
-    },
-    onClose () {
-      this.form = {
-        "sat_campaignid":0,
-        "name":"",
-        "director":"",
-        "address":"",
-        "type":"",
-        "begdate":"",
-        "enddate": ""
-      }
+      this.$refs.form.validateFields(()=>{
+        console.log(1)
+      })
     }
   }
 }

src/api/api.js

@@ -7,19 +7,19 @@ import http from './http'
 // let resquest = "https://www.buwanjia.com"
 // let resquest = "/apis"
 
-let resquest = process.env.NODE_ENV === 'production' ? '':'/apis'
+// let resquest = process.env.NODE_ENV === 'production' ? '':'/apis'
 export default {
     loginCode(params) {
-        return http.post(`${resquest}/yos/rest/index/getpassword`, params)
+        return http.post(`/yos/rest/index/getpassword`, params)
     },
     login(params) {
-        return http.post(`${resquest}/yos/rest/index/login`, params)
+        return http.post(`/yos/rest/index/login`, params)
     },
     loginbyaccount (params) {
-        return http.post(`${resquest}/yos/rest/index/loginbyaccount`, params)
+        return http.post(`/yos/rest/index/loginbyaccount`, params)
     },
     requested(params) {
-        return http.post(`${resquest}/yos/rest/index`, params)
+        return http.post(`/yos/rest/index`, params)
     },
     
 }

src/api/request.js

@@ -30,7 +30,7 @@ let source = CancelToken.source();
 //1. 创建新的axios实例，
 const service = axios.create({
     // 公共接口--这里注意后面会讲
-    baseURL:process.env.NODE_ENV === 'production' ? GET_API_URL():process.env.BASE_API,
+    baseURL:process.env.NODE_ENV === 'production' ? GET_API_URL():'/apis',
     // 超时时间 单位是ms，这里设置了3s的超时时间
     timeout: 20 * 1000
 })

src/components/customForm/customForm.vue

@@ -77,7 +77,7 @@ export default {
       this.$refs['form'].resetFields();
     },
     validateFields (fn) {
-      this.$refs[formName].validate((valid) => {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
           fn()
         } else {

src/utils/tool.js

@@ -54,7 +54,7 @@ export default {
   },
   /* 获取基本地址 */
   getBaseUrl () {
-    if (process.env.NODE_ENV == 'development') return 'https://oms.idcgroup.com.cn:8079'
+    // if (process.env.NODE_ENV == 'development') return 'https://oms.idcgroup.com.cn:8079'
     // if (process.env.NODE_ENV == 'development') return '/apis'
     let href = window.location.href
     let index = href.indexOf('/')

vue.config.js

@@ -14,11 +14,7 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8001',  // target host*/
-          // target: 'http://192.168.3.13:8080',  // target host*!
-          // target: 'http://192.168.3.9:8090',  // target host*!
-          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
-          // target: 'localhost:8080',  // target host
+          target: 'http://61.164.207.46:8000',
           ws: true,  // proxy websockets
           changeOrigin: true,  // needed for virtual hosted sites
           pathRewrite: {