页面优化更改

pages/approval/myapply.vue

@@ -3,10 +3,10 @@
 		<uni-swipe-action>
       <ul>
         <li v-for="(item,index) in list" :key="index"  class="my_approval_li">
-          <uni-swipe-action-item :right-options="options"  @click="bindClick($event,item.eventId)" @change="swipeChange($event, index)">
+          <uni-swipe-action-item @click="bindClick($event,item.eventId)" @change="swipeChange($event, index)">
             <view class="my_approval_item" @click="toNav(item.instanceId, item.nodeId)">
               <h3 class="my_approval_title">
-                <text>[{{item.businessTypeName}}]--{{item.createUserName}}</text>
+                <text>[{{tableUserFrom.find(dictItem => dictItem.dictValue === item.processType).dictLabel}}]--{{item.createUserName}}</text>
                 <text class="approval_title_right">{{item.status === '10' ? '待审批' :item.status === '2' ? '已审批':item.status === '5' ? '驳回' : ''}}</text>
               </h3>
 
@@ -23,7 +23,9 @@
 </template>
 
 <script>
-	export default{
+	import {getDict} from "@/api/system/dict";
+
+  export default{
     props: {
       list: {
         type: Array,
@@ -34,33 +36,18 @@
     },
 		data() {
 			return {
-				myApprovalList:[{
-          businessId: 1,
-					type:"请假",
-					name:"张三",
-					reason:"家里有事",
-					stateName:"待办",
-					state:'0',
-					department:"研发部",
-					time:'2021-10-14',
-					eventId:'211'
-				}],
-				options:[
-					{
-						text: '撤回',
-						style: {
-							backgroundColor: '#999999'
-						},
-					}, {
-						text: '提醒',
-						style: {
-							backgroundColor: '#f0ad4e'
-						}
-					}
-				]
+        tableUserFrom: [],
 			}
 		},
+    created() {
+      this.getDict()
+    },
 		methods:{
+      getDict() {
+        getDict('table_user_from').then(res => {
+          this.tableUserFrom = res.data
+        })
+      },
       /** 详情页跳转*/
       toNav(id, nodeId) {
         uni.navigateTo({

pages/approval/myapproval.vue

@@ -3,10 +3,10 @@
 				<uni-swipe-action>
           <ul>
             <li v-for="(item,index) in list" :key="index"  class="my_approval_li">
-              <uni-swipe-action-item :right-options="options"  @click="bindClick($event,item.eventId)" @change="swipeChange($event, index)">
+              <uni-swipe-action-item @click="bindClick($event,item.eventId)" @change="swipeChange($event, index)">
                 <view class="my_approval_item" @click="toNav(item.instanceId, item.nodeId)">
                   <h3 class="my_approval_title">
-                    <text>[{{item.businessTypeName}}]--{{item.createUserName}}</text>
+                    <text>[{{tableUserFrom.find(dictItem => dictItem.dictValue === item.processType).dictLabel}}]--{{item.createUserName}}</text>
                     <text class="approval_title_right">{{item.status === '10' ? '待审批' :item.status === '2' ? '已审批':item.status === '5' ? '驳回' : ''}}</text>
                   </h3>
 
@@ -23,6 +23,7 @@
 </template>
 
 <script>
+  import {getDict} from "@/api/system/dict";
 	export default{
     props: {
       list: {
@@ -34,41 +35,18 @@
     },
 		data() {
 			return {
-				myApprovalList:[{
-					type:"请假",
-					name:"张三",
-					reason:"家里有事",
-					stateName:"已办",
-					state:'0',
-					department:"研发部",
-					time:'2021-10-14',
-					eventId:'201'
-				},{
-					type:"调休",
-					name:"李四",
-					reason:"家里有事",
-					stateName:"已办",
-					state:'1',
-					department:"研发部",
-					time:'2021-10-14',
-					eventId:'202'
-				}],
-				options:[
-					{
-						text: '驳回',
-						style: {
-							backgroundColor: '#dd524d'
-						},
-					}, {
-						text: '同意',
-						style: {
-							backgroundColor: '#007aff'
-						}
-					}
-				]
+        tableUserFrom: [],
 			}
 		},
+    created() {
+      this.getDict()
+    },
 		methods:{
+      getDict() {
+        getDict('table_user_from').then(res => {
+          this.tableUserFrom = res.data
+        })
+      },
       /** 详情页跳转*/
       toNav(id, nodeId) {
         uni.navigateTo({

pages/classes/classesInfo.vue

@@ -9,30 +9,24 @@
         <uni-forms ref="baseForm" :modelValue="classesForm" label-position="left" label-width="120">
           <uni-forms-item label="部门" required>
             <uni-data-picker v-model="classesForm.deptId" :map="{value: 'deptId', text: 'deptName'}" :localdata="deptTree" popup-title="请选择部门" @change="onchange"></uni-data-picker>
-            <text class="beforeValue">部门2</text>
           </uni-forms-item>
           <uni-forms-item label="产线" required>
             <uni-data-picker v-model="classesForm.productId" :map="{value: 'productId', text: 'productName'}" :localdata="productTree" popup-title="请选择产线" @change="onchange"></uni-data-picker>
-            <text class="beforeValue">产线2</text>
           </uni-forms-item>
           <uni-forms-item label="是否跨天" required>
             <uni-data-checkbox v-model="classesForm.isTwodays" style="float: right;margin-top: 5px;" :localdata="towDayMap"></uni-data-checkbox>
           </uni-forms-item>
           <uni-forms-item label="开始时间" required>
             <uni-datetime-picker type="date" :clear-icon="false" v-model="classesForm.startDate" placeholder="请选择开始时间" />
-            <text class="beforeValue">2024-03-01</text>
           </uni-forms-item>
           <uni-forms-item label="结束时间" required>
             <uni-datetime-picker type="date" :clear-icon="false" v-model="classesForm.endDate" placeholder="请选择结束时间" />
-            <text class="beforeValue">2024-03-11</text>
           </uni-forms-item>
           <uni-forms-item label="权重" required>
             <uni-easyinput type="number" disabled v-model="classesForm.weight" placeholder="请输入权重" />
-            <text class="beforeValue">3</text>
           </uni-forms-item>
           <uni-forms-item label="版本" required>
             <uni-easyinput v-model="classesForm.version" disabled placeholder="请输入版本" />
-            <text class="beforeValue">2</text>
           </uni-forms-item>
         </uni-forms>
         <button type="primary" @click="submit('baseForm')">提交</button>

pages/classes/index.vue

@@ -5,7 +5,9 @@
         <li v-for="(item,index) in myApprovalList" :key="index"  class="my_approval_li">
           <uni-swipe-action-item @click="bindClick($event,item.businessId)" @change="swipeChange($event, index)">
             <view class="my_approval_item">
-              <h3 class="my_approval_title"><text>[{{item.classesName}}]--{{item.classesName}}</text> <text @click="toNav(item.businessId)" class="approval_title_right">{{'修改'}}</text></h3>
+              <h3 class="my_approval_title">
+                <text>{{item.classesName}}</text>
+                <text @click="toNav(item.businessId)" class="approval_title_right">{{'修改'}}</text></h3>
               <view class="my_approval_info">
                 <text>{{item.classesName}}</text>
                 <text class="approval_info_right">{{item.createDate}}</text>
@@ -21,6 +23,7 @@
 
 <script>
 import {queryAeClassesInfos} from "@/api/system/classes";
+import {getDict} from "@/api/system/dict";
 
 export default{
   data() {

pages/document/index.vue

@@ -93,7 +93,7 @@ export default{
   methods:{
     /** 详情页跳转*/
     toNav(id, nodeId, item) {
-      if (item.status === '3') {
+      if (item.status === '5') {
         if (item.businessType === '1001') {
           uni.navigateTo({
             url: `/pages/classes/classesInfo?businessId=${item.businessDocumentId}`,