朱鑫波 2 rokov pred
rodič
commit
45d395302a

+ 1 - 0
package.json

@@ -57,6 +57,7 @@
     "vue-oss-uploader": "^0.1.10",
     "vue-photo-preview": "^1.1.3",
     "vue-preview": "^1.1.3",
+    "vue-print-nb": "^1.7.5",
     "vue-print-nb-jeecg": "^1.0.8",
     "vue-property-decorator": "^7.3.0",
     "vue-router": "^3.0.1",

+ 2 - 2
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':uploadType + '/' + (uploadType == 'image' ? 'jpeg,image/jpg' : 'mp4')"
+      :accept="uploadType == 'script'?'.doc,.txt,.pdf,.xlsx':uploadType + '/' + (uploadType == 'image' ? 'jpeg,image/jpg' : 'mp4')"
       :file-list="fileList"
       :remove="removeFile"
       @preview="handlePreview"
@@ -29,7 +29,7 @@
     <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
       <img alt="example" style="width: 100%" :src="previewImage" v-if="uploadType == 'image'" />
       <video :src="previewImage" v-else-if="uploadType == 'video'" style="width: 100%" controls="controls">您的浏览器不支持 video 标签。</video>
-      <iframe id="iframeData" v-show="uploadType == 'script'" style="width: 100%; height: 500px" :src="previewImage"></iframe>
+      <iframe id="iframeData" v-show="uploadType == 'script'" style="width: 100%; height: 500px" :src="previewImage+'?page=hsn#toolbar=0'"></iframe>
     </a-modal>
   </div>
 </template>

+ 2 - 1
src/filters.js

@@ -386,7 +386,8 @@ const filters = {
             7: '信息流广告',
             5: "联盟广告",
             24: '激励视频广告',
-            10: '联盟场景'
+            10: '联盟场景',
+            27: '开屏广告'
         }
 
         return data[val]

+ 4 - 1
src/main.js

@@ -19,7 +19,7 @@ import {
   postFormAction,
   postAction
 } from "@/api/manage"
-import Print from 'vue-print-nb-jeecg'
+// import Print from 'vue-print-nb-jeecg'
 /*import '@babel/polyfill'*/
 import VueApexCharts from 'vue-apexcharts'
 import preview from 'vue-photo-preview'
@@ -34,6 +34,9 @@ Vue.use(directive)
 Vue.use(filters)
 import md5 from 'blueimp-md5';
 
+import Print from 'vue-print-nb';
+// Vue.use(print)
+
 // // import KFormDesign from 'k-form-design'
 // import KFormDesign from 'k-form-design/lib/k-form-design-mini.umd.min'
 // import 'k-form-design/styles/k-form-design.less'

+ 1 - 1
src/mixins/videoMaterialMixin.js

@@ -25,7 +25,7 @@
        ipagination: {
          current: 1,
          pageSize: 10,
-         pageSizeOptions: ['8', '16', '32'],
+         pageSizeOptions: ['8', '16', '32','64','100'],
          showTotal: (total, range) => {
            return range[0] + "-" + range[1] + " 共" + total + "条"
          },

+ 1 - 0
src/store/modules/user.js

@@ -256,6 +256,7 @@ const user = {
     },
     //企业微信登录
     wxLogin({commit}, userInfos) {
+        userInfos.result.userInfo.departId = userInfos.result.departs[0].id
         const result = userInfos.result
         const userInfo = result.userInfo
         Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)

+ 2 - 2
src/utils/request.js

@@ -21,9 +21,9 @@ else if (process.env.NODE_ENV === 'debug') {
 else if (process.env.NODE_ENV === 'production') {
 	// axios.defaults.baseURL = 'http://apipre.tjyourong.com.cn/jeecg-boot'; // 预生产
 	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot';//测试
-	// axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
+	axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
 	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot'; // 测试环境
-	axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
+	// axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
 	// axios.defaults.baseURL = 'http://192.168.1.134:9999/jeecg-boot'; // 泽宇环境
 
 }

+ 1 - 1
src/views/dashboard/Analysis.vue

@@ -225,7 +225,7 @@
     methods: {
       ...mapGetters(['userInfo']),
       getUserId(){
-        if (this.userInfo().id == '4aba62011120ac565c7f2b9f8f4aa96b' || this.userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae' || this.userInfo().id == 'db2d59e9b4a3b18629c838fd7f5b58d8') {
+        if (this.userInfo().id == '4aba62011120ac565c7f2b9f8f4aa96b' || this.userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae' || this.userInfo().id == 'db2d59e9b4a3b18629c838fd7f5b58d8'|| this.userInfo().id == '00d630a129e4487cba5427788a1f08ce') {
           this.userInfoId = true;
         }else{
           this.userInfoId = false;

+ 1 - 1
src/views/modules/attendanceRecords/attendanceRecordsList.vue

@@ -429,7 +429,7 @@ export default {
 
          //导出报表
         exportExcel() {          
-            downFilePost('/oa/wechatNoList/excel', {
+            downFile('/oa/wechatNoList/excel', {
                 userName:this.userName,
                 departId:this.departId,
                 startTime:this.dateValue[0].format('YYYY-MM-DD'),

+ 10 - 4
src/views/modules/kuaishouapp/account/stepForm/stepModule/targetedPopulation.vue

@@ -113,7 +113,7 @@ li:hover {
             @focus="
               topMiddleNo = true
               topMiddle = false
-              dataList = dataElse
+              dataPcList = dataPcElse
             "
             v-model="keyValueNo"
             @change="showTwo"
@@ -127,7 +127,7 @@ li:hover {
         >
           <a-table
             :columns="columns"
-            :dataSource="dataList"
+            :dataSource="dataPcList"
             bordered
             :pagination="false"
             :scroll="{ y: 300, x: true }"
@@ -975,7 +975,9 @@ export default {
       selectedRowKeysNo: [],
       selectedRowKeysValueNo: [],
       dataList: [],
+      dataPcList:[],
       dataElse: [],
+      dataPcElse:[]
     }
   },
   computed: {},
@@ -991,13 +993,17 @@ export default {
         getAction('/kuaishou/batch/getPopulationList', { accountId: data }).then((res) => {
           if (res.success) {
             if (res.result) {
-              this.dataList = res.result.map((item, index) => {
+              this.dataList = res.result.filter((item, index) => {
+                return item.populationType != 6
+              })
+               this.dataPcList = res.result.map((item, index) => {
                 return {
                   ...item,
                   key: index,
                 }
               })
               this.dataElse = this.dataList
+              this.dataPcElse = this.dataPcList
               resolve(res.result)
             }
           }
@@ -1062,7 +1068,7 @@ export default {
     showTwo() {
       //    this.keyValueNo =orientationName
       var data = this.keyValueNo.split('   ')
-      this.dataList = this.dataElse.filter((item) => {
+      this.dataPcList = this.dataPcElse.filter((item) => {
         return item.orientationName.toLowerCase().indexOf(data[data.length - 1].toLowerCase()) > -1
       })
     },

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 698 - 48
src/views/modules/kuaishouapp/newBatch/index.vue


+ 71 - 11
src/views/modules/kuaishouapp/newBatch/lookPreview.vue

@@ -178,7 +178,7 @@ li.chouzhen.first:before {
                     >广告计划:{{ item.campaignName }}</span
                   >
                   <span style="width: 20%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                    >营销目标:{{ item.campaignType == 2 ? '提升应用安装' : '收集销售线索' }}</span
+                    >营销目标:{{ item.campaignType == 2 ? '提升应用安装' : item.campaignType == 5?'收集销售线索' :'提高应用活跃'}}</span
                   >
                   <span style="width: 10%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
                     >预算:{{ item.dayBudget ? item.dayBudget / 1000 + '元' : '不限' }}</span
@@ -218,7 +218,7 @@ li.chouzhen.first:before {
                 </span>
                 <span slot="materialArr" slot-scope="text, records">
                   <p style="color: #409EFF; cursor: pointer" @click="lookVideo(text)">
-                    已选{{ text ? text.length : 0 }}个视频素材
+                    已选{{ text ? text.length : 0 }}个素材
                   </p>
                 </span>
                 <span slot="dayBudget" slot-scope="text, records">
@@ -410,7 +410,7 @@ li.chouzhen.first:before {
         <a-carousel arrows class="cover_carousel_con" v-if="videoData.length > 0" @next="next" @prev="prev">
           <div v-for="(item, index) in videoData" :key="index" class="content">
             <div style="display: flex !important; justify-content: space-around">
-              <div style="display: flex; flex-direction: column; align-items: center">
+              <div style="display: flex; flex-direction: column; align-items: center" v-if="!!item.videoUrl.url">
                 <!-- <video :src="item.videoUrl.coverUrl" :width="300" /> -->
                 <video class="video" :src="item.videoUrl.url" controls="controls" style="width: 300px">
                   您的浏览器不支持 video 标签。
@@ -1019,16 +1019,76 @@ export default {
       })
     },
     lookVideo(item) {
-      this.videoData = []
-      for (let i = 0; i < item.length; i++) {
-        this.setVideUrl(item[i].photoId).then((res) => {
-          item[i].videoUrl = res
-          this.videoData.push(item[i])
-          if (this.videoData.length == item.length) {
-            this.coverPreviewVisible = true
+      if(!!item[0].photoId){
+        this.videoData = []
+        for (let i = 0; i < item.length; i++) {
+          this.setVideUrl(item[i].photoId).then((res) => {
+            item[i].videoUrl = res
+            this.videoData.push(item[i])
+            if (this.videoData.length == item.length) {
+              this.coverPreviewVisible = true
+            }
+          })
+        }
+      }else if(!!item[0].imageTokens){
+        var num = 1
+        for (let i = 0; i < item.length; i++) {
+          this.setImageUrl(item[i].imageTokens).then((res) => {
+            item[i].videoUrl = ''
+            this.videoData.push(...res)
+            num++
+            if (this.videoData.length == item.length*6) {
+              this.coverPreviewVisible = true
+            }
+          })
+        }
+      }else if(!!item[0].photoIds){
+        this.videoData = []
+        for (let i = 0; i < item.length; i++) {
+         
+            this.setManyVideoUrl(item[i].photoIds).then((res) => {
+              // item[i].videoUrl = res
+              this.videoData.push(...res)
+              if (this.videoData.length == item.length*4) {
+                this.coverPreviewVisible = true
+              }
+            })
+        }
+      }
+      
+    },
+    setManyVideoUrl(photoId){
+      
+      return new Promise((resolve, reject) => {
+        this.postDataAction('/batch/kuaiShouGroupTemplate/getUrlByPhotoIds', { photoIds: JSON.parse(photoId),accountId: this.accountId}).then((res) => {
+          if (res.success) {
+            resolve(res.result.map(item=>{
+              return {
+                imageUrl:item.coverUrl,
+                videoUrl:{
+                  url:item.url
+                }
+              }
+            }))
           }
         })
-      }
+      })
+    },
+    setImageUrl(photoId){
+      return new Promise((resolve, reject) => {
+        this.postDataAction('/batch/kuaiShouGroupTemplate/queryUrlByImageTokens', { imageTokens: photoId,accountId: this.accountId}).then((res) => {
+          if (res.success) {
+            resolve(res.result.map(item=>{
+              return {
+                imageUrl:item.url,
+                videoUrl:{
+                  url:''
+                }
+              }
+            }))
+          }
+        })
+      })
     },
     setVideUrl(photoId) {
       this.videoList = []

+ 172 - 0
src/views/modules/kuaishouapp/newBatch/upload.vue

@@ -0,0 +1,172 @@
+<template>
+    <div class="upload-file">
+        <el-upload
+            :action="action"
+            :before-upload="handleBeforeUpload"
+            :file-list="fileList"
+            :drag="drag"
+            :limit="count"
+            :multiple="count > 1 ? true : false"
+            :on-remove="handleDelete"
+            :accept="accept"
+            :on-error="handleUploadError"
+            :on-exceed="handleExceed"
+            :on-success="handleUploadSuccess"
+            :on-change="handChange"
+            :show-file-list="true"
+            :auto-upload="false"
+            class="upload-file-uploader"
+            ref="upload"
+            list-type="picture-card"
+        >
+            <i class="el-icon-plus"></i>
+            <!-- <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
+            <div class="el-upload__tip" style="margin-top: 0">只能上传.jpg,.jpeg,.png文件</div> -->
+        </el-upload>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'upload-file',
+    components: {},
+    props: {
+        // 值
+        value: [String, Object, Array],
+        // 大小限制(MB)
+        fileSize: {
+            type: Number,
+            default: 2,
+        },
+        count: {
+            type: Number,
+            default: 4,
+        },
+        // 文件类型, 例如['png', 'jpg', 'jpeg']
+        fileType: {
+            type: Array,
+            default: () => [
+                '.jpg',
+                '.jpeg',
+                '.png',
+                // ".doc",
+                // '.xls',
+                // '.xlsx',
+                // ".ppt",
+                // ".txt",
+                // ".pdf",
+                // '.csv',
+            ],
+        },
+        // 是否显示提示
+        isShowTip: {
+            type: Boolean,
+            default: true,
+        },
+    },
+    data() {
+        return {
+            drag: true,
+            // 已选择文件列表
+            fileList: [],
+            // 是否显示文件上传弹窗
+            visible: false,
+            // 可上传的文件类型
+            accept: '',
+            action: 'action',
+        }
+    },
+    filters: {},
+    computed: {},
+    mounted() {},
+    watch: {},
+    created() {
+        // 拼接
+        this.fileType.forEach((el) => {
+            this.accept += el
+            this.accept += ','
+        })
+        this.fileType.slice(0, this.fileList.length - 2)
+    },
+    methods: {
+        // 上传前校检格式和大小
+        handleBeforeUpload(file) {
+            // 校检文件类型
+            if (this.fileType) {
+                let fileExtension = ''
+                if (file.name.lastIndexOf('.') > -1) {
+                    fileExtension = file.name.slice(file.name.lastIndexOf('.'))
+                }
+                const isTypeOk = this.fileType.some((type) => {
+                    if (file.type.indexOf(type) > -1) return true
+                    if (fileExtension && fileExtension.indexOf(type) > -1) return true
+                    return false
+                })
+                if (!isTypeOk) {
+                    this.$message.error(`文件格式不正确, 请上传${this.fileType.join('/')}格式文件!`)
+                    return false
+                }
+            }
+            // 校检文件大小
+            if (this.fileSize) {
+                const isLt = file.size / 1024 / 1024 < this.fileSize
+                if (!isLt) {
+                    this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`)
+                    return false
+                }
+            }
+            return true
+        },
+        // 文件个数超出
+        handleExceed() {
+            this.$message.error(`只允许上传${this.count}个文件`)
+        },
+        // 上传失败
+        handleUploadError(err) {
+            this.$message.error('上传失败, 请重试')
+        },
+        // 上传成功回调
+        handleUploadSuccess(res, file) {
+            this.$message.success('上传成功')
+            this.cancel()
+        },
+        /** 文件状态改变时调用 */
+        handChange(file, fileList) {
+            this.fileList = fileList
+            console.log(this.fileList)
+        },
+        // 删除文件
+        handleDelete(file, list) {
+            var index = this.fileList.findIndex((v) => v.uid === file.uid)
+            if (index > -1) {
+                this.fileList.splice(index, 1)
+            }
+        },
+        // 获取文件名称
+        getFileName(name) {
+            if (name.lastIndexOf('/') > -1) {
+                return name.slice(name.lastIndexOf('/') + 1).toLowerCase()
+            } else {
+                return ''
+            }
+        },
+        /** 手动提交上传 */
+        submitUpload() {
+            if (this.fileList.length <= 0) {
+                this.msgError('请选择文件上传')
+                return false
+            }
+            const formData = new FormData()
+            // 把多个文件放到同一个请求里,这样只会请求一次接口。否则一个文件就会请求一次
+            this.fileList.forEach((el) => {
+                formData.append('file', el.raw)
+            })
+        },
+        /** 关闭上传弹框 */
+        cancel() {
+            this.fileList = []
+            this.visible = false
+        },
+    },
+}
+</script>

+ 1 - 1
src/views/modules/material/accountCheck.vue

@@ -75,7 +75,7 @@ export default {
     },
     handleOk(e) {
       this.confirmLoading = true
-	  let defaultData = this.checkedKeys.filter(item => item.toString().indexOf('-') === -1);
+	    let defaultData = this.checkedKeys.filter(item => item.toString().indexOf('-') === -1);
       this.showEdit = false
       this.$emit('synchro', defaultData)
     },

+ 1 - 1
src/views/modules/material/dxmMaterial.vue

@@ -1179,7 +1179,7 @@ a {
                                 `${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"

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

@@ -1093,7 +1093,7 @@ a {
             :value.sync="ruleForm.urlList"
             @overUpload="ruleFormOverUpload"
             @removeUpload="ruleFormRemoveUpload"
-            :fileCount="20"
+            :fileCount="100"
             :sizeCheck="true"
             uploadType="video"
             :multiple="true"
@@ -1617,7 +1617,7 @@ a {
                 `${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"

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

@@ -596,6 +596,8 @@
                                 <a-select-option :value="6">快手服务商</a-select-option>
                                 <a-select-option :value="7">磁力金牛</a-select-option>
                                 <a-select-option :value="8">头条内广</a-select-option>
+                                <a-select-option :value="9">广点通</a-select-option>
+                                
                             </a-select>
                         </a-form-model-item>
                         <a-form-model-item label="销售" prop="saleId">
@@ -946,7 +948,11 @@ export default {
                 {
                     id: 8,
                     name: '头条内广'
-                }
+                }, {
+                    id: 9,
+                    name: '广点通'
+                },
+                
 
             ],
             creativeRebateOptions: [

+ 92 - 33
src/views/modules/policy-management/reimbursement.vue

@@ -62,6 +62,9 @@
                             </a-select-option>
                         </a-select>
                     </a-form-item>
+                    <a-form-item class="grid-form-item" label="人员名称:" :colon="false">
+                        <a-input v-model="configForm.userName" placeholder="请输入人员名称" allow-clear />
+                    </a-form-item>
                     <a-form-item class="grid-form-item" label="媒体:" :colon="false">
                         <a-select
                             v-model="configForm.media"
@@ -76,6 +79,12 @@
                             <a-select-option value="磁力金牛"> 磁力金牛 </a-select-option>
                             <a-select-option value="头条"> 头条 </a-select-option>
                             <a-select-option value="头条千川"> 头条千川 </a-select-option>
+                            <a-select-option value="公共费用"> 公共费用 </a-select-option>
+
+                            <a-select-option value="快手服务商"> 快手服务商 </a-select-option>
+                            <a-select-option value="货盘"> 货盘 </a-select-option>
+                            <a-select-option value="素造"> 素造 </a-select-option>
+                            <a-select-option value="管理职能"> 管理职能 </a-select-option>
                         </a-select>
                     </a-form-item>
                     <a-form-item class="grid-form-item" label="部门:" :colon="false">
@@ -137,6 +146,24 @@
                 :pagination="false"
                 :loading="controlLoading"
             >
+                <span slot="status" slot-scope="text, records">
+                    <a @click="showLog(records)">{{
+                        text === '1'
+                            ? '待审核'
+                            : text === '2'
+                            ? '审核通过'
+                            : text === '3'
+                            ? '审核拒绝'
+                            : text === '4'
+                            ? '审核中'
+                            : text === '5'
+                            ? '部分拒绝'
+                            : '-'
+                    }}</a>
+                </span>
+                <span slot="amount" slot-scope="text,record">
+                    {{(+text).toFixed(2)}}
+                </span>
                 <span slot="lookImage" slot-scope="text, record">
                     <a @click="lookImageClick(record)">查看</a>
                 </span>
@@ -144,25 +171,20 @@
                     <a @click="handleSubmitReview(record)">查看</a>
                     <a-divider
                         type="vertical"
-                        v-if="
-                            record.userId == userInfo().id &&
-                            (record.status == '1' || record.status == '3' || record.status == '5')
-                        "
+                        v-if="record.userId == userInfo().id && (record.status == '3' || record.status == '5')"
                     />
+                    <!-- record.status == '1' ||  -->
                     <a
                         @click="handleSubmitEdit(record)"
-                        v-if="
-                            record.userId == userInfo().id &&
-                            (record.status == '1' || record.status == '3' || record.status == '5')
-                        "
+                        v-if="record.userId == userInfo().id && (record.status == '3' || record.status == '5')"
                         >编辑</a
                     >
-                    <a-divider type="vertical" v-if="record.userId == userInfo().id && record.status == '1'" />
+                    <!-- <a-divider type="vertical" v-if="record.userId == userInfo().id && record.status == '1'" />
                     <a
                         @click="handleSubmitEditStatus(record)"
                         v-if="record.userId == userInfo().id && record.status == '1'"
                         >提交审核</a
-                    >
+                    > -->
                 </span>
             </a-table>
             <a-pagination
@@ -180,14 +202,41 @@
 
         <a-modal
             v-if="lookImageVisible"
-            title="查看附件"
+            title="查看图片"
             :visible="lookImageVisible"
             :footer="null"
             @cancel="lookImageVisible = false"
         >
-            <div v-if="lookImageData">
-                <img :src="item" v-for="(item, index) in lookImageData" alt="" style="width: 150px" />
-            </div>
+            <a-carousel arrows v-if="lookImageData">
+                <div v-for="(item, index) in lookImageData" :key="index" class="content">
+                    <div style="display: flex !important; justify-content: space-around">
+                        <div style="display: flex; flex-direction: column; align-items: center; width: 500px">
+                            <img :src="item" style="width: 100%" />
+                        </div>
+                    </div>
+                </div>
+                <a-icon
+                    type="left-circle"
+                    slot="prevArrow"
+                    slot-scope
+                    style="left: 10px; z-index: 100; font-size: 30px; color: black"
+                />
+                <a-icon
+                    type="right-circle"
+                    slot="nextArrow"
+                    slot-scope
+                    style="right: 10px; z-index: 100; font-size: 30px; color: black"
+                />
+            </a-carousel>
+            <!-- <div v-if="lookImageData">
+                <img
+                    :src="item"
+                    v-for="(item, index) in lookImageData"
+                    @click="lookBig(item)"
+                    alt=""
+                    style="width: 150px"
+                />
+            </div> -->
         </a-modal>
 
         <!-- 被拒理由 -->
@@ -738,7 +787,7 @@
             >
                 <div slot="statDate" slot-scope="text, records">
                     <span v-if="!records.edit">{{ text }}</span>
-                    <a-date-picker v-model:value="records.statDates" v-else format="YYYY-MM-DD"/>
+                    <a-date-picker v-model:value="records.statDates" v-else format="YYYY-MM-DD" />
                 </div>
                 <div slot="expressNumber" slot-scope="text, records">
                     <span v-if="!records.edit">{{ text }}</span>
@@ -788,9 +837,21 @@
                 <a-steps progress-dot direction="vertical" v-model="logActive" style="width: 100%" disbaled>
                     <a-step
                         :title="`${item.roleName}(${item.userName})${
-                            item.approvalStatus == 1 ? '审核拒绝' : item.approvalContent
+                            item.state == '0'
+                                ? '创建'
+                                : item.state == '1'
+                                ? '通过'
+                                : item.state == '2'
+                                ? '拒绝'
+                                : item.state == '3'
+                                ? '待审核'
+                                : item.state == '4'
+                                ? '未审核'
+                                : item.state == '5'
+                                ? '修改'
+                                : '-'
                         }`"
-                        :description="`${item.createTime}`"
+                        :description="`${item.statTime}`"
                         v-for="(item, index) in logList"
                         :key="index"
                         disabled
@@ -1079,19 +1140,7 @@ export default {
                     title: '状态',
                     dataIndex: 'status',
                     align: 'center',
-                    customRender: function (text) {
-                        if (text === '1') {
-                            return '待审核'
-                        } else if (text === '2') {
-                            return '审核通过'
-                        } else if (text === '3') {
-                            return '审核拒绝'
-                        } else if (text === '4') {
-                            return '审核中'
-                        } else if (text === '5') {
-                            return '部分拒绝'
-                        }
-                    },
+                    scopedSlots: { customRender: 'status' },
                 },
                 {
                     title: '附件',
@@ -1118,6 +1167,7 @@ export default {
             ],
             configForm: {
                 companyId: undefined,
+                userName: undefined,
                 media: undefined,
                 departId: undefined,
                 time: [],
@@ -1300,6 +1350,7 @@ export default {
             const paramsData = {
                 userId: this.userInfo().id,
                 companyId: this.configForm.companyId,
+                userName: this.configForm.userName,
                 media: this.configForm.media,
                 departId: this.configForm.departId,
                 status: this.configForm.status,
@@ -1605,9 +1656,9 @@ export default {
         showLog(item) {
             this.logVisible = true
             this.logStatus = item.approvedStatus
-            getAction(urlAcount + '/finance/cwjsPolicyInfo/getPolicyApprovalLogByPolicyId', { policyId: item.id })
+            getAction('/reimburse/apply/queryProcess', { id: item.id })
                 .then((result) => {
-                    if (result.code === 0) {
+                    if (result.code === 200) {
                         this.logList = result.result
                         this.logActive = this.logList.length - 1
                     } else {
@@ -1626,6 +1677,7 @@ export default {
                 userId: this.userInfo().id,
                 userId: this.userInfo().id,
                 companyId: this.configForm.companyId,
+                userName: this.configForm.userName,
                 media: this.configForm.media,
                 departId: this.configForm.departId,
                 status: this.configForm.status,
@@ -2029,7 +2081,13 @@ export default {
         // 提交审核弹窗
         handleSubmitReview(list) {
             this.$router.replace({
-                path: '/policy-management/reimbursementAdd?type=look&person=' + list.flag + '&id=' + list.id,
+                path:
+                    '/policy-management/reimbursementAdd?type=look&person=' +
+                    list.flag +
+                    '&id=' +
+                    list.id +
+                    '&status=' +
+                    list.status,
             })
         },
         handleSubmitEdit(list) {
@@ -2077,6 +2135,7 @@ export default {
         handleResetList() {
             this.configForm = {
                 companyId: undefined,
+                userName: undefined,
                 media: undefined,
                 departId: undefined,
                 time: [],

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 831 - 39
src/views/modules/policy-management/reimbursementAdd.vue


+ 3 - 3
vue.config.js

@@ -23,7 +23,7 @@ module.exports = {
     }
   },
   */
-  configureWebpack: config => {
+  configureWebpack: () => {
     if (process.env.NODE_ENV === 'production') {
       return {
         plugins: [new CompressionPlugin({
@@ -105,10 +105,10 @@ module.exports = {
         // 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.59:7001', //请求本地 需要jeecg-boot后台项目  赵西安
+        // target: 'http://192.168.1.143: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后台项目
+        target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目