Sfoglia il codice sorgente

对外商业化调整

yumeng 4 anni fa
parent
commit
13ff78b017

+ 128 - 127
package.json

@@ -1,131 +1,132 @@
 {
-    "name": "ant-design-vue-jeecg",
-    "version": "2.0.2",
-    "private": true,
-    "scripts": {
-      "serve": "vue-cli-service serve --open",
-      "build": "vue-cli-service build",
-      "lint": "vue-cli-service lint",
-      "test:unit": "vue-cli-service test:unit",
-      "test:e2e": "vue-cli-service test:e2e"
+  "name": "ant-design-vue-jeecg",
+  "version": "2.0.2",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve --open",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint",
+    "test:unit": "vue-cli-service test:unit",
+    "test:e2e": "vue-cli-service test:e2e"
+  },
+  "dependencies": {
+    "@antv/data-set": "^0.10.2",
+    "@femessage/upload-to-ali": "^1.8.1",
+    "@jeecg/antd-online-beta220": "^1.0.1",
+    "@riophae/vue-treeselect": "^0.4.0",
+    "@tinymce/tinymce-vue": "^2.0.0",
+    "ali-oss": "^6.1.1",
+    "ant-design-vue": "^1.3.9",
+    "apexcharts": "^3.6.5",
+    "area-data": "^5.0.6",
+    "axios": "^0.18.0",
+    "babel-loader": "^8.0.6",
+    "blueimp-md5": "^2.11.0",
+    "browser-md5-file": "^1.1.1",
+    "clipboard": "^2.0.4",
+    "codemirror": "^5.46.0",
+    "cos-js-sdk-v5": "^0.5.26",
+    "dayjs": "^1.8.0",
+    "echarts": "^4.3.0",
+    "element-ui": "^2.13.0",
+    "enquire.js": "^2.1.6",
+    "html2canvas": "^1.0.0-rc.3",
+    "jquery": "^3.4.1",
+    "js-cookie": "^2.2.0",
+    "k-form-design": "^3.6.1",
+    "lodash.get": "^4.4.2",
+    "lodash.pick": "^4.4.0",
+    "mcanvas": "^1.3.9",
+    "md5": "^2.2.1",
+    "nprogress": "^0.2.0",
+    "promise.prototype.finally": "^3.1.1",
+    "tinymce": "^5.0.2",
+    "viser-vue": "^2.4.4",
+    "vue": "^2.6.10",
+    "vue-apexcharts": "^1.3.2",
+    "vue-class-component": "^6.0.0",
+    "vue-count-to": "^1.0.13",
+    "vue-cropper": "^0.4.8",
+    "vue-i18n": "^8.7.0",
+    "vue-layer": "^1.0.2",
+    "vue-loader": "^15.7.0",
+    "vue-ls": "^3.2.0",
+    "vue-oss-uploader": "^0.1.10",
+    "vue-photo-preview": "^1.1.3",
+    "vue-preview": "^1.1.3",
+    "vue-print-nb-jeecg": "^1.0.8",
+    "vue-property-decorator": "^7.3.0",
+    "vue-router": "^3.0.1",
+    "vue-splitpane": "^1.0.4",
+    "vue-video-player": "^5.0.2",
+    "vue-waterfall-easy": "^2.4.3",
+    "vuedraggable": "^2.20.0",
+    "vuex": "^3.0.1",
+    "vuex-class": "^0.3.1"
+  },
+  "devDependencies": {
+    "@babel/polyfill": "^7.2.5",
+    "@vue/cli-plugin-babel": "^3.3.0",
+    "@vue/cli-plugin-eslint": "^3.3.0",
+    "@vue/cli-service": "^3.3.0",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "babel-eslint": "^10.0.1",
+    "babel-plugin-component": "^1.1.1",
+    "eslint": "^5.16.0",
+    "eslint-plugin-vue": "^5.1.0",
+    "html-webpack-plugin": "^3.2.0",
+    "less": "^3.9.0",
+    "less-loader": "^4.1.0",
+    "node-sass": "^4.11.0",
+    "sass-loader": "^7.0.1",
+    "vue-template-compiler": "^2.6.10"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
     },
-    "dependencies": {
-      "@antv/data-set": "^0.10.2",
-      "@femessage/upload-to-ali": "^1.8.1",
-      "@riophae/vue-treeselect": "^0.4.0",
-      "@tinymce/tinymce-vue": "^2.0.0",
-      "ali-oss": "^6.1.1",
-      "ant-design-vue": "^1.3.9",
-      "apexcharts": "^3.6.5",
-      "axios": "^0.18.0",
-      "babel-loader": "^8.0.6",
-      "blueimp-md5": "^2.11.0",
-      "browser-md5-file": "^1.1.1",
-      "clipboard": "^2.0.4",
-      "codemirror": "^5.46.0",
-      "cos-js-sdk-v5": "^0.5.26",
-      "dayjs": "^1.8.0",
-      "echarts": "^4.3.0",
-      "element-ui": "^2.13.0",
-      "enquire.js": "^2.1.6",
-      "html2canvas": "^1.0.0-rc.3",
-      "iview": "2.0.0-rc.17",
-      "jquery": "^3.4.1",
-      "js-cookie": "^2.2.0",
-      "k-form-design": "^3.6.1",
-      "lodash.get": "^4.4.2",
-      "lodash.pick": "^4.4.0",
-      "mcanvas": "^1.3.9",
-      "md5": "^2.2.1",
-      "nprogress": "^0.2.0",
-      "promise.prototype.finally": "^3.1.1",
-      "tinymce": "^5.0.2",
-      "viser-vue": "^2.4.4",
-      "vue": "^2.6.10",
-      "vue-apexcharts": "^1.3.2",
-      "vue-class-component": "^6.0.0",
-      "vue-count-to": "^1.0.13",
-      "vue-cropper": "^0.4.8",
-      "vue-i18n": "^8.7.0",
-      "vue-layer": "^1.0.2",
-      "vue-loader": "^15.7.0",
-      "vue-ls": "^3.2.0",
-      "vue-oss-uploader": "^0.1.10",
-      "vue-photo-preview": "^1.1.3",
-      "vue-preview": "^1.1.3",
-      "vue-print-nb-jeecg": "^1.0.8",
-      "vue-property-decorator": "^7.3.0",
-      "vue-router": "^3.0.1",
-      "vue-splitpane": "^1.0.4",
-      "vue-video-player": "^5.0.2",
-      "vue-waterfall-easy": "^2.4.3",
-      "vuedraggable": "^2.20.0",
-      "vuex": "^3.0.1",
-      "vuex-class": "^0.3.1"
+    "extends": [
+      "plugin:vue/strongly-recommended",
+      "eslint:recommended"
+    ],
+    "parserOptions": {
+      "parser": "babel-eslint"
     },
-    "devDependencies": {
-      "@babel/polyfill": "^7.2.5",
-      "@vue/cli-plugin-babel": "^3.3.0",
-      "@vue/cli-plugin-eslint": "^3.3.0",
-      "@vue/cli-service": "^3.3.0",
-      "@vue/eslint-config-standard": "^4.0.0",
-      "babel-eslint": "^10.0.1",
-      "babel-plugin-component": "^1.1.1",
-      "eslint": "^5.16.0",
-      "eslint-plugin-vue": "^5.1.0",
-      "html-webpack-plugin": "^3.2.0",
-      "less": "^3.9.0",
-      "less-loader": "^4.1.0",
-      "node-sass": "^4.11.0",
-      "sass-loader": "^7.0.1",
-      "vue-template-compiler": "^2.6.10"
-    },
-    "eslintConfig": {
-      "root": true,
-      "env": {
-        "node": true
-      },
-      "extends": [
-        "plugin:vue/strongly-recommended",
-        "eslint:recommended"
-      ],
-      "parserOptions": {
-        "parser": "babel-eslint"
-      },
-      "rules": {
-        "generator-star-spacing": "off",
-        "no-mixed-operators": 0,
-        "vue/max-attributes-per-line": [
-          2,
-          {
-            "singleline": 5,
-            "multiline": {
-              "max": 1,
-              "allowFirstLine": false
-            }
+    "rules": {
+      "generator-star-spacing": "off",
+      "no-mixed-operators": 0,
+      "vue/max-attributes-per-line": [
+        2,
+        {
+          "singleline": 5,
+          "multiline": {
+            "max": 1,
+            "allowFirstLine": false
           }
-        ],
-        "vue/attribute-hyphenation": 0,
-        "vue/html-self-closing": 0,
-        "vue/component-name-in-template-casing": 0,
-        "vue/html-closing-bracket-spacing": 0,
-        "vue/singleline-html-element-content-newline": 0,
-        "vue/no-unused-components": 0,
-        "vue/multiline-html-element-content-newline": 0,
-        "vue/no-use-v-if-with-v-for": 0,
-        "vue/html-closing-bracket-newline": 0,
-        "vue/no-parsing-error": 0,
-        "no-console": 0
-      }
-    },
-    "postcss": {
-      "plugins": {
-        "autoprefixer": {}
-      }
-    },
-    "browserslist": [
-      "> 1%",
-      "last 2 versions",
-      "not ie <= 8"
-    ]
-  }
+        }
+      ],
+      "vue/attribute-hyphenation": 0,
+      "vue/html-self-closing": 0,
+      "vue/component-name-in-template-casing": 0,
+      "vue/html-closing-bracket-spacing": 0,
+      "vue/singleline-html-element-content-newline": 0,
+      "vue/no-unused-components": 0,
+      "vue/multiline-html-element-content-newline": 0,
+      "vue/no-use-v-if-with-v-for": 0,
+      "vue/html-closing-bracket-newline": 0,
+      "vue/no-parsing-error": 0,
+      "no-console": 0
+    }
+  },
+  "postcss": {
+    "plugins": {
+      "autoprefixer": {}
+    }
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
+}

+ 0 - 5
src/views/modules/advertiser/ProjectList.vue

@@ -153,11 +153,6 @@
             }
           },
           {
-            title: '供应商',
-            align: 'center',
-            dataIndex: 'supplierCode_dictText'
-          },
-          {
             title: '销售',
             align: 'center',
             dataIndex: 'saleId_dictText'

+ 2 - 2
src/views/modules/advertiser/modules/AdvertiserModal.vue

@@ -13,14 +13,14 @@
             dict="sys_category,name,id" pidField="pid" pidValue="f5cb2d2d28417b3b65a6dd744bcb9a76">
           </j-tree-select>
         </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户类型">
+        <!--<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户类型">
           <a-select v-decorator="['advertiserType',{ rules: [{ required: true, message: '请选择客户类型' }] }]" 
           @change="changeData">
             <a-select-option :value="1">自拓客户</a-select-option>
             <a-select-option :value="2">公司客户</a-select-option>
             <a-select-option :value="3">代理商</a-select-option>
           </a-select>
-        </a-form-item>
+        </a-form-item>-->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售"
           v-if="model.advertiserType==1||model.advertiserType==2">
           <a-select showSearch optionFilterProp="children" style="width: 100%" :filterOption="filterOption"

+ 234 - 222
src/views/modules/advertiser/modules/ProjectModal.vue

@@ -19,14 +19,14 @@
           </a-radio-group>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="项目名称">
-          <a-input placeholder="请输入项目名称" v-decorator="['projectName', validatorRules.projectName]" />
+          <a-input placeholder="请输入项目名称" v-decorator="['projectName', validatorRules.projectName]"/>
         </a-form-item>
-         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="行业">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="行业">
           <j-tree-select ref="treeSelect" placeholder="请选择行业" v-decorator="['industryId']"
-            dict="sys_category,name,id" pidField="pid" pidValue="f5cb2d2d28417b3b65a6dd744bcb9a76">
+                         dict="sys_category,name,id" pidField="pid" pidValue="f5cb2d2d28417b3b65a6dd744bcb9a76">
           </j-tree-select>
         </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商" v-if="model.mediaId=='2'||model.mediaId=='4'">
+        <!--<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商" v-if="model.mediaId=='2'||model.mediaId=='4'">
            <a-select
             optionFilterProp="children"
             showSearch
@@ -37,8 +37,8 @@
               item.supplierName
             }}</a-select-option>
           </a-select>
