流程完善

src/utils/request.js

@@ -16,7 +16,7 @@ const service = axios.create({
   //baseURL: '/jeecg-boot',
   baseURL: baseProject, // api base_url
   // timeout: 119000 // 请求超时时间
-  timeout: 60000 // 请求超时时间
+  timeout: 150000 // 请求超时时间
 })
 
 const err = (error) => {

src/views/activiti/doneManage.vue

@@ -18,6 +18,15 @@
                 <a-input type="text" v-model="searchForm.defname" placeholder="请输入" clearable />
               </a-form-item>
             </a-col>
+            <a-col :xl="8" :lg="7" :md="8" :sm="24">
+              <a-form-item label="日期">
+                <a-range-picker  v-model:value="rangeDay"
+                                format="YYYY-MM-DD"
+                                :placeholder="['开始时间', '结束时间']"
+                                @change="onBirthdayChange" />
+              </a-form-item>
+              
+            </a-col>
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-col :md="6" :sm="12">
                 <a-button @click="handleSearch" type="primary" icon="search">搜索</a-button>
@@ -163,11 +172,14 @@ import { activitiMixin } from '@/views/activiti/mixins/activitiMixin'
 import {getEditorJumpUrl,getProjctManageUrl}from '../../../url.config'
 import outerFormCheck from '../../share/modal/OuterFormCheck'
 import { getAction } from '@/api/manage'
+import moment from 'moment'
 export default {
   name: 'done-manage',
   mixins: [activitiMixin, JeecgListMixin],
   components:{
-    outerFormCheck
+    outerFormCheck,
+    
+    moment
   },
   data() {
     return {
@@ -176,9 +188,12 @@ export default {
       loading: true, // 表单加载状态
       selectCount: 0, // 多选计数
       selectList: [], // 多选数据
+      rangeDay: [moment().subtract(1, 'months').startOf('day'),moment().endOf('day')], // 
       searchForm: {
         // 搜索框对应data对象
         name: '',
+        begin: '',
+        end: '',
         pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
         sort: 'createTime', // 默认排序字段
@@ -215,14 +230,35 @@ export default {
     }
   },
   mounted() {
+    // this.getCurrentAndThreeMonthsAgoDates();
     this.init()
+    
   },
   methods: {
+    // getCurrentAndThreeMonthsAgoDates() {
+    //       // 获取当前日期
+    //       let today = new Date();
+    //       this.searchForm.begin = today.toISOString().slice(0, 10); // 格式化为 YYYY-MM-DD
+    
+    //       // 获取三个月前的日期
+    //       let threeMonthsAgo = new Date();
+    //       threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 3);
+    //       this.searchForm.end = threeMonthsAgo.toISOString().slice(0, 10); // 格式化为 YYYY-MM-DD
+    //       // this.rangeDay[0] = this.searchForm.end
+    //       // this.rangeDay[1] = this.searchForm.begin
+    //     }
+    //     ,
+    onBirthdayChange: function (value, dateString) {
+      this.searchForm.begin=dateString[0];
+      this.searchForm.end=dateString[1];
+    },
     loadData() {},
     init() {
       this.getDataList()
     },
     getDataList() {
+      console.log("======================")
+      console.log(this.rangeDay)
       this.loading = true
       this.postFormAction(this.url.doneList, this.searchForm).then(res => {
         this.loading = false

src/views/oa/IncidentTicketList.vue

@@ -186,7 +186,10 @@
           <span v-if="record.state =='2'">已通知</span>
           <span v-if="record.state =='1'">未处理</span>
         </span>
-
+        <span slot="pushFlag" slot-scope="text, record">
+          <span v-if="record.pushFlag =='1'">是</span>
+          <!-- <span v-if="record.pushFlag !='1'">否</span> -->
+        </span>
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record,'edit')"  v-if="record.state!=='6'">编辑</a>
           <a-divider type="vertical" v-if="record.state!=='6'"/>
@@ -350,6 +353,13 @@ import moment from 'moment'
             customRender: (t) => ellipsis(t,7),
             width:100
           },
+          {
+            title:'已推送srm',
+            align:"center",
+            dataIndex: 'pushFlag',
+            scopedSlots: { customRender: 'pushFlag' },
+            width:100
+          },
          
           {
             title:'状态',

src/views/oa/modules/IncidentTicketModalDetail.vue

@@ -366,7 +366,7 @@
                                 <td class="tdOne" rowspan="3">情况说明</td>
                                 <td class="tdOne" colspan="5" rowspan="3" style="text-align: left;padding-left: 1%;">
                                     <textarea style="width: 100%;border: none;; resize:none; overflow: hidden;" readOnly>{{ formState.presentationCondition }}</textarea>
-                                    <div style="text-align: right; margin-top: -15%;margin-right: 50px;" v-if="factorySignatureUrl.includes('myfitt')">
+                                    <div style="text-align: right; margin-top: -15%;margin-right: 50px;" v-if="factorySignatureUrl.includes('47.99.172.19') || factorySignatureUrl.includes('myfitt')">
                                         <img ghost style="width:160px; height:160px;" :src="factorySignatureUrl"/>
                                     </div>
                                 </td>

src/views/process-center/applyListByTableName.vue

@@ -153,7 +153,7 @@
 
           <!-- 结果 -->
           <template slot="result" slot-scope="t, r, i">
-            <span :style="{ color: getResult(t).color }">{{ getResult(t).text }}</span>
+            <span :style="{ color: getResult(t,r).color }">{{ getResult(t,r).text }}</span>
           </template>
 
           <a-table-column title="创建时间" data-index="createTime" :width="150" align="center">
@@ -961,11 +961,16 @@ export default {
       }
       return { text: text, color: color }
     },
-    getResult(result) {
-      let text = '未知',
-        color = ''
+    getResult(result,recorde) {
+      
+      let text = '未知', color = ''
       if (result == 0) {
         text = '未提交'
+        
+        if(recorde.follow_up == '1'){
+          text = '未提交(已确认)'
+        }
+        
         color = 'default'
       } else if (result == 1) {
         text = '处理中'