修改问题

src/api/modular/system/appManage.js

@@ -330,3 +330,11 @@ export function workFlowSaveAndEnable (parameter) {
     data: parameter
   })
 }
+
+export function GetShowTimeLine (parameter) {
+  return axios({
+    url: '/ServiceWorkFlowBase/GetShowTimeLine',
+    method: 'get',
+    params: parameter
+  })
+}

src/views/main/BookingLedger/detail/index.vue

@@ -1178,6 +1178,9 @@ export default {
       })
         .then(res => {
           if (res.success) {
+            if (res.data.statuslog) {
+              res.data.statuslog = res.data.statuslog.reverse()
+            }
             this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...res.data })
             setTimeout(() => {
               this.checkSaveFun({ type: 'details', hasChange: false })

src/views/main/BookingLedger/list/index.vue

@@ -145,7 +145,7 @@
                 :checkbox_config="{ checkField: 'checked' }"
                 :checkbox-config="{ highlight: true }"
                 :scroll-x="{ gt: 10, oSize: 10, enabled: false }"
-                :scroll-y="{ gt: 20, oSize: 20, enabled: true }"
+                :scroll-y="{ gt: 10, oSize: 1, enabled: true }"
                 @page-change="handlePageChange"
                 @cell-dblclick="handledbclick"
                 :sort-config="{ sortMethod: customSortMethod }"
@@ -206,7 +206,7 @@
                 </template>
                 <template #atd="{ row, rowIndex }">
                   <a-spin :spinning="row.atdLoading">
-                    <a-icon style="cursor: pointer;" @click="handleRefshAtd(row, rowIndex)" type="reload" />
+                    <a-icon v-if="row.atd" style="cursor: pointer;" @click="handleRefshAtd(row, rowIndex)" type="reload" />
                     <span v-if="row.atd"> {{ row.atd.substring(0, 10) }}</span>
                   </a-spin>
                 </template>
@@ -229,9 +229,9 @@
                 </template>
                 <template #bookstatus="{ row, column, rowIndex }">
                   <div style="display: flex;align-items: center;">
-                    <a-icon style="cursor: pointer;" @click="handleRefshYZOnce(row, rowIndex)" type="reload" />
+                    <a-icon v-if="row.isBookingYZ!=0" style="cursor: pointer;color: rgb(7, 231, 56);" @click="handleRefshYZOnce(row, rowIndex)" type="reload" />
                     <a-spin :spinning="row.refshYzitemLoad">
-                      <div class="billtrace-box" :class="column.resizeWidth > 240 ? 'normal-box' : 'flex-box'">
+                      <div :style="row.isBookingYZ==0?'padding-left:14px':''" class="billtrace-box" :class="column.resizeWidth > 240 ? 'normal-box' : 'flex-box'">
                         <div
                           class="billtrace-btn"
                           v-for="(btn, bindex) in row.bookstatus"
@@ -1095,6 +1095,7 @@ export default {
         item.hasGoods = hasGoods
         this.$set(this.gridOptions.data, listIndex, item)
         this.$refs.xGrid.reloadData(this.gridOptions.data)
+        this.$refs.xGrid.setCurrentRow(this.gridOptions.data[listIndex])
       })
     },
     handleSubmitCopyMore(e) {
@@ -2090,6 +2091,7 @@ export default {
             })
             this.$set(this.gridOptions.pagerConfig, 'columns', JSON.parse(JSON.stringify(initData.columns)))
             this.$set(this.gridOptions, 'data', [..._data])
+            const startTime = Date.now()
             this.$refs.xGrid.reloadData(_data).then(() => {
               this.$set(this.gridOptions, 'loading', false)
             })

src/views/main/CommondbPortload/addForm.vue

@@ -34,14 +34,14 @@
               />
             </a-form-item>
           </a-col>
-          <!-- <a-col :span="12">
+          <a-col :span="12">
             <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入EDI代码"
                 v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
               />
             </a-form-item>
-          </a-col> -->
+          </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input placeholder="请输入备注" v-decorator="['remark']" />

src/views/main/CommondbPortload/editForm.vue

@@ -35,14 +35,14 @@
               />
             </a-form-item>
           </a-col>
-          <!-- <a-col :span="12">
+          <a-col :span="12">
             <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入EDI代码"
                 v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
               />
             </a-form-item>
-          </a-col> -->
+          </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input placeholder="请输入备注" v-decorator="['remark']" />

src/views/system/ServiceFlow/addForm.vue

@@ -91,11 +91,14 @@
               <a @click="handleAddStatus">添加</a>
             </div>
             <div class="statBox" v-if="form.statusSkuList && form.statusSkuList.length > 0">
-              <div class="status" v-for="(item,index) in form.statusSkuList" :key="item.sortNo">
+              <div class="status" v-for="(item, index) in form.statusSkuList" :key="item.sortNo">
                 <span class="sort">{{ item.sortNo }}</span>
                 <span class="name">{{ item.showName }}</span>
                 <span class="action">
-                  <a-icon type="setting" @click="handleEditStatus(item,index)" style="margin-right: 10px;cursor: pointer;" />
+                  <a-icon
+                    type="setting"
+                    @click="handleEditStatus(item, index)"
+                    style="margin-right: 10px;cursor: pointer;" />
                   <a-icon type="delete" @click="handleDelStatus(index)" style="cursor: pointer;" />
                 </span>
               </div>
@@ -119,6 +122,9 @@
         <a-button @click="handlePub" type="primary">
           发布
         </a-button>
+        <a-button @click="handleTime" type="primary">
+          展示时间轴
+        </a-button>
       </template>
     </a-modal>
     <a-modal title="服务项目" :width="800" :visible="addItemFlag" @cancel="addItemFlag = false">
@@ -175,10 +181,7 @@
             <a-input-number :precision="0" v-model="activeForm.sortNo" :min="1" :max="100" />
           </a-form-model-item>
           <a-form-model-item prop="valType" label="值类型">
-            <a-select
-              placeholder="请选择值类型"
-              v-model="activeForm.valType"
-              style="width: 300px;margin-right: 20px;">
+            <a-select placeholder="请选择值类型" v-model="activeForm.valType" style="width: 300px;margin-right: 20px;">
               <a-select-option value="时间">时间</a-select-option>
               <a-select-option value="字符串">字符串</a-select-option>
             </a-select>
@@ -189,11 +192,11 @@
           </a-form-model-item>
           <p>说明：包含子状态，可指定多个子状态，启用一个状态触发后，当前状态触发</p>
           <div class="statBox" v-if="activeForm.subList && activeForm.subList.length > 0">
-            <div class="status" v-for="(item,index) in activeForm.subList" :key="item.sortNo">
+            <div class="status" v-for="(item, index) in activeForm.subList" :key="item.sortNo">
               <span class="sort">{{ item.sortNo }}</span>
               <span class="name">{{ item.showName }}</span>
               <span class="action">
-                <a-icon type="setting" @click="handleEditSub(item,index)" style="margin-right: 10px;cursor: pointer;" />
+                <a-icon type="setting" @click="handleEditSub(item, index)" style="margin-right: 10px;cursor: pointer;" />
                 <a-icon type="delete" @click="handleDelSub(index)" style="cursor: pointer;" />
               </span>
             </div>
@@ -238,10 +241,7 @@
             <a-input-number :precision="0" v-model="subActiveForm.sortNo" :min="1" :max="100" />
           </a-form-model-item>
           <a-form-model-item prop="valType" label="值类型">
-            <a-select
-              placeholder="请选择值类型"
-              v-model="subActiveForm.valType"
-              style="width: 300px;margin-right: 20px;">
+            <a-select placeholder="请选择值类型" v-model="subActiveForm.valType" style="width: 300px;margin-right: 20px;">
               <a-select-option value="时间">时间</a-select-option>
               <a-select-option value="字符串">字符串</a-select-option>
             </a-select>
@@ -299,10 +299,40 @@
         </a-button>
       </template>
     </a-modal>
+    <a-modal title="流程展示" :width="1400" :visible="timeFlag" @cancel="timeFlag = false">
+      <a-spin :spinning="timeLoading">
+        <div v-if="timeForm.activitiesList && timeForm.activitiesList.length > 0" class="time">
+          <div class="time-title">{{ this.timeForm.serviceProjectName }}</div>
+          <div style=" position: absolute;top: 10px;left: 51px;display:flex">
+            <div class="top" v-for="item in timeForm.activitiesList" :key="item.actId">
+              <div class="right">
+                <div class="line" :class="{ active: item.isYield == 1 }"></div>
+              </div>
+              <div class="left">
+                <div class="point" :class="{ active: item.isYield == 1 }"></div>
+              </div>
+            </div>
+          </div>
+          <div class="item" v-for="item in timeForm.activitiesList" :key="item.actId">
+            <div class="bottom">
+              <div class="text"> {{ item.showName }}</div>
+              <div class="text" v-if="item.isYield == 1"> {{ item.actDate.substring(0, 10) }}</div>
+              <div class="sub">
+                <div class="subItem" :key="ite.actId" v-for="ite in item.subList">
+                  <div class="pointSub" :class="{ active: ite.isYield == 1 }"></div>
+                  {{ ite.showName }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-else>暂无数据</div>
+      </a-spin>
+    </a-modal>
   </div>
 </template>
 <script>
-import { workFlowSetEnable, workFlowSetUnPublishRelease, workFlowSaveAndEnable, workFlowSetUnDelete, workFlowGetInfo, StatusSkuBaseSavAndEnable, projectQueryList, QueryActivitiesList, QueryListStatus, SaveWFActivities, workFlowSave } from '@/api/modular/system/appManage'
+import { workFlowSetEnable, workFlowSetUnPublishRelease, workFlowSaveAndEnable, workFlowSetUnDelete, workFlowGetInfo, StatusSkuBaseSavAndEnable, projectQueryList, QueryActivitiesList, QueryListStatus, SaveWFActivities, GetShowTimeLine } from '@/api/modular/system/appManage'
 import { SysTenantPage } from '@/api/modular/main/bookingprinttemplate'
 export default {
   data() {
@@ -319,6 +349,7 @@ export default {
       subActiveForm: {
         sortNo: 1
       },
+      timeLoading: false,
       activeForm: {
         sortNo: 1,
         subList: [],
@@ -350,8 +381,12 @@ export default {
       type: 'add',
       index: '',
       activeFlag: false,
+      timeFlag: false,
       statusSKUCode: '',
       addActiveFlag: false,
+      timeForm: {
+        activitiesList: []
+      },
       addActiveForm: {},
       projectList: [],
       statusList: [],
@@ -427,15 +462,15 @@ export default {
         if (res.data.succ) {
           if (res.data.ext.statusSkuList) {
             res.data.ext.statusSkuList.forEach(item => {
-            if (item.isContainsSub == 1) {
-              item.isContainsSubs = true
-            } else {
-              item.isContainsSubs = false
-            }
-            if (!item.subList) {
-              item.subList = []
-            }
-          })
+              if (item.isContainsSub == 1) {
+                item.isContainsSubs = true
+              } else {
+                item.isContainsSubs = false
+              }
+              if (!item.subList) {
+                item.subList = []
+              }
+            })
           } else {
             res.data.ext.statusSkuList = []
           }
@@ -490,7 +525,18 @@ export default {
       }
     },
     handleAddSubAct() {
-
+    },
+    handleTime() {
+      this.timeFlag = true
+      this.timeLoading = true
+      GetShowTimeLine({ pkId: this.form.pkId }).then(res => {
+        if (res.data.succ) {
+          this.timeForm = res.data.ext
+        } else {
+          this.$message.error(res.data.msg)
+        }
+        this.timeLoading = false
+      })
     },
     handleSaveSubActive() {
       this.$refs.subActiveForm.validate(valid => {
@@ -498,17 +544,17 @@ export default {
           const arr = []
           if (this.subType === 'add') {
             this.activeForm.subList.forEach(item => {
-            if (item.sortNo === this.subActiveForm.sortNo) {
-              arr.push(1)
-            }
-          })
+              if (item.sortNo === this.subActiveForm.sortNo) {
+                arr.push(1)
+              }
+            })
           } else {
             this.activeForm.subList.forEach(item => {
-            if (item.sortNo === this.subActiveForm.sortNo &&
-            this.subActiveForm.sortNo !== this.activeForm.subList[this.subIndex].sortNo) {
-              arr.push(1)
-            }
-          })
+              if (item.sortNo === this.subActiveForm.sortNo &&
+                this.subActiveForm.sortNo !== this.activeForm.subList[this.subIndex].sortNo) {
+                arr.push(1)
+              }
+            })
           }
 
           if (arr.length > 0) {
@@ -538,17 +584,17 @@ export default {
           const arr = []
           if (this.type === 'add') {
             this.form.statusSkuList.forEach(item => {
-            if (item.sortNo === this.activeForm.sortNo) {
-              arr.push(1)
-            }
-          })
+              if (item.sortNo === this.activeForm.sortNo) {
+                arr.push(1)
+              }
+            })
           } else {
             this.form.statusSkuList.forEach(item => {
-            if (item.sortNo === this.activeForm.sortNo &&
-            this.activeForm.sortNo !== this.form.statusSkuList[this.index].sortNo) {
-              arr.push(1)
-            }
-          })
+              if (item.sortNo === this.activeForm.sortNo &&
+                this.activeForm.sortNo !== this.form.statusSkuList[this.index].sortNo) {
+                arr.push(1)
+              }
+            })
           }
           if (arr.length > 0) {
             this.$message.warning('顺序号不能重复')
@@ -750,7 +796,106 @@ export default {
       text-align: center;
       background: rgb(184, 53, 137);
       margin-right: 5px;
-      color:white;
+      color: white;
+    }
+  }
+}
+
+.time {
+  display: flex;
+  align-items: flex-start;
+  padding-top: 10px;
+  position: relative;
+
+  .time-title {
+    padding: 10px;
+    background: rgb(215, 215, 215);
+    border-radius: 5px;
+    margin-top: -12px;
+  }
+
+  .active {
+    background: rgb(2, 167, 240) !important;
+  }
+
+  .item {
+    margin-top: 20px;
+    &:nth-child(3) {
+      margin-left: 92px;
+      margin-right: 50px;
+    }
+
+    &:nth-child(4) {
+      margin-right: 30px;
+    }
+
+    &:nth-child(5) {
+      margin-right: 73px;
+    }
+
+    &:nth-child(6) {
+      margin-right: 30px;
+    }
+
+    &:nth-child(7) {
+      margin-right: 55px;
+    }
+
+    &:nth-child(8) {
+      margin-right: 30px;
+    }
+
+    &:nth-child(9) {
+      margin-right: 41px;
+    }
+  }
+
+  .line {
+    width: 100px;
+    height: 2px;
+    background: rgb(215, 215, 215);
+  }
+
+  .point {
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    margin: 0 6px;
+    background: rgb(215, 215, 215);
+  }
+
+  .left {
+    text-align: center;
+    position: relative;
+
+    .text {
+      margin-top: 3px;
+    }
+  }
+
+  .right {
+    padding-top: 5px;
+  }
+
+  .top {
+    display: flex
+  }
+
+  .subItem {
+    display: flex;
+    align-items: center;
+    margin-top: 5px;
+
+    .pointSub {
+      width: 10px;
+      height: 10px;
+      background: rgb(215, 215, 215);
+      border-radius: 50%;
+      margin-right: 3px;
+    }
+
+    .active {
+      background: rgb(2, 167, 240) !important;
     }
   }
 }