From b3b07ef3df21910036a0d82ac96354adb60125f2 Mon Sep 17 00:00:00 2001
From: guoweilong <mo@mddzwhfgs.wecom.work>
Date: Thu, 6 Jun 2024 13:06:23 +0800
Subject: [PATCH] feat:流程问题

---
 App.vue                                        |   1 +
 api/auth.js                                    |   2 ++
 common/config.js                               |   4 ++--
 components/popUpComponent/popUpComponent.vue   |  20 --------------------
 components/popUpFillIn/popUpFillIn.vue         | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
 main.js                                        |   6 ++++++
 pages/charge/constructionMaintenance/index.vue |  16 +++++++++++-----
 pages/charge/ignitionMaintenance/index.vue     |   4 ++--
 pages/charge/visitsAndFees/createaVisit.vue    |   2 +-
 pages/charge/visitsAndFees/index.vue           |  25 ++++++++++++++++---------
 pages/login/workbench.vue                      |   4 ++--
 static/images/icon/charge.png                  | Bin 0 -> 1903 bytes
 static/images/icon/insight.png                 | Bin 0 -> 2175 bytes
 store/getters.js                               |   5 +++++
 store/mudules/user.js                          |  83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 utils/constant.js                              |   8 ++++++++
 utils/permission.js                            | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 utils/storage.js                               |  32 ++++++++++++++++++++++++++++++++
 18 files changed, 440 insertions(+), 91 deletions(-)
 create mode 100644 static/images/icon/charge.png
 create mode 100644 static/images/icon/insight.png
 create mode 100644 utils/constant.js
 create mode 100644 utils/permission.js
 create mode 100644 utils/storage.js