-        </a-form-item>
-        
+        </a-form-item>-->
+
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="广告主名称">
           <a-select
             @change="handleChange"
@@ -50,20 +50,22 @@
           >
             <a-select-option :value="item.id" v-for="(item, index) of list" :key="index">{{
               item.name
-            }}</a-select-option>
+              }}
+            </a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="最高出价">
-          <a-input placeholder="请输入最高出价" v-decorator="['maxBid', validatorRules.maxBid]" addonAfter="元" />
+          <a-input placeholder="请输入最高出价" v-decorator="['maxBid', validatorRules.maxBid]" addonAfter="元"/>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="最高转化出价">
-          <a-input placeholder="最高转化出价" v-decorator="['maxDeepCpaBid']" addonAfter="元" />
+          <a-input placeholder="最高转化出价" v-decorator="['maxDeepCpaBid']" addonAfter="元"/>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售">
           <a-select showSearch optionFilterProp="children" style="width: 100%" :filterOption="filterOption"
-            v-decorator="['saleId', { rules: [{  required: true,message: '请选择销售' }] }]">
+                    v-decorator="['saleId']">
             <a-select-option v-for="appModel in optionsElse" :key="appModel.userId + new Date().getTime()"
-              :value="appModel.userId">{{ appModel.realName }}&#12288;&#12288;{{ appModel.roleName }}</a-select-option>
+                             :value="appModel.userId">{{ appModel.realName }}&#12288;&#12288;{{ appModel.roleName }}
+            </a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="运营负责人">
@@ -81,7 +83,8 @@
               v-for="appModel in options"
               :key="appModel.userId + new Date().getTime()"
               :value="appModel.userId"
-              >{{ appModel.realName }}&#12288;&#12288;{{ appModel.roleName }}</a-select-option
+            >{{ appModel.realName }}&#12288;&#12288;{{ appModel.roleName }}
+            </a-select-option
             >
           </a-select>
         </a-form-item>
@@ -94,13 +97,14 @@
             @blur="handleBlur"
             @change="handleChange"
             :filterOption="filterOption"
-            v-decorator="['designResponsibleId', { rules: [{ required: true, message: '请选择运营负责人' }] }]"
+            v-decorator="['designResponsibleId']"
           >
             <a-select-option
-              v-for="appModel in options"
+              v-for="appModel in designs"
               :key="appModel.userId + new Date().getTime()"
               :value="appModel.userId"
-              >{{ appModel.realName }}&#12288;&#12288;{{ appModel.roleName }}</a-select-option
+            >{{ appModel.realName }}&#12288;&#12288;{{ appModel.roleName }}
+            </a-select-option
             >
           </a-select>
         </a-form-item>
@@ -110,229 +114,237 @@
 </template>
 
 <script>
-import { httpAction, getAction } from '@/api/manage'
-import pick from 'lodash.pick'
-import moment from 'moment'
-import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
-import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
-import JTreeSelect from '@/components/jeecg/JTreeSelect'
-import { mapGetters } from 'vuex'
-export default {
-  name: 'ProjectModal',
-  components: {
-    JSelectUserByDep,
-    JSelectDepart,
-    JTreeSelect
-  },
-  data() {
-    return {
-      title: '操作',
-      visible: false,
-      model: {},
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 }
+  import {getAction, httpAction} from '@/api/manage'
+  import pick from 'lodash.pick'
+  import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
+  import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
+  import JTreeSelect from '@/components/jeecg/JTreeSelect'
+  import {mapGetters} from 'vuex'
+
+  export default {
+    name: 'ProjectModal',
+    components: {
+      JSelectUserByDep,
+      JSelectDepart,
+      JTreeSelect
+    },
+    data() {
+      return {
+        title: '操作',
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: {span: 24},
+          sm: {span: 5}
+        },
+        wrapperCol: {
+          xs: {span: 24},
+          sm: {span: 16}
+        },
+        industryId: '',
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {
+          projectName: {rules: [{required: true, message: '请输入项目名称!'}]},
+          industryId: {rules: [{required: true, message: '请选择行业!'}]},
+          advertiserId: {rules: [{required: true, message: '请选择广告主!'}]},
+          responsibleName: {rules: [{required: true, message: '请选择负责人!'}]},
+          maxBid: {rules: [{required: true, message: '请输入最高出价!'}, {validator: this.validateInputCode}]},
+        },
+        url: {
+          add: '/ctop/project/add',
+          edit: '/ctop/project/edit',
+          getList: '/ctop/advertiser/list'
+        },
+        list: [],
+        resId: '',
+        shejiId: '',
+        options: [],
+        designs: [],
+        optionsElse: [],
+        supplierList: []
+      }
+    },
+    created() {
+      this.getSupplierList()
+    },
+    methods: {
+      validateInputCode(rule, value, callback) {
+        if (!value || value > 0) {
+          callback()
+        } else {
+          callback('请输入大于0的最高报价!')
+        }
       },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 }
+      ...mapGetters(['nickname', 'avatar', 'userInfo']),
+      onChange(e) {
+        console.log(`checked = ${e.target.value}`)
       },
-      industryId:'',
-      confirmLoading: false,
-      form: this.$form.createForm(this),
-      validatorRules: {
-        projectName: { rules: [{ required: true, message: '请输入项目名称!' }] },
-        industryId: { rules: [{ required: true, message: '请选择行业!' }] },
-        advertiserId: { rules: [{ required: true, message: '请选择广告主!' }] },
-        supplierCode:{ rules: [{ required: true, message: '请选择供应商!' }],initialValue:'kuaishou_001'},
-        responsibleName: { rules: [{ required: true, message: '请选择负责人!' }] },
-        maxBid: { rules: [{ required: true, message: '请输入最高出价!' }, { validator: this.validateInputCode }] },
+      handleChange() {
       },
-      url: {
-        add: '/ctop/project/add',
-        edit: '/ctop/project/edit',
-        getList: '/ctop/advertiser/list'
+      handleChange(value) {
+        console.log(`selected ${value}`)
       },
-      list: [],
-      resId: '',
-      shejiId: '',
-      options: [],
-      optionsElse:[],
-      supplierList:[]
-    }
-  },
-  created() {
-      this.getSupplierList()
-  },
-  methods: {
-    validateInputCode(rule, value, callback) {
-      if (!value || value > 0) {
-        callback()
-      } else {
-        callback('请输入大于0的最高报价!')
-      }
-    },
-    ...mapGetters(['nickname', 'avatar', 'userInfo']),
-    onChange(e) {
-      console.log(`checked = ${e.target.value}`)
-    },
-    handleChange() {},
-    handleChange(value) {
-      console.log(`selected ${value}`)
-    },
-    handleBlur() {
-      console.log('blur')
-    },
-    handleFocus() {
-      console.log('focus')
-    },
-    filterOption(input, option) {
-      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-    },
-    getList() {
-      var params = {}
-      params.userId = this.userInfo().id
-      console.log(params)
-      getAction(this.url.getList, { userId: this.userInfo().id })
-        .then(res => {
+      handleBlur() {
+        console.log('blur')
+      },
+      handleFocus() {
+        console.log('focus')
+      },
+      filterOption(input, option) {
+        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
+      getList() {
+        var params = {}
+        params.userId = this.userInfo().id
+        console.log(params)
+        getAction(this.url.getList, {userId: this.userInfo().id})
+          .then(res => {
+            if (res.success) {
+              console.log(res)
+              this.list = res.result.records
+
+            } else {
+              this.$message.warning(res.message)
+            }
+          })
+          .finally(() => {
+          })
+      },
+      getSupplierList() {
+        var params = {}
+        getAction('/ctop/supplierList/list').then(res => {
           if (res.success) {
-            console.log(res)
-            this.list = res.result.records
-            
+            this.supplierList = res.result.records
           } else {
             this.$message.warning(res.message)
           }
         })
-        .finally(() => {})
-    },
-    getSupplierList(){
-        var params = {}
-        getAction('/ctop/supplierList/list').then(res=>{
-            if(res.success){
-                this.supplierList = res.result.records
-            } else {
-                this.$message.warning(res.message)
-            }
+      },
+      add() {
+        this.edit({
+          responsibleId: this.userInfo().id, //用户Id
+          mediaId: '2'
         })
-    },
-    add() {
-      this.edit({
-        responsibleId: this.userInfo().id, //用户Id
-        mediaId: '2'
-      })
-    },
-    edit(record) {
-      this.getSupplierList()
-      this.getList()
-      
-      var params = { ...record }
-      if (params.advertiserId) {
-        params.advertiserId = { key: params.advertiserId, label: params.advertiserName }
-      }
-    //   if (params.industryId) {
-    //     params.industryId = { key: params.industryId, label: params.industryId_dictText }
-    //   }
-      console.log(record)
-      this.form.resetFields()
-      this.model = Object.assign({}, params)
-      this.model.maxBid = this.model.maxBid ? this.model.maxBid / 1000 : 0
-      this.model.maxDeepCpaBid = this.model.maxDeepCpaBid ? this.model.maxDeepCpaBid / 1000 : 0
-      this.visible = true
-      this.$nextTick(() => {
-        console.log(this.model)
-        this.form.setFieldsValue(
-          pick(
-            this.model,
-            'projectName',
-            'industryId',
-            'advertiserId',
-            'responsibleName',
-            'maxBid',
-            'maxDeepCpaBid',
-            'userId',
-            'designResponsibleId',
-            'responsibleId',
-            'industryCode',
-            'supplierCode',
-            // 'advertiserType',
-            'saleId'
+      },
+      edit(record) {
+        this.getSupplierList()
+        this.getList()
+
+        var params = {...record}
+        if (params.advertiserId) {
+          params.advertiserId = {key: params.advertiserId, label: params.advertiserName}
+        }
+        //   if (params.industryId) {
+        //     params.industryId = { key: params.industryId, label: params.industryId_dictText }
+        //   }
+        console.log(record)
+        this.form.resetFields()
+        this.model = Object.assign({}, params)
+        this.model.maxBid = this.model.maxBid ? this.model.maxBid / 1000 : 0
+        this.model.maxDeepCpaBid = this.model.maxDeepCpaBid ? this.model.maxDeepCpaBid / 1000 : 0
+        this.visible = true
+        this.$nextTick(() => {
+          console.log(this.model)
+          this.form.setFieldsValue(
+            pick(
+              this.model,
+              'projectName',
+              'industryId',
+              'advertiserId',
+              'responsibleName',
+              'maxBid',
+              'maxDeepCpaBid',
+              'userId',
+              'designResponsibleId',
+              'responsibleId',
+              'industryCode',
+              'supplierCode',
+              // 'advertiserType',
+              'saleId'
+            )
           )
-        )
-        // this.resId = record.responsibleId
-        // this.shejiId = record.designResponsibleId
-        getAction('/sys/user/getAllUserList', '').then(res => {
-          console.log(res)
-          if (res.success) {
-            this.options = res.result
-          }
+          // this.resId = record.responsibleId
+          // this.shejiId = record.designResponsibleId
+          getAction('/sys/user/getUserByRoleCode', {roleCode: 'operator'}).then(res => {
+            console.log(res)
+            if (res.success) {
+              this.options = res.result
+            }
+          })
+          getAction('/sys/user/getUserByRoleCode', {roleCode: 'design'}).then(res => {
+            console.log(res)
+            if (res.success) {
+              this.designs = res.result
+            }
+          })
+          getAction('/sys/user/getAllSaleList', '').then(res => {
+            console.log(res)
+            if (res.success) {
+              this.optionsElse = res.result
+            }
+          })
+          //时间格式化
         })
-         getAction('/sys/user/getAllSaleList', '').then(res => {
-          console.log(res)
-          if (res.success) {
-            this.optionsElse = res.result
+      },
+      close() {
+        this.$emit('close')
+        this.visible = false
+      },
+      handleOk() {
+        const that = this
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true
+            let httpurl = ''
+            let method = ''
+            if (!this.model.id) {
+              httpurl += this.url.add
+              method = 'post'
+            } else {
+              httpurl += this.url.edit
+              method = 'put'
+            }
+            var data = values.advertiserId
+            let formData = Object.assign(this.model, values)
+            //   if(this.model.mediaId)
+            formData.maxBid = formData.maxBid * 1000
+            formData.maxDeepCpaBid = formData.maxDeepCpaBid * 1000
+            //时间格式化
+            formData.advertiserId = data.key
+            formData.advertiserName = data.label
+            formData.responsibleId = values.responsibleId
+            formData.designResponsibleId = values.designResponsibleId
+            formData.userId = formData.userId ? formData.userId : that.userInfo().id
+            httpAction(httpurl, formData, method)
+              .then(res => {
+                if (res.success) {
+                  that.$message.success(res.message)
+                  that.$emit('ok')
+                } else {
+                  that.$message.warning(res.message)
+                }
+              })
+              .finally(() => {
+                that.confirmLoading = false
+                that.close()
+              })
           }
         })
-        //时间格式化
-      })
-    },
-    close() {
-      this.$emit('close')
-      this.visible = false
-    },
-    handleOk() {
-      const that = this
-      // 触发表单验证
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          that.confirmLoading = true
-          let httpurl = ''
-          let method = ''
-          if (!this.model.id) {
-            httpurl += this.url.add
-            method = 'post'
-          } else {
-            httpurl += this.url.edit
-            method = 'put'
-          }
-          var data = values.advertiserId
-          let formData = Object.assign(this.model, values)
-        //   if(this.model.mediaId)
-          formData.maxBid = formData.maxBid * 1000
-          formData.maxDeepCpaBid = formData.maxDeepCpaBid*1000
-          //时间格式化
-          formData.advertiserId = data.key
-          formData.advertiserName = data.label
-          formData.responsibleId = values.responsibleId
-          formData.designResponsibleId = values.designResponsibleId
-          formData.userId = formData.userId ? formData.userId : that.userInfo().id
-          httpAction(httpurl, formData, method)
-            .then(res => {
-              if (res.success) {
-                that.$message.success(res.message)
-                that.$emit('ok')
-              } else {
-                that.$message.warning(res.message)
-              }
-            })
-            .finally(() => {
-              that.confirmLoading = false
-              that.close()
-            })
-        }
-      })
-    },
-    handleCancel() {
-      this.close()
-    },
-    getFormFieldValue(field) {
-      return this.form.getFieldValue(field)
-    },
-    get(valueName, key) {
-      console.log(valueName, key)
-      this.resId = key
+      },
+      handleCancel() {
+        this.close()
+      },
+      getFormFieldValue(field) {
+        return this.form.getFieldValue(field)
+      },
+      get(valueName, key) {
+        console.log(valueName, key)
+        this.resId = key
+      }
     }
   }
-}
 </script>
 
 <style lang="less" scoped></style>

+ 0 - 2
src/views/modules/material/videoMaterial.vue

@@ -846,7 +846,6 @@
             <a-select
               v-decorator="[
                 'planId', // 给表单赋值或拉取表单时,该input对应的key
-                { rules: [{ required: true, message: '请选择策划!' }] }
               ]"
               showSearch
               optionFilterProp="children"
@@ -875,7 +874,6 @@
             <a-select
               v-decorator="[
                 'clipId', // 给表单赋值或拉取表单时,该input对应的key
-                { rules: [{ required: true, message: '请选择剪辑!' }] }
               ]"
               showSearch
               optionFilterProp="children"