Pārlūkot izejas kodu

Merge branch 'develop_yh49_1' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh50

lilei 7 mēneši atpakaļ
vecāks
revīzija
ed96e54dbf

+ 3 - 3
src/views/easyPassManagement/homepageCarouselImg/detailModal.vue

@@ -38,10 +38,10 @@
             <img
               :src="form.imageUrl"
               alt="图片走丢了"
-              width="80"
-              height="80"
+              width="750px"
+              height="300px"
               style="margin-right:10px;object-fit: cover;"/>
-            <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(420px)*高(230px)</div>
+            <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(750px)*高(300px)</div>
           </a-form-model-item>
           <a-form-model-item label="内容类型" prop="contentType">
             {{ form.contentType==='IMAGE_CONTENT'?'图文展示':form.contentType==='VIDEO'?'视频展示':form.contentType==='LINK'?'跳转链接':'促销活动' }}

+ 1 - 1
src/views/easyPassManagement/promotionalActivities/addPromotionModal.vue

@@ -100,7 +100,7 @@
                   :maxNums="1"
                   @change="changeImage"
                   listType="picture-card"></Upload>
-                <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(420px)*高(230px)</div>
+                <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(750px)*高(300px)</div>
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">

+ 3 - 3
src/views/easyPassManagement/promotionalActivities/detailModal.vue

@@ -42,10 +42,10 @@
                 <img
                   :src="form.imageUrl"
                   alt="图片走丢了"
-                  width="80"
-                  height="80"
+                  width="750px"
+                  height="300px"
                   style="margin-right:10px;object-fit: cover;"/>
-                <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(420px)*高(230px)</div>
+                <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(750px)*高(300px)</div>
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24">

+ 1 - 1
src/views/easyPassManagement/promotionalActivities/edit.vue

@@ -30,7 +30,7 @@
               <a-descriptions-item label="促销时间">
                 {{ form.promoStartDate }}{{ form.promoStartDate?' ~ ':'' }}{{ form.promoEndDate }}
               </a-descriptions-item>
-              <a-descriptions-item label="排序">{{ form.sort || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="排序">{{ (form.sort||form.sort==0)? form.sort: '--' }}</a-descriptions-item>
               <a-descriptions-item label="加盟商开关权限">{{ form.dealerOpenFlag=='0'?'否':'是' }}</a-descriptions-item>
               <a-descriptions-item label="参与经销商" v-if="form.allDealerFlag=='1'">全部经销商</a-descriptions-item>
               <a-descriptions-item label="参与经销商" v-else>

+ 13 - 13
src/views/salesReturnManagement/salesReturn/auditDetail.vue

@@ -2,15 +2,15 @@
   <div>
     <p>说明:以下信息来自钉钉</p>
     <a-spin :spinning="spinning" tip="Loading...">
-      <div style="margin-bottom:10px;" v-for="item in list" :key="item.businessId">
-        <div style="margin-bottom:10px;font-weight:bold;">提审时间:{{ item.createTime }}</div>
+      <div style="margin-bottom:10px;" v-for="item in list" :key="item.businessSn">
+        <div style="margin-bottom:10px;font-weight:bold;">提审时间:{{ item.createDate }}</div>
         <a-table
           class="sTable fixPagination"
           ref="table"
           size="small"
-          :rowKey="(record) => record.businessId"
+          :rowKey="(record) => record.businessSn"
           :columns="columns"
-          :dataSource="item.taskVOList"
+          :dataSource="item.opinionList"
           :scroll="{ y: 500 }"
           :pagination="false"
           bordered>
@@ -22,7 +22,7 @@
 
 <script>
 import { STable } from '@/components'
-import { getProcessInstanceList } from '@/api/expenseManagement'
+import { getProcessInstance } from '@/api/expenseManagement'
 export default {
   name: 'AuditDetail',
   components: { STable },
@@ -44,12 +44,12 @@ export default {
     return {
       spinning: false,
       columns: [{ title: '序号', dataIndex: 'no', width: '8%', align: 'center' },
-        { title: '人员姓名', width: '12%', dataIndex: 'userName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '人员类型', dataIndex: 'userType', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'state', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审批意见', dataIndex: 'remark', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '附件', dataIndex: 'hasAttachments', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作时间', dataIndex: 'date', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }],
+        { title: '人员姓名', width: '12%', dataIndex: 'approvalName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '人员类型', dataIndex: 'processTaskType', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', dataIndex: 'approvalStateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审批意见', dataIndex: 'approvalOpinion', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '附件', dataIndex: 'attachmentNames', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作时间', dataIndex: 'approvalTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }],
       list: []
     }
   },
@@ -62,11 +62,11 @@ export default {
     },
     getData () {
       this.spinning = true
-      getProcessInstanceList({ businessType: this.businessType, businessSn: this.itemSn }).then(res => {
+      getProcessInstance({ businessType: this.businessType, businessSn: this.itemSn }).then(res => {
         if (res.status == 200) {
           this.list = res.data
           this.list.map(item => {
-            item.taskVOList.map((a, index) => a.no = index + 1)
+            item.opinionList.map((a, index) => a.no = index + 1)
           })
         }
         this.spinning = false