Jelajahi Sumber

拉取yh代码

zhuxinbo 4 tahun lalu
induk
melakukan
500235aa5e

+ 2 - 0
debug.log

@@ -20,3 +20,5 @@
 [0716/000711.615:ERROR:exception_snapshot_win.cc(98)] thread ID 18896 not found in process
 [0716/000711.616:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
 [0716/000711.617:ERROR:exception_snapshot_win.cc(98)] thread ID 15368 not found in process
+[0727/154120.269:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
+[0727/173939.302:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0

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

@@ -74,6 +74,7 @@
     </div>
 
     <!-- table区域-begin -->
+    <!-- 供应商 -->
     <div>
       <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
         :pagination="ipagination" :loading="loading" @change="handleTableChange">

+ 33 - 3
src/views/modules/advertiser/modules/ProjectModal.vue

@@ -26,6 +26,19 @@
             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-select
+            optionFilterProp="children"
+            showSearch
+            :filterOption="filterOption"
+            v-decorator="['supplierCode', validatorRules.supplierCode]"
+          >
+            <a-select-option :value="item.supplierCode" v-for="(item, index) of supplierList" :key="index">{{
+              item.supplierName
+            }}</a-select-option>
+          </a-select>
+        </a-form-item>
+        
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="广告主名称">
           <a-select
             @change="handleChange"
@@ -152,6 +165,7 @@ export default {
         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 }] },
       },
@@ -163,10 +177,13 @@ export default {
       list: [],
       resId: '',
       shejiId: '',
-      options: []
+      options: [],
+      supplierList:[]
     }
   },
-  created() {},
+  created() {
+      this.getSupplierList()
+  },
   methods: {
     validateInputCode(rule, value, callback) {
       if (!value || value > 0) {
@@ -208,6 +225,16 @@ export default {
         })
         .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
@@ -215,7 +242,9 @@ export default {
       })
     },
     edit(record) {
+      this.getSupplierList()
       this.getList()
+      
       var params = { ...record }
       if (params.advertiserId) {
         params.advertiserId = { key: params.advertiserId, label: params.advertiserName }
@@ -240,7 +269,8 @@ export default {
             'userId',
             'designResponsibleId',
             'responsibleId',
-            'industryId'
+            'industryId',
+            'supplierCode'
             // 'advertiserType',
             // 'saleId'
           )

+ 1 - 1
src/views/modules/kuaishouapp/account/accountIndex.vue

@@ -513,7 +513,7 @@
         }
       },
       searchRe() {
-        this.campaignId = ''
+        this.campaignIdSearch = ''
         this.campaignName = ''
         this.searchLabel()
       },

+ 2 - 2
vue.config.js

@@ -57,12 +57,12 @@ module.exports = {
     proxy: {
       '/jeecg-boot': {
         // target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        // target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
+        target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.94:8804', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.51:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.165:8848', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
+        // target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://192.168.1.251:8088', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目