diff --git a/App.vue b/App.vue
index e9837fe..8274a37 100644
--- a/App.vue
+++ b/App.vue
@@ -18,6 +18,7 @@
     },
     onShow: function() {
       console.log(this);
+      this.$store.dispatch('GetInfo')
       let workName = uni.getStorageSync('tabName');
       this.$store.dispatch('setTab', {data: workName});
       uni.hideTabBar();
diff --git a/api/auth.js b/api/auth.js
index 6366a81..2d150e6 100644
--- a/api/auth.js
+++ b/api/auth.js
@@ -39,6 +39,8 @@ export const smsLogin = data => http.post('/member/auth/sms-login', data)
 export const weixinMiniAppLogin = data => http.post('/member/auth/weixin-mini-app-login', data)
 // 获取验证码
 export const getCodeImg = params => http.get('/captchaImage')
+
+export const getInfo = params => http.get('/system/user/getInfo')
 //刷新令牌
 export const refreshToken = data => http.post('/member/auth/refresh-token', {
   data
diff --git a/common/config.js b/common/config.js
index 8de31b6..94d44c8 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,8 +1,8 @@
 module.exports = {
   //后端接口地址
   // baseUrl: 'http://10.11.38.240:9001', //内网开发环境
-  // baseUrl: 'http://192.168.0.8:8001', //内网开发环境
-  baseUrl: 'http://hqpnzc.natappfree.cc', //内网穿透开发环境
+  baseUrl: 'http://192.168.0.8:8001', //内网开发环境
+  // baseUrl: 'http://hqpnzc.natappfree.cc', //内网穿透开发环境
   // baseUrl: 'http://172.17.56.37:18082/api', //测试环境
   // baseUrl: 'http://172.17.56.16:18082/api', //ip正式环境
   // baseUrl: 'https://scdcapp.chinagasholdings.com/api', //域名正式环境
diff --git a/components/popUpComponent/popUpComponent.vue b/components/popUpComponent/popUpComponent.vue
index 63071b1..1b9fa5a 100644
--- a/components/popUpComponent/popUpComponent.vue
+++ b/components/popUpComponent/popUpComponent.vue
@@ -88,26 +88,6 @@
           }
         }
 
-        if (this.publishStatus === 'PENDING_LEVEL_1_AUDIT') {
-          const result = await submitAuditOne(data);
-          if (result.code === 200) {
-            that.$emit('getList');
-            uni.$u.toast(`${this.title}成功`)
-          } else {
-            uni.$u.toast(result.msg)
-          }
-        }
-
-        if (this.publishStatus === 'PENDING_LEVEL_2_AUDIT') {
-          const result = await submitAuditTwo(data);
-          if (result.code === 200) {
-            that.$emit('getList');
-            uni.$u.toast(`${this.title}成功`)
-          } else {
-            uni.$u.toast(result.msg)
-          }
-        }
-
         if (this.publishStatus === 'APPROVED' && this.modificationStatus === 'PENDING_LEVEL_1_AUDIT') {
           const result = await submitModificationOne(data);
           if (result.code === 200) {
diff --git a/components/popUpFillIn/popUpFillIn.vue b/components/popUpFillIn/popUpFillIn.vue
index e1f9949..bbeb6fa 100644
--- a/components/popUpFillIn/popUpFillIn.vue
+++ b/components/popUpFillIn/popUpFillIn.vue
@@ -26,12 +26,22 @@
                 </u-radio-group>
               </view>
             </u-form-item>
+
+            <!-- 运营维护 -->
+            <u-form-item v-if="type==='yywh'" required label="是否通气到表前" labelWidth="100">
+              <view class="flex justify-between margin-tb w100">
+                <u-radio-group activeColor="#EA5504" placement="row" v-model="radiovalueYYWH" @change="YYchange">
+                  <u-radio class="margin-right" name="是">是</u-radio>
+                  <u-radio name="否">否</u-radio>
+                </u-radio-group>
+              </view>
+            </u-form-item>
             <view class="usuallyCard padding margin-bottom-sm">
               <view class="margin-tb text-lg" v-if="dhShow && gcShow">
                 基本维护
               </view>
               <!-- 点火维护 -->
-              <u-form-item v-if="type==='dhwh' && dhShow" required label="点火时间" labelWidth="100" borderBottom>
+              <u-form-item v-if="type==='dhwh'" required label="点火时间" labelWidth="100" borderBottom>
                 <u-input v-model="model.ignTime" placeholder="请选择" disabled disabledColor="#fff"
                   border="none"></u-input>
                 <u-icon slot="right" name="calendar" size="20" @click="datetimeShow = true"></u-icon>
@@ -39,20 +49,35 @@
               <u-form-item v-if="type==='dhwh'" required label="未点火原因" labelWidth="100" borderBottom>
                 <u-input v-model="model.nIgnRsn" placeholder="请选择" disabled disabledColor="#fff"
                   border="none"></u-input>
-                <u-icon slot="right" name="arrow-down" size="20" @click="handleIgnition"></u-icon>
+                <u-icon slot="right" name="arrow-down" size="20" @click="handleIgnition('sys_mc_ignition_rsn')"></u-icon>
               </u-form-item>
+
               <!-- 工程维护 -->
-              <u-form-item v-if="type==='gcwh' && gcShow" required label="市场派单时间" labelWidth="100" borderBottom>
-                <u-input v-model="model.time" placeholder="请选择" disabled disabledColor="#fff" border="none"></u-input>
-                <u-icon slot="right" name="calendar" size="20" @click="datetimeShow = true"></u-icon>
+              <u-form-item v-if="type==='gcwh'" required label="市场派单时间" labelWidth="100" borderBottom>
+                <u-input v-model="model.assignmentTime" placeholder="请选择" disabled disabledColor="#fff" border="none"></u-input>
+                <u-icon slot="right" name="calendar" size="20" @click="multipleChange('assignmentTime')"></u-icon>
               </u-form-item>
-              <u-form-item v-if="type==='gcwh' && gcShow" required label="竣工时间" labelWidth="100" borderBottom>
-                <u-input v-model="model.time" placeholder="请选择" disabled disabledColor="#fff" border="none"></u-input>
-                <u-icon slot="right" name="calendar" size="20" @click="datetimeShow = true"></u-icon>
+              <u-form-item v-if="type==='gcwh'" required label="竣工时间" labelWidth="100" borderBottom>
+                <u-input v-model="model.completionTime" placeholder="请选择" disabled disabledColor="#fff" border="none"></u-input>
+                <u-icon slot="right" name="calendar" size="20" @click="multipleChange('completionTime')"></u-icon>
               </u-form-item>
               <u-form-item v-if="type==='gcwh'" required label="未竣工原因" labelWidth="100" borderBottom>
-                <u-input v-model="model.reason" placeholder="请选择" disabled disabledColor="#fff" border="none"></u-input>
-                <u-icon slot="right" name="arrow-down" size="20"></u-icon>
+                <u-input v-model="model.nonNcmpRsn" placeholder="请选择" disabled disabledColor="#fff" border="none"></u-input>
+                <u-icon slot="right" name="arrow-down" size="20" @click="handleIgnition('sys_mc_construction_kb_rsn')"></u-icon>
+              </u-form-item>
+
+              <!-- 运营维护 -->
+              <u-form-item v-if="type==='yywh'" required label="市场派单时间" labelWidth="100" borderBottom>
+                <u-input v-model="model.assignmentTime" placeholder="请选择" disabled disabledColor="#fff" border="none"></u-input>
+                <u-icon slot="right" name="calendar" size="20" @click="multipleChange('assignmentTime')"></u-icon>
+              </u-form-item>
+              <u-form-item v-if="type==='yywh'" required label="通气到到表前时间" labelWidth="100" borderBottom>
+                <u-input v-model="model.gctMtrrisTime" placeholder="请选择" disabled disabledColor="#fff" border="none"></u-input>
+                <u-icon slot="right" name="calendar" size="20" @click="multipleChange('gctMtrrisTime')"></u-icon>
+              </u-form-item>
+              <u-form-item v-if="type==='yywh'" required label="未完成原因" labelWidth="100" borderBottom>
+                <u-input v-model="model.gctNcmpRsn" placeholder="请选择" disabled disabledColor="#fff" border="none"></u-input>
+                <u-icon slot="right" name="arrow-down" size="20" @click="handleIgnition('sys_mc_construction_yy_rsn')"></u-icon>
               </u-form-item>
             </view>
           </view>
@@ -77,7 +102,9 @@
 
 <script>
   import {
-    mcIgnitionMaintenance
+    mcIgnitionMaintenance,
+    mcConstructionEngineering,
+    mcConstructionOperation
   } from "@/api/charge.js"
   export default {
     name: "popUpComponent",
@@ -102,6 +129,7 @@
         dataTimeValue: Number(new Date()),
         radiovalueDHWH: "",
         radiovalueGCWH: "",
+        radiovalueYYWH:"",
         model: {
           ignTime: "",
           nIgnRsn: ""
@@ -111,6 +139,8 @@
         columns: [],
         dhShow: true,
         gcShow: true,
+        yyShow:true,
+        currentName:"",
       };
     },
     methods: {
@@ -120,8 +150,7 @@
       close() {
         this.show = false;
       },
-      handleIgnition() {
-        let dict = 'sys_mc_ignition_rsn';
+      handleIgnition(dict) {
         let dictArr = this.getDictDatas(dict);
         this.columns = [dictArr];
         console.log("未点火原因", this.columns);
@@ -142,65 +171,145 @@
             uni.$u.toast('请选择未点火原因');
             return
           }
-          let data = {
-            id: this.IgnitionID,
-            ignCnfStatusCode: this.radiovalueDHWH === '是' ? 'Y' : 'N',
-            nIgnRsn: this.model.nIgnRsn,
-            ignTime: this.model.ignTime
-          }
-          console.log(this.radiovalueGCWH);
-          console.log("点火数据", data);
-          const result = await mcIgnitionMaintenance(data);
-          if (result.code === 200) {
-            uni.$u.toast('提交成功');
-            this.$emit('getList');
-          } else {
-            uni.$u.toast(result.msg)
-          }
+          this.submitDh()
         }
-
         if (this.type === 'gcwh') {
           if (!this.radiovalueGCWH) {
             uni.$u.toast('请选择是否竣工');
             return
           }
-          // let data = {
-          //   id: this.IgnitionID,
-          //   ignCnfStatusCode: this.radiovalueGCWH === '是' ? 'Y' : 'N',
-          //   nIgnRsn: this.model.nIgnRsn,
-          //   ignTime: this.model.ignTime
-          // }
-          // console.log(this.radiovalueGCWH);
-          // console.log("点火数据", data);
-          // const result = await mcIgnitionMaintenance(data);
-          // if (result.code === 200) {
-          //   uni.$u.toast('提交成功');
-          //   this.$emit('getList');
-          // } else {
-          //   uni.$u.toast(result.msg)
-          // }
+          if (!this.model.assignmentTime && this.radiovalueGCWH === '是') {
+            uni.$u.toast('选择市场派单时间');
+            return
+          }
+          if (!this.model.completionTime && this.radiovalueGCWH === '是') {
+            uni.$u.toast('请选择市场竣工时间');
+            return
+          }
+          if (!this.model.nonNcmpRsn) {
+            uni.$u.toast('请选择竣工原因');
+            return
+          }
+          this.submitGc()
+        }
+
+        if (this.type === 'yywh') {
+          if (!this.radiovalueYYWH) {
+            uni.$u.toast('请选择是否通气到列表前');
+            return
+          }
+          if (!this.model.assignmentTime && this.radiovalueYYWH === '是') {
+            uni.$u.toast('选择市场派单时间');
+            return
+          }
+          if (!this.model.gctMtrrisTime && this.radiovalueGCWH === '是') {
+            uni.$u.toast('请选择通气到表前时间');
+            return
+          }
+          if (!this.model.gctNcmpRsn) {
+            uni.$u.toast('请选择未完成原因');
+            return
+          }
+          this.submitYy()
         }
         this.show = false;
       },
+      async submitDh(){
+        let data = {
+          id: this.IgnitionID,
+          ignCnfStatusCode: this.radiovalueDHWH === '是' ? 'Y' : 'N',
+          nIgnRsn: this.model.nIgnRsn,
+          ignTime: this.model.ignTime
+        }
+        console.log(this.radiovalueGCWH);
+        console.log("点火数据", data);
+        const result = await mcIgnitionMaintenance(data);
+        if (result.code === 200) {
+          uni.$u.toast('提交成功');
+          this.$emit('getList');
+          this.model = {}
+        } else {
+          uni.$u.toast(result.msg)
+        }
+      },
+      async submitGc(){
+        let data = {
+          id: this.IgnitionID,
+          isCompleted: this.radiovalueGCWH === '是' ? 'Y' : 'N',
+          assignmentTime: this.model.assignmentTime,
+          completionTime: this.model.completionTime,
+          nonNcmpRsn: this.model.nonNcmpRsn
+        }
+        console.log(this.radiovalueGCWH);
+        console.log("工程数据", data);
+        const result = await mcConstructionEngineering(data);
+        if (result.code === 200) {
+          uni.$u.toast('提交成功');
+          this.$emit('getList');
+          this.model = {}
+        } else {
+          uni.$u.toast(result.msg)
+        }
+      },
+      async submitYy(){
+        let data = {
+          id: this.IgnitionID,
+          gasConnMtrRis: this.radiovalueYYWH === '是' ? 'Y' : 'N',
+          assignmentTime: this.model.assignmentTime,
+          gctMtrrisTime: this.model.gctMtrrisTime,
+          gctNcmpRsn:this.model.gctNcmpRsn
+        }
+        console.log("运营数据", data);
+        const result = await mcConstructionOperation(data);
+        if (result.code === 200) {
+          uni.$u.toast('提交成功');
+          this.$emit('getList');
+          this.model = {}
+        } else {
+          uni.$u.toast(result.msg)
+        }
+      },
       DHchange(e) {
         console.log(e);
         if (e === '是') {
           this.dhShow = true
         } else {
-          this.dhShow = false
+          this.dhShow = false;
+          this.model = {}
         }
       },
       GCchange(e) {
         if (e === '是') {
           this.gcShow = true
         } else {
-          this.gcShow = false
+          this.gcShow = false;
+          this.model = {}
+        }
+      },
+      YYchange(e){
+        if (e === '是') {
+          this.yyShow = true
+        } else {
+          this.yyShow = false;
+          this.model = {}
         }
       },
+      multipleChange(name){
+        this.currentName = name;
+        this.datetimeShow = true;
+      },
       pickerConfirm(e) {
         console.log(e);
         let data = e.value[0].value;
-        this.model.nIgnRsn = data;
+        if(this.type === 'dhwh'){
+          this.model.nIgnRsn = data;
+        }
+        if(this.type === 'gcwh'){
+          this.model.nonNcmpRsn = data;
+        }
+        if(this.type === 'yywh'){
+          this.model.gctNcmpRsn = data;
+        }
         this.pickerShow = false;
       },
       confirmCalender(e) {
@@ -210,7 +319,17 @@
       },
       dateConfirm(e) {
         let time = this.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss');
-        this.model.ignTime = time;
+        if(this.type === 'dhwh'){
+          this.model.ignTime = time;
+        }
+        if(this.type === 'gcwh'){
+          this.model[this.currentName] = time;
+          // this.model.nonNcmpRsn = data;
+        }
+        if(this.type === 'yywh'){
+          this.model[this.currentName] = time;
+          // this.model.gctNcmpRsn = data;
+        }
         this.datetimeShow = false;
       },
       closeCalender() {
diff --git a/main.js b/main.js
index c0aadae..a6d3a78 100644
--- a/main.js
+++ b/main.js
@@ -7,6 +7,7 @@ import echarts from '@/components/echarts-uniapp/echarts-uniapp.vue';
 import Navbar from '@/components/Navbar/index.vue'
 import TabBar from '@/components/tabBar/tabBar.vue'
 import plugins from './plugins' // plugins
+import { checkPermi, checkDeptPermi, checkDeptRolePermi } from '@/utils/permission'
 import { numberToCurrencyNo, formatTime, goBack, formatDictLabel,assignValues } from "@/utils/ruoyi";
 import G_show_modal from '@/js_sdk/g-gShowModal/components/G_show_modal/g_show_modal.js'
 
@@ -38,6 +39,11 @@ Vue.prototype.$store = store
 Vue.prototype.getDictDatas = getDictDatas
 Vue.prototype.getDictDatas2 = getDictDatas2
 Vue.prototype.getDictDataLabel = getDictDataLabel
+Vue.prototype.$checkPermi = checkPermi
+Vue.prototype.$checkDeptPermi = checkDeptPermi
+Vue.prototype.$checkDeptRolePermi = checkDeptRolePermi
+
+
 Vue.prototype.$dayjs = dayjs
 Vue.prototype.DICT_TYPE = DICT_TYPE
 Vue.prototype.$isDing = dDingJudgeEnvPlatform()
diff --git a/pages/charge/constructionMaintenance/index.vue b/pages/charge/constructionMaintenance/index.vue
index f4453c6..a3060c0 100644
--- a/pages/charge/constructionMaintenance/index.vue
+++ b/pages/charge/constructionMaintenance/index.vue
@@ -23,7 +23,7 @@
 						<text class="text-grey margin-right-xs">项目公司:</text>{{item.companyName || '--'}}
 					</view>
 					<view class="flex">
-						<u-tag bgColor="#EFF1FD" borderColor="#fff" color="#5875EE" size="mini" text="待审批"></u-tag>
+						<!-- <u-tag bgColor="#EFF1FD" borderColor="#fff" color="#5875EE" size="mini" text="待审批"></u-tag> -->
 					</view>
 				</view>
         <view class="margin-top-sm">
@@ -37,17 +37,20 @@
 				<view class="margin-right" @click="handleDetail(item)">
 					<u-button shape="circle">查看详情</u-button>
 				</view>
-				<view class="" @click="handleOpen(item)">
+				<view class="margin-right" @click="handleOpen(item,'gcwh')" v-if="item.isCompleted === 'N' ">
 					<u-button shape="circle" color="#CF000D">工程维护</u-button>
 				</view>
+        <view class="" @click="handleOpen(item,'yywh')"  v-if="item.gasConnMtrRis == 'N'">
+        	<u-button shape="circle" color="#CF000D">运营维护</u-button>
+        </view>
 			</view>
 			<!-- <view class="nodeCss">
 				当前审批节点：项目公司_市场负责人
 			</view> -->
 		</view>
     <u-loadmore :status="status" v-if="list.length > 0" />
-    <u-empty text="暂无资讯" icon="/static/images/icon/nodata.png" v-else></u-empty>
-    <popUpFillIn :type="btnType" title="工程维护" ref="popUpFillInRef"></popUpFillIn>
+    <u-empty text="暂无数据" icon="/static/images/icon/nodata.png" v-else></u-empty>
+    <popUpFillIn :IgnitionID="IgnitionID" :type="btnType" title="工程维护" ref="popUpFillInRef" @getList="initData"></popUpFillIn>
 		<TabBar :currentPagePath="this.$route.meta.pagePath"></TabBar>
 	</view>
 </template>
@@ -84,6 +87,7 @@
 				status: "loadmore",
 				list: [],
 				total: null,
+        IgnitionID:0,
 			}
 		},
 		computed: {
@@ -136,7 +140,9 @@
           url: '/pages/charge/constructionMaintenance/detail?objData=' + JSON.stringify(item)
         })
       },
-      handleOpen(){
+      handleOpen(item,type){
+        this.IgnitionID = item.id;
+        this.btnType = type;
         this.$refs.popUpFillInRef.open();
       }
 		}
diff --git a/pages/charge/ignitionMaintenance/index.vue b/pages/charge/ignitionMaintenance/index.vue
index 6e23e4e..c98d434 100644
--- a/pages/charge/ignitionMaintenance/index.vue
+++ b/pages/charge/ignitionMaintenance/index.vue
@@ -41,7 +41,7 @@
         <view class="margin-right" @click="handleDetail(item)">
           <u-button shape="circle">查看详情</u-button>
         </view>
-        <view class="" @click="handleOpen(item)">
+        <view class="" @click="handleOpen(item)" v-if="item.statusCode !== 'MAINTENANCE_YES' && item.statusCode !== 'CANCEL'">
           <u-button shape="circle" color="#CF000D">点火维护</u-button>
         </view>
       </view>
@@ -50,7 +50,7 @@
 			</view> -->
     </view>
     <u-loadmore :status="status" v-if="list.length > 0" />
-    <u-empty text="暂无资讯" icon="/static/images/icon/nodata.png" v-else></u-empty>
+    <u-empty text="暂无数据" icon="/static/images/icon/nodata.png" v-else></u-empty>
 
     <popUpFillIn :IgnitionID="IgnitionID" type="dhwh" title="点火维护" ref="popUpFillInRef" @getList="initData">
     </popUpFillIn>
diff --git a/pages/charge/visitsAndFees/createaVisit.vue b/pages/charge/visitsAndFees/createaVisit.vue
index 44683d2..d440225 100644
--- a/pages/charge/visitsAndFees/createaVisit.vue
+++ b/pages/charge/visitsAndFees/createaVisit.vue
@@ -1054,7 +1054,7 @@
         that.$refs.uForm.validate().then(res => {
           that.$modal.confirm('确认发起异动?', '温馨提示').then(async () => {
             let data = {
-              id: 60,
+              id: that.copyModel.id,
               userIdCard: that.copyModel.userIdCard,
               invoiceNo: that.copyModel.invoiceNo,
               chargeAmt: that.copyModel.chargeAmt,
diff --git a/pages/charge/visitsAndFees/index.vue b/pages/charge/visitsAndFees/index.vue
index 3594028..54bb676 100644
--- a/pages/charge/visitsAndFees/index.vue
+++ b/pages/charge/visitsAndFees/index.vue
@@ -10,8 +10,8 @@
     </u-navbar>
     <view class="flex justify-between align-center padding-sm bg-white">
       <view class="w70">
-        <u-search v-model="keyword" bgColor="#fff" borderColor="#EC1E19" :clearabled="true" placeholder="请输入工单编号/户名"
-          :actionStyle="actionStyle" @custom="onSearch"></u-search>
+        <u-search v-model="keyword" bgColor="#fff" borderColor="#EC1E19" :clearabled="true" placeholder="请输入户名"
+          :actionStyle="actionStyle" @custom="onSearch" @clear="onClear"></u-search>
       </view>
       <view class="w30 margin-left">
         <u-checkbox-group activeColor="#EC1E19" v-model="approvalValue" placement="column" @change="checkboxChange">
@@ -67,7 +67,7 @@
         <view class="margin-left-sm">
           <zb-popover placement="bottom-start" theme="dark" ref="Popover1" class="item-popover">
             <view slot="content" class="popoverCss">
-              <view class="" v-if="item.statusCode === 'APPROVED' && item.publishStatus === 'APPROVED'">
+              <view class="" v-if="item.statusCode === 'APPROVED' && item.publishStatus === 'APPROVED' && item.isCharged === 'Y'">
                 <view class="margin-tb-xs" @click="dataChange(item)">数据异动</view>
                 <u-line></u-line>
               </view>
@@ -87,16 +87,16 @@
             <u-button shape="circle">更多操作</u-button>
           </zb-popover>
         </view>
-        <view class="margin-left-sm" @click="handleEdit(item)" v-if="item.statusCode === 'EDITING'">
+        <view class="margin-left-sm" @click="handleEdit(item)" v-if="item.statusCode === 'EDITING' && $checkPermi(['schsf:mcVisit:edit'])">
           <u-button shape="circle" type="primary">修改</u-button>
         </view>
-        <view class="margin-left-sm" @click="handleDetail(item)">
+        <view class="margin-left-sm" @click="handleDetail(item)" >
           <u-button shape="circle">查看详情</u-button>
         </view>
-        <view class="margin-left-sm" @click="handleRefuse(item)" v-if="item.statusCode === 'APPROVE'">
+        <view class="margin-left-sm" @click="handleRefuse(item)" v-if="item.statusCode === 'APPROVE' && $checkPermi(['schsf:mcVisit:ticket_submitAuditOne'])">
           <u-button shape="circle">拒绝</u-button>
         </view>
-        <view class="margin-left-sm" @click="handleAgree(item)" v-if="item.statusCode === 'APPROVE'">
+        <view class="margin-left-sm" @click="handleAgree(item)" v-if="item.statusCode === 'APPROVE' && $checkPermi(['schsf:mcVisit:ticket_submitAuditOne'])">
           <u-button shape="circle" color="#CF000D">同意</u-button>
         </view>
       </view>
@@ -280,8 +280,15 @@
         console.log('item', JSON.parse(JSON.stringify(item)));
       },
       onSearch(e) {
+        this.params.userName = this.keyword;
+        this.initData()
         console.log("搜索", e);
       },
+      onClear(){
+        this.keyword = "";
+        this.params.userName = "";
+        this.initData()
+      },
       checkboxChange(e) {
         console.log(e);
         if (e.length) {
@@ -363,11 +370,11 @@
         console.log("作废数据", data);
         const result = await cancelMcVisit(data);
         if (result.code === 200) {
-          uni.$u.toast('作废成功')
+          uni.$u.toast('作废成功');
+          this.initData();
         } else {
           uni.$u.toast(result.msg)
         }
-        this.initData();
         this.zfShow = false
       },
       loginOut() {
diff --git a/pages/login/workbench.vue b/pages/login/workbench.vue
index 74308fd..585a1d3 100644
--- a/pages/login/workbench.vue
+++ b/pages/login/workbench.vue
@@ -3,12 +3,12 @@
     <Navbar title="工作台" canBack></Navbar>
     <view class="container flex flex-direction align-center justify-center">
       <view class="insightCss margin-tb-xl padding flex justify-between align-center" @click="handleClick('insight')">
-        <u-image width="60rpx" height="60rpx" shape="circle"></u-image>
+        <u-image width="60rpx" height="60rpx" src="/static/images/icon/insight.png" shape="circle"></u-image>
         <view class="text-xxl text-bold text-white">市场洞察平台</view>
         <u-icon name="arrow-right" color="#fff"></u-icon>
       </view>
       <view class="chargeCss margin-tb-xl padding flex justify-between align-center" @click="handleClick('charge')">
-        <u-image width="60rpx" height="60rpx" shape="circle"></u-image>
+        <u-image width="60rpx" height="60rpx" src="/static/images/icon/charge.png" shape="circle"></u-image>
         <view class="text-xxl text-bold text-white">市场化收费工具</view>
         <u-icon name="arrow-right" color="#fff"></u-icon>
       </view>
diff --git a/static/images/icon/charge.png b/static/images/icon/charge.png
new file mode 100644
index 0000000..e462dbb
Binary files /dev/null and b/static/images/icon/charge.png differ
diff --git a/static/images/icon/insight.png b/static/images/icon/insight.png
new file mode 100644
index 0000000..ee7cde8
Binary files /dev/null and b/static/images/icon/insight.png differ
diff --git a/store/getters.js b/store/getters.js
index 46c1839..5da9245 100644
--- a/store/getters.js
+++ b/store/getters.js
@@ -5,5 +5,10 @@ const getters = {
   hasLogin: state => !!state.user.accessToken,
   dict_datas: state => state.dict.dictDatas,
   tabBarList: state => state.tabbar.list,
+  avatar: state => state.user.avatar,
+  name: state => state.user.name,
+  roles: state => state.user.roles,
+  permissions: state => state.user.permissions,
+  deptPermissions: state => state.user.deptPermissions,
 }
 export default getters
diff --git a/store/mudules/user.js b/store/mudules/user.js
index 0343640..5b6df6e 100644
--- a/store/mudules/user.js
+++ b/store/mudules/user.js
@@ -1,12 +1,15 @@
 import {
   getUserInfo
 } from '@/api/user'
+import storage from '@/utils/storage'
+import constant from '@/utils/constant'
 import {
   passwordLogin,
   smsLogin,
   weixinMiniAppLogin,
   logout,
-  dingLogin
+  dingLogin,
+  getInfo
 } from '@/api/auth'
 import {
   listSimpleDictDatas
@@ -22,7 +25,12 @@ const user = {
     roleId: "",
     entity: "",
     entityName: "",
-    userInfo: {}
+    userInfo: {},
+    name: storage.get(constant.name),
+    avatar: storage.get(constant.avatar),
+    roles: storage.get(constant.roles),
+    permissions: storage.get(constant.permissions),
+    deptPermissions: storage.get(constant.deptPermissions),
   },
   mutations: {
     // 更新 state 的通用方法
@@ -63,6 +71,29 @@ const user = {
       // 加载用户信息
       // this.dispatch('ObtainUserInfo')
     },
+    SET_NAME: (state, name) => {
+      state.name = name
+      storage.set(constant.name, name)
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+      storage.set(constant.avatar, avatar)
+    },
+    SET_ROLES: (state, roles) => {
+      state.roles = roles
+      storage.set(constant.roles, roles)
+    },
+    SET_PERMISSIONS: (state, permissions) => {
+      state.permissions = permissions
+      storage.set(constant.permissions, permissions)
+    },
+    SET_USER: (state, user) => {
+      state.userInfo = user || {}
+    },
+    SET_DEPT_PERMISSIONS: (state, deptPermissions) => {
+      state.deptPermissions = deptPermissions || {}
+      storage.set(constant.deptPermissions, deptPermissions)
+    },
     // 更新用户信息
     SET_USER_INFO(state, data) {
       state.userInfo = data
@@ -126,6 +157,54 @@ const user = {
           })
       }
     },
+    // 获取用户信息
+    GetInfo({
+      commit,
+      state
+    }) {
+      return new Promise((resolve, reject) => {
+        getInfo().then(res => {
+          const user = res.user
+          const avatar = (user == null || user.avatar == "" || user.avatar == null) ? '' : baseUrl + user
+            .avatar
+          const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName
+          if (res.roles && res.roles.length > 0) {
+            commit('SET_ROLES', res.roles)
+            commit('SET_PERMISSIONS', res.permissions)
+          } else {
+            commit('SET_ROLES', ['ROLE_DEFAULT'])
+          }
+          let deptPermissions = {}
+          if (res.deptRoles) {
+            res.deptRoles.forEach(item => {
+              const key = item.dept.deptId
+              let pers = deptPermissions[key]?.permissions || []
+              let roles = deptPermissions[key]?.roles || []
+              pers.push(...item.permissions)
+              item.role && roles.push({
+                ...item.role,
+                permissions: item.permissions
+              })
+              deptPermissions[key] = {
+                dept: item.dept,
+                permissions: pers,
+                roles: roles
+              }
+            })
+          }
+          commit('SET_DEPT_PERMISSIONS', deptPermissions)
+          commit('SET_NAME', username)
+          commit('SET_AVATAR', avatar)
+          commit('SET_USER', {
+            ...res.user,
+            deptRoles: res.deptRoles
+          })
+          resolve(res)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 退出登录
     Logout({
       state,
diff --git a/utils/constant.js b/utils/constant.js
new file mode 100644
index 0000000..8becd84
--- /dev/null
+++ b/utils/constant.js
@@ -0,0 +1,8 @@
+const constant = {
+   avatar: 'vuex_avatar',
+   name: 'vuex_name',
+   roles: 'vuex_roles',
+   permissions: 'vuex_permissions'
+ }
+
+ export default constant
diff --git a/utils/permission.js b/utils/permission.js
new file mode 100644
index 0000000..9460e80
--- /dev/null
+++ b/utils/permission.js
@@ -0,0 +1,104 @@
+import store from '@/store'
+
+/**
+ * 字符权限校验
+ * @param {Array} value 校验值
+ * @returns {Boolean}
+ */
+export function checkPermi(value) {
+  if (value && value instanceof Array && value.length > 0) {
+    const permissions = store.getters && store.getters.permissions
+    const permissionDatas = value
+    const all_permission = "*:*:*"
+
+    const hasPermission = permissions.some(permission => {
+      return all_permission === permission || permissionDatas.includes(permission)
+    })
+
+    if (!hasPermission) {
+      return false
+    }
+    return true
+  } else {
+    console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`)
+    return false
+  }
+}
+
+/**
+ * 部门权限校验
+ * @param {Number} deptId 部门id
+ * @param {Array} value 校验值
+ * @param roleKey
+ * @returns {Boolean}
+ */
+export function checkDeptPermi(deptId, value, roleKey = null) {
+  const all_permission = "*:*:*";
+  const deptPermissions = store.getters && store.getters.deptPermissions;
+  const userPermissions = store.getters && store.getters.permissions;
+
+  let permissions = []
+  if (roleKey) {
+    permissions = deptPermissions[deptId]?.roles?.find(it => it.roleKey === roleKey)?.permissions || []
+  } else  {
+    permissions = deptPermissions[deptId]?.permissions || []
+  }
+
+  if (value && value instanceof Array && value.length > 0) {
+    const permissionFlag = value
+
+    return permissions.some(permission => {
+      return all_permission === permission || permissionFlag.includes(permission)
+    }) || userPermissions.some(permission => all_permission === permission)
+  } else {
+    return false
+  }
+}
+
+/**
+ * 角色权限校验
+ * @param {Array} value 校验值
+ * @returns {Boolean}
+ */
+export function checkRole(value) {
+  if (value && value instanceof Array && value.length > 0) {
+    const roles = store.getters && store.getters.roles
+    const permissionRoles = value
+    const super_admin = "admin"
+
+    const hasRole = roles.some(role => {
+      return super_admin === role || permissionRoles.includes(role)
+    })
+
+    if (!hasRole) {
+      return false
+    }
+    return true
+  } else {
+    console.error(`need roles! Like checkRole="['admin','editor']"`)
+    return false
+  }
+}
+
+/**
+ * 部门角色权限校验
+ * @param {Number} deptId 部门id
+ * @param {Array} value 校验值
+ * @returns {Boolean}
+ */
+export function checkDeptRolePermi(deptId, value) {
+  const all_permission = '*:*:*'
+  const deptPermissions = store.getters && store.getters.deptPermissions
+  const userPermissions = store.getters && store.getters.permissions
+
+  const permissions = deptPermissions[deptId]?.permissions || []
+  const roles = deptPermissions[deptId]?.roles?.map(it => it.roleKey) || []
+
+  if (value && value instanceof Array && value.length > 0) {
+    const roleFlag = value
+    return permissions.some(permission => all_permission === permission) || userPermissions.some(permission => all_permission === permission)
+      || roles.some(key => roleFlag.includes(key))
+  } else {
+    return false
+  }
+}
diff --git a/utils/storage.js b/utils/storage.js
new file mode 100644
index 0000000..4c5fdec
--- /dev/null
+++ b/utils/storage.js
@@ -0,0 +1,32 @@
+import constant from './constant'
+
+// 存储变量名
+let storageKey = 'storage_data'
+
+// 存储节点变量名
+let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions]
+
+const storage = {
+  set: function(key, value) {
+    if (storageNodeKeys.indexOf(key) != -1) {
+      let tmp = uni.getStorageSync(storageKey)
+      tmp = tmp ? tmp : {}
+      tmp[key] = value
+      uni.setStorageSync(storageKey, tmp)
+    }
+  },
+  get: function(key) {
+    let storageData = uni.getStorageSync(storageKey) || {}
+    return storageData[key] || ""
+  },
+  remove: function(key) {
+    let storageData = uni.getStorageSync(storageKey) || {}
+    delete storageData[key]
+    uni.setStorageSync(storageKey, storageData)
+  },
+  clean: function() {
+    uni.removeStorageSync(storageKey)
+  }
+}
+
+export default storage
--
libgit2 0.21.2