Procházet zdrojové kódy

财务功能结束

朱鑫波 před 2 roky
rodič
revize
b23093ab92

+ 2 - 2
.env.development

@@ -14,12 +14,12 @@ VUE_APP_BASE_SCRIPT_URL = http://192.168.0.195:31013
 
 
 #素材大盘相关接口
-VUE_APP_BASE_MATERIAL_URL = http://api.tjyourong.com.cn/material
+VUE_APP_BASE_MATERIAL_URL = http://192.168.0.195:9999/material
 # 字安接口 http://192.168.1.43:9999
 # 测试环境 http://192.168.0.195:9999
 # 西安环境 http://192.168.1.59:7006
 
 #盯盘相关接口
-VUE_APP_BASE_STARE_URL =  http://api.tjyourong.com.cn/material
+VUE_APP_BASE_STARE_URL =  http://192.168.0.195:9999/material
 # 字安接口 http://192.168.1.43:9999
 # 测试环境 http://192.168.0.195:9999

+ 3 - 2
src/api/manage.js

@@ -122,15 +122,16 @@ export function putAction(url, parameter) {
  * @param parameter
  * @returns {*}
  */
-export function downFilePost(url, parameter) {
+export function downFilePost(url, parameter, type) {
   return axios({
     url: url,
     data: parameter,
-    method: 'post',
+    method: type || 'post',
     responseType: 'blob'
   })
 }
 
+
 export function getServiceList(parameter) {
   return axios({
     url: api.service,

+ 4 - 4
src/components/uploadFile.vue

@@ -12,7 +12,7 @@
       action="https://media-1301855440.cos.ap-chongqing.myqcloud.com/"
       :before-upload="beforeUpload"
       @change="handleChange"
-      :accept="uploadType == 'script'?'.doc,.txt,.pdf,.xlsx':uploadType + '/' + (uploadType == 'image' ? 'jpeg,image/jpg' : 'mp4')"
+      :accept="uploadType == 'script'?'.doc,.txt,.pdf,.xlsx':uploadType + '/' + (uploadType == 'image' ? 'jpeg,image/png' : 'mp4')"
       :file-list="fileList"
       :remove="removeFile"
       @preview="handlePreview"
@@ -24,7 +24,7 @@
       </div>
     </a-upload>
     <div style="color: red" v-if="sizeCheck">
-      {{ uploadType == 'image' ? '请上传jpg格式的图片,并且大小在2m之内' : uploadType == 'video'?'请上传mp4格式,大小在'+(size/1024)+'m之内':'' }}
+      {{ uploadType == 'image' ? '请上传jpg,jpeg,png格式的图片,并且大小在'+(size/1024)+'m之内' : uploadType == 'video'?'请上传mp4格式,大小在'+(size/1024)+'m之内':'' }}
     </div>
     <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
       <img alt="example" style="width: 100%" :src="previewImage" v-if="uploadType == 'image'" />
@@ -105,13 +105,13 @@ export default {
     size: {
       type: Number,
       default() {
-        if (this.sizeCheck) {
+
           if (this.uploadType == 'image') {
             return 2048
           } else {
             return 102400
           }
-        }
+        
       },
     },
     sizeCheck: {

+ 39 - 0
src/filters.js

@@ -126,6 +126,45 @@ const filters = {
         }
         return result;
     },
+    auditRechargeName(sta) {
+        var data = {
+            null: '-',
+            1: '待审核',
+            2: '待充值',
+            3: '充值完成',
+            4: '临时充值',
+            5: '审核拒绝',
+        }
+        return data[sta]
+    },
+    auditStatusName(sta) {
+        var data = {
+            null: '-',
+            1: '待审核',
+            3: '审核通过',
+            4: '临时通过',
+            5: '审核拒绝',
+        }
+        return data[sta]
+    },
+    paymentMediaName(sta) {
+        var data = {
+            null: '-',
+            1: '头条',
+            2: '快手',
+            7: '磁力金牛',
+            9: '广点通',
+        }
+        return data[sta]
+    },
+    paymentTypeName(sta) {
+        var data = {
+            null: '-',
+            1: '预付款',
+            2: '垫款',
+        }
+        return data[sta]
+    },
     //bidType类型
     bidType(sta) {
         var data = {

+ 30 - 0
src/main.js

@@ -122,6 +122,36 @@ Vue.prototype.cancel = function () {
     delete window.axiosCancel[index]
   })
 }
+
+Vue.prototype.allMoney = function (num, n) {
+  n = n || 2;
+  let symbol = ",";
+  if (num === null) return num;
+  if (typeof num !== "number")
+    throw new TypeError("num参数应该是一个number类型");
+  if (n < 0) throw new Error("参数n不应该小于0");
+  let hasDot = parseInt(num) != num; //这里检测num是否为小数,true表示小数
+  let m = n != undefined && n != null ? n : 1;
+  num =
+    m == 0
+      ? num.toFixed(m) + "."
+      : hasDot
+        ? n
+          ? num.toFixed(n)
+          : num
+        : num.toFixed(m);
+  symbol = symbol || ",";
+  num = num
+    .toString()
+    .replace(/(\d)(?=(\d{3})+\.)/g, function (match, p1, p2) {
+      return p1 + symbol;
+    });
+  if (n == 0 || (!hasDot && !n)) {
+    //如果n为0或者传入的num是整数并且没有指定整数的保留位数,则去掉前面操作中的小数位
+    num = num.substring(0, num.indexOf("."));
+  }
+  return num;
+}
 new Vue({
   router,
   store,

+ 32 - 0
src/views/dashboard/onlyOneDashboard.vue

@@ -633,6 +633,14 @@ const ttaColumns = [
         scopedSlots: { customRender: 'newUnitNum' },
         sorter: () => {},
     },
+    {
+        title: '项目基建数',
+        dataIndex: 'projectNum',
+        align: 'center',
+        scopedSlots: { customRender: 'projectNum' },
+        sorter: () => {},
+    },
+    
 ]
 const ttbColumns = [
     {
@@ -778,6 +786,18 @@ export default {
                     dataIndex: 'newUnitNum',
                     align: 'center',
                 },
+                {
+                    title: '项目基建数',
+                    dataIndex: 'projectNum',
+                    align: 'center',
+                    customRender:function(t){
+                        if(t){
+                            return t
+                        }else{
+                            return '-'
+                        }
+                    }
+                },
             ],
             operateDetailLoading: false,
 
@@ -834,6 +854,18 @@ export default {
                     title: '基建数量',
                     dataIndex: 'unitNum',
                     align: 'center',
+                },                
+                {
+                    title: '项目基建数',
+                    dataIndex: 'projectNum',
+                    align: 'center',
+                    customRender:function(t){
+                        if(t){
+                            return t
+                        }else{
+                            return '-'
+                        }
+                    }
                 },
             ],
             operateGroupLoading: false,

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 26 - 196
src/views/modules/Statistics/saleStatistics/index.vue


+ 1 - 1
src/views/modules/creative-copywrit/creative-copywrit.vue

@@ -1022,7 +1022,7 @@
                                 {{ `${tag.slice(0, 20)}...`}}
                             </a-tag>
                         </a-tooltip>
-                        <a-tag v-else :key="tag" :closable="true" :afterClose="() => handleClose(tag)">{{ tag }}</a-tag>
+                        <a-tag v-else :key="index" :closable="true" :afterClose="() => handleClose(tag)">{{ tag }}</a-tag>
                     </template>
                     <a-input
                         v-if="inputVisible"

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2161 - 1625
src/views/modules/material/videoMaterial.vue


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1831 - 0
src/views/modules/policy-management/appPoolList.vue


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1849 - 0
src/views/modules/policy-management/appRecharge.vue


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1679 - 0
src/views/modules/policy-management/applicationLog.vue


+ 2 - 2
src/views/modules/policy-management/policy-management-server.js

@@ -6,6 +6,6 @@
  export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 //  export const urlAcount = 'http://192.168.1.43:9999'; // 子安
-//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
-//  export const urlAcount = 'http://192.168.0.195:9999'; // 学超
+//  export const urlAcount = 'http://192.168.0.195:9999'; // 测试
+//  export const urlAcount = 'http://192.168.1.181:7005'; //  西安
  

+ 1 - 1
src/views/modules/policy-management/policy-management.less

@@ -1,6 +1,6 @@
 .policy-management-content {
     background: #fff;
-    height: calc(100vh - 137px);
+    min-height: calc(100vh - 137px);
     padding: 20px;
     overflow-y: auto;
     .line-table-width {

+ 7 - 0
src/views/modules/policy-management/policy-management.vue

@@ -1219,6 +1219,13 @@ export default {
                     width: 220,
                     scopedSlots: {customRender: 'policyStartDate'}
                 },
+                {
+                    title: '创建日期',
+                    align: 'center',
+                    dataIndex: 'createTime',
+                    width: 200,
+                    scopedSlots: {customRender: 'createTime'}
+                },
                 
                 {
                     title: '法务审核内容',

+ 1 - 0
src/views/modules/policy-management/reimbursementAdd.vue

@@ -639,6 +639,7 @@
                                 :multiple="true"
                                 @overUpload="overUpload"
                                 :fileCount="10"
+                                :size="10240"
                                 uploadType="image"
                             />
                         </a-form-model-item>

+ 3 - 12
vue.config.js

@@ -95,17 +95,8 @@ module.exports = {
     open: true,
     proxy: {
       '/jeecg-boot': {
-        // target: 'http://192.168.1.72:7001', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        // target: 'http://192.168.1.3:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        // target: 'http://192.168.1.3:7001', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
-        // target: 'http://192.168.1.62:7001', //请求本地 需要jeecg-boot后台项目  英豪
-        // target: 'http://192.168.6.162:9806', //请求本地 需要jeecg-boot后台项目  祚云
-        // target: 'http://192.168.1.43:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://192.168.1.43:8806', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://192.168.1.143:7001', //请求本地 需要jeecg-boot后台项目  赵西安
+        // target: 'http://192.168.1.22:7001', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        // target: 'http://192.168.1.181:7001', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
         // target: 'http://192.168.1.193:31012', //请求本地 需要jeecg-boot后台项目  李煜一
         target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
@@ -116,7 +107,7 @@ module.exports = {
         // target:'http://118.24.244.213:8804',
         // target: 'http://192.168.1.43:9999', // 子安
         // target: 'http://192.168.1.8:9999', // 学超
-        // target:'http://192.168.0.195:9999/',//测试
+        // target:'http://192.168.0.195:9999',//测试
 
 
         ws: false,