有限空间作业

main.js

@@ -21,7 +21,7 @@ Vue.component('uni-td',uniTd)
 Vue.use(uView)
 Vue.config.productionTip = false
 // Vue.prototype.$filePath = 'https://qgqy.qhdsafety.com/file/'
-Vue.prototype.$filePath = 'https://skqhdg.porthebei.com:9004/file/'
+Vue.prototype.$filePath = 'https://wwag.qhdsafety.com/file/'
 
 App.mpType = 'app'
 const app = new Vue({

pages.json

@@ -204,6 +204,12 @@
 				"navigationBarTitleText": "待办"
 			}
 		},
+		{
+			"path": "pages/eight_assignments/completed_list",
+			"style": {
+				"navigationBarTitleText": "已办"
+			}
+		},
 		{
 			"path": "pages/eight_assignments/technological_process",
 			"style": {

pages/eight_assignments/completed_list.vue

@@ -0,0 +1,84 @@
+<template>
+  <view class="content">
+    <u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
+      <u-list-item v-for="(item, index) in list" :key="index">
+        <view class="flex-between main-title">
+          <text>申请人：{{ item.jobName }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>作业编号：{{ item.id }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>作业分公司：{{ item.corpName }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>申请时间：{{ item.createdTime }}</text>
+        </view>
+        <view class="flex-between mt-10 subtitle">
+          <view></view>
+          <view class="flex-between">
+            <u-button type="primary" text="流程" size="mini" class="bth-mini"
+                      @click="$u.route({
+                        url: '/pages/eight_assignments/technological_process',
+                        params: {taskId:item.taskId,type,title}
+                      })"/>
+          </view>
+        </view>
+      </u-list-item>
+    </u-list>
+    <empty v-else></empty>
+  </view>
+</template>
+
+<script>
+import {getToDoTaskList} from "@/api";
+
+export default {
+  data() {
+    return {
+      type: '',
+      title: '',
+      pageSize: 10,
+      currentPage: 1,
+      totalPage: 0,
+      list: []
+    }
+  },
+  onLoad(query) {
+    this.type = query.type
+    this.title = query.title
+    uni.setNavigationBarTitle({
+      title: this.title + '已办'
+    })
+  },
+  onShow() {
+    this.resetList()
+  },
+  methods: {
+    async getData() {
+      let resData = await getToDoTaskList({
+        showCount: this.pageSize,
+        currentPage: this.currentPage,
+        TYPE: this.type,
+        vectors: '1'
+      });
+      this.list = [...this.list, ...resData.list.list];
+      this.totalPage = resData.list.totalPage;
+    },
+    resetList() {
+      this.pageSize = 10
+      this.currentPage = 1
+      this.list = []
+      this.getData()
+    },
+    scrolltolower() {
+      this.currentPage++;
+      if (this.totalPage >= this.currentPage) this.getData();
+    },
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

pages/eight_assignments/confined_space/apply.vue

@@ -177,7 +177,7 @@ export default {
   onLoad(options) {
     this.form.CORP_ID = options.CORPINFO_ID
     this.form.CORP_NAME = options.CORP_NAME
-    this.form.type = options.type
+    this.type = options.type
   },
   methods: {
     async fnGetConfinedSpaceSelectList() {

pages/eight_assignments/select_review_personnel.vue

@@ -165,6 +165,7 @@ export default {
             this.form[key_id] = event.DEPARTMENT_ID
             this.form[value + '_USER_ID' + guid] = ''
             this.form[value + '_USER_NAME' + guid] = ''
+            this.picker.columnsAll[value] = []
             this.fnGetUserList(event, value)
           }
         },

pages/eight_assignments/subordinate_index.vue

@@ -26,12 +26,12 @@ export default {
         {
           img: require('../../static/icon-apps/i10.png'),
           title: '待办',
-          url: '/pages/eight_assignments/to_do_list'
+          url: '/pages/eight_assignments/to_do_list',
         },
         {
           img: require('../../static/icon-apps/i11.png'),
           title: '已办',
-          url: '/pages/eight_assignments/completed_list'
+          url: '/pages/eight_assignments/completed_list',
         },
       ],
       type: '',

pages/eight_assignments/to_do_list.vue

@@ -9,10 +9,13 @@
           <text>作业编号：{{ item.id }}</text>
         </view>
         <view class="flex-between main-title">
-          <text>作业分公司：{{ item.taskName }}</text>
+          <text>作业分公司：{{ item.corpName }}</text>
         </view>
         <view class="flex-between main-title">
-          <text>申请时间：{{ item.taskName }}</text>
+          <text>申请时间：{{ item.createdTime }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>当前步骤：{{ item.taskName }}</text>
         </view>
         <view class="flex-between mt-10 subtitle">
           <view></view>

pages/eight_assignments/view_info.vue

@@ -10,8 +10,19 @@
       <u-divider text="审批人员" textPosition="left"></u-divider>
       <u-cell-group>
         <block v-for="(item,index) in jobs">
-          <u-cell :key="index" :title="item.TYPE_DESCRIBE"
+          <u-cell :key="index" :title="item.TYPE_DESCRIBE">
-                  :value="item.DEPARTMENT_NAME + '（' + item.USER_NAME + '）'"></u-cell>
+            <template #label>
+              <view class="mt-10">
+                <view>部门：{{item.DEPARTMENT_NAME}}</view>
+                <view>人员：{{item.USER_NAME}}</view>
+                <view v-if="item.SIGN_PICTURE">
+                  <u-image width="400rpx" height="200rpx" :src="$filePath + '/' +item.SIGN_PICTURE" mode="widthFix"/>
+                  <view>审批意见：{{item.APPROVAL_OPINIONS}}</view>
+                  <view>审批意见：{{item.APPROVAL_TIME}}</view>
+                </view>
+              </view>
+            </template>
+          </u-cell>
         </block>
       </u-cell-group>
       <view class="mt-10">
@@ -48,7 +59,7 @@ export default {
     async fnGetData(taskId) {
       let resData = await getTaskInfo({EW_RU_TASK_ID: taskId})
       this.form = resData.list.form
-      this.jobs = resData.list.jobs.reverse()
+      this.jobs = resData.list.jobs
     },
     async fnSubmit() {
       await resolveNextOperation({

uni_modules/cc-defineStep/components/cc-defineStep/cc-defineStep.vue

@@ -10,8 +10,8 @@
             <text style="color: #202020;">{{ item.desc }}</text>
           </view>
           <view class="status"
-                :style="{background: item.isNow == 1?colors:'#ccc',borderColor: item.isNow == 1?colors:'#ccc'}">
+                :style="{background: item.STEP_FLAG === '1'?colors:'#ccc',borderColor: item.STEP_FLAG === '1'?colors:'#ccc'}">
-            {{ item.isNow == 1 ? "✓" : '' }}
+            {{ item.STEP_FLAG === '1' ? "✓" : '' }}
           </view>
         </view>
       </view>

utils/submitHomeworkProcess.js

@@ -70,7 +70,7 @@ const endCurrentPersonnelTechnologicalProcess = async ({EW_RU_TASK_ID}) => {
 // EW_RU_JOB_ID当前操作节点的人员id
 export const resolveNextOperation = async ({EW_RU_TASK_ID, CORP_ID, TYPE, EW_RU_JOB_ID}, isLastStep = true) => {
   if (isLastStep) {
-    const {info} = await getCurrentNextOperation({EW_RU_TASK_ID})
+    const {info} = await getCurrentNextOperation({EW_RU_TASK_ID, EW_RU_JOB_ID})
     // 选人
     if (info.chooseNextFlag === '1') {
       uni.navigateTo({