药剂类型

pages/workflowTask/approveCenter/approveList.js

@@ -79,6 +79,13 @@ export default {
             this.queryParam['processStatus'] = val||undefined
             this.handlePullDownRefresh()
         }
+      },
+	  medicineType:{
+        handler: function (val) {
+            console.log('改变',val)
+            this.queryParam['medicineType'] = val||undefined
+            this.handlePullDownRefresh()
+        }
       }
 	},
 	props: {
@@ -99,7 +106,10 @@ export default {
 			type: String
 		},
         processStatus: {
-			type: Number
+			type: Number | String
+		},  
+		medicineType: {
+			type: Number | String
 		},
 	}
 }

pages/workflowTask/approveCenter/ccList.vue

@@ -18,6 +18,7 @@
 					<di-descriptions-item label="流程单号" :value="item.processNo" :ellipsis="true"/>
                     <di-descriptions-item label="申请人" :value="item.applyUserName" :ellipsis="true"/>
                     <di-descriptions-item label="申请时间" :value="item.applyTime" :ellipsis="true"/>
+					<di-descriptions-item label="药剂类型" :value="item.medicineTypeName" :ellipsis="true"/>
 					<u-row style="justify-content: flex-end;">
 					    <u-col :span="2">
 					      <u-button type="primary" plain size="mini"  @click="handleRead(item.id, 'read')">已读</u-button>

pages/workflowTask/approveCenter/doneList.vue

@@ -16,6 +16,7 @@
                     <di-descriptions-item label="申请时间" :value="item.applyTime" :ellipsis="true"/>
                     <di-descriptions-item label="已办节点" :value="item.name" :ellipsis="true"/>
                     <di-descriptions-item label="办结时间" :value="item.endTime" :ellipsis="true"/>
+					<di-descriptions-item label="药剂类型" :value="item.medicineTypeName" :ellipsis="true"/>
 				</di-descriptions>
 			</u-swipe-action>
 		</view>

pages/workflowTask/approveCenter/index.vue

@@ -20,22 +20,26 @@
 			input-align="center"
 			/>
             <!-- 添加条件 -->
-            <u-cell-group class="approve-search-options" v-if="type==='myLaunch'">
-                <u-cell-item title="申请时间" @click="calendarShow=true" :value="applyTimeName"></u-cell-item>
-                <u-cell-item title="所属流程" @click="processInstanceShow=true" :value="processDefinitionName"></u-cell-item>
-                <u-cell-item title="流程状态" @click="processStatusShow=true" :value="processStatusName"></u-cell-item>
+            <u-cell-group class="approve-search-options" >
+				<template v-if="type==='myLaunch'">
+					<u-cell-item title="申请时间" @click="calendarShow=true" :value="applyTimeName"></u-cell-item>
+					<u-cell-item title="所属流程" @click="processInstanceShow=true" :value="processDefinitionName"></u-cell-item>
+					<u-cell-item title="流程状态" @click="processStatusShow=true" :value="processStatusName"></u-cell-item>
+				</template>
+				<u-cell-item v-if="type!='manager'" title="药剂类型" @click="medicineTypeShow=true" :value="medicineTypeName"></u-cell-item>
             </u-cell-group>
             <u-calendar v-model="calendarShow" mode="range" @change="calendarChange"></u-calendar>
             <u-select v-model="processInstanceShow" :list="processInstancelist" @confirm="processInstanceConfirm"></u-select>
             <u-select v-model="processStatusShow" :list="processStatusList" @confirm="processStatusConfirm"></u-select>
+            <u-select v-model="medicineTypeShow" :list="medicineTypeList" @confirm="medicineTypeConfirm"></u-select>
             <!-- <u-button type="primary" size="mini" style="width: 100%;margin: 2px;">重置</u-button> -->
         </view>
 		<view class="approve-list">
-			<todo-list :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" :type="type" v-if="type === 'todo'"/>
-			<done-list :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" :type="type" v-else-if="type === 'done'"/>
-			<cc-list :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" :type="type" v-else-if="type === 'cc'"/>
-			<manager-list :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" :type="type" v-else-if="type === 'manager'"/>
-			<launch-list :processStatus="processStatus" :processDefinitionName="processDefinitionName" :applyTime="applyTime" :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" :type="type" v-else/>
+			<todo-list :approve-list-height="approveListHeight" :medicineType="medicineType" :search-key-word="searchKeyWord" :type="type" v-if="type === 'todo'"/>
+			<done-list :approve-list-height="approveListHeight" :medicineType="medicineType" :search-key-word="searchKeyWord" :type="type" v-else-if="type === 'done'"/>
+			<cc-list :approve-list-height="approveListHeight" :medicineType="medicineType" :search-key-word="searchKeyWord" :type="type" v-else-if="type === 'cc'"/>
+			<manager-list :approve-list-height="approveListHeight" :medicineType="medicineType" :search-key-word="searchKeyWord" :type="type" v-else-if="type === 'manager'"/>
+			<launch-list :processStatus="processStatus" :medicineType="medicineType" :processDefinitionName="processDefinitionName" :applyTime="applyTime" :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" :type="type" v-else/>
 		</view>
 	</view>
 </template>
@@ -69,6 +73,7 @@
                 calendarShow: false,
                 processInstanceShow:false,
                 processStatusShow:false,
+                medicineTypeShow:false,
                 
                 applyTime:[],//申请时间
                 applyTimeName:'',
@@ -76,6 +81,8 @@
                 processInstancelist:[],//流程列表
                 processStatus:'',//流程状态
                 processStatusName:'',//流程状态名称
+                medicineType:'',//药剂类型
+                medicineTypeName:'',//药剂类型
                 // 流程状态：1.进行中、2.已完成、3.已撤销、4.不通过
                 processStatusList:[
                     { label: '全部', value: undefined },
@@ -83,7 +90,8 @@
                     { label: '已完成', value: 2 },
                     { label: '已撤销', value: 3 },
                     { label: '不通过', value: 4 },
-                ]
+                ],
+				medicineTypeList: [],//药剂类型列表
 			};
 		},
         created() {
@@ -101,6 +109,7 @@
                         })
                         this.processInstancelist.unshift({ label: '全部', value: undefined })
                     })
+					this.getdictlist()
 		},
 		computed: {
 			approveListHeight() {
@@ -114,7 +123,26 @@
 			}
 		},
 		methods: {
-            processStatusConfirm(e){
+			 getdictlist() {
+					dibootApi.get(
+						'/system/system/dict/data/type/medicine_type',
+						{ dictType: 'medicine_type' }
+					).then(res => {
+						this.medicineTypeList = res.data.map((e) => {
+							return {
+								label: e.dictLabel,
+								value: e.dictValue,
+							}
+						})
+						this.medicineTypeList.unshift({ label: '全部', value: undefined })
+					})
+			},
+            medicineTypeConfirm(e){
+                console.log('e',e)
+                this.medicineType=e[0].value
+                this.medicineTypeName=e[0].label
+            },
+			processStatusConfirm(e){
                 console.log('e',e)
                 this.processStatus=e[0].value
                 this.processStatusName=e[0].label

pages/workflowTask/approveCenter/launchList.vue

@@ -21,6 +21,7 @@
 					<di-descriptions-item label="当前节点" :value="item.taskDefName" :ellipsis="true"/>
 					<di-descriptions-item label="申请人" :value="item.applyUserName" :ellipsis="true"/>
 					<di-descriptions-item label="申请时间" :value="item.applyTime" :ellipsis="true"/>
+					<di-descriptions-item label="药剂类型" :value="item.medicineTypeName" :ellipsis="true"/>
 
 
                     <u-row style="justify-content: flex-end;">

pages/workflowTask/approveCenter/todoList.vue

@@ -20,6 +20,7 @@
                     <di-descriptions-item label="待办节点" :value="item.name" :ellipsis="true"/>
                     <di-descriptions-item label="提交人" :value="item.applyUserName" :ellipsis="true"/>
                     <di-descriptions-item label="申请时间" :value="item.applyTime" :ellipsis="true"/>
+					<di-descriptions-item label="药剂类型" :value="item.medicineTypeName" :ellipsis="true"/>
 				</di-descriptions>
 			</u-swipe-action>
 		</view>

utils/constant.js

@@ -10,7 +10,7 @@ const ENV = 'dev'
 const BASE_URL = '/wf-api'
 let server_url = window.location.host
 if(process.env.NODE_ENV === 'development'){
-    server_url = 'tq.5000v.com:8035'
+    server_url = '192.168.31.113'
 }
 
 // 后端多环境配置