Bladeren bron

权限优化

xiaohaizhao 4 maanden geleden
bovenliggende
commit
4bfae39960

+ 0 - 5
pages/generalServices/modules/handle.vue

@@ -188,20 +188,15 @@ function openAllotfunc(id, type) {
     ).then(res => {
     ).then(res => {
         console.log("服务人员", res)
         console.log("服务人员", res)
         if (res.code !== 1) return uni.showToast({ title: res.msg, icon: 'none' });
         if (res.code !== 1) return uni.showToast({ title: res.msg, icon: 'none' });
-        let userMsg = uni.getStorageSync('userMsg')
         users.value = [{
         users.value = [{
             name: "抢单中心",
             name: "抢单中心",
             userid: null
             userid: null
         }]
         }]
-        if (userMsg.usertype == 21) {
-            users.value.push(userMsg)
-        }
         users.value = users.value.concat(res.data);
         users.value = users.value.concat(res.data);
         allot.value = true;
         allot.value = true;
     })
     })
 }
 }
 function clickRadio(item) {
 function clickRadio(item) {
-    console.log("item", item)
     if (item.userid == activeUser.value.userid) {
     if (item.userid == activeUser.value.userid) {
         // activeUser.value = { userid: null };
         // activeUser.value = { userid: null };
     } else {
     } else {

+ 2 - 2
pages/index/home.vue

@@ -60,7 +60,7 @@ function getTimeGreeting() {
 		return '晚上好';
 		return '晚上好';
 	}
 	}
 }
 }
-const itemList = ref([{
+const itemList = ref(uni.getStorageSync('isWork') ? [{
 	label: '抢单中心',
 	label: '抢单中心',
 	icon: '/static/image/djd.png',
 	icon: '/static/image/djd.png',
 	text: "专业守护",
 	text: "专业守护",
@@ -80,7 +80,7 @@ const itemList = ref([{
 	icon: '/static/image/ywj.png',
 	icon: '/static/image/ywj.png',
 	text: "精心维护保养",
 	text: "精心维护保养",
 	path: "/pages/workOrder/index?type=已完工",
 	path: "/pages/workOrder/index?type=已完工",
-}]);
+}] : []);
 
 
 onLoad(() => {
 onLoad(() => {
 	let userMsg = uni.getStorageSync('userMsg');
 	let userMsg = uni.getStorageSync('userMsg');

+ 4 - 1
pages/login/login.vue

@@ -409,7 +409,7 @@ async function handleLogin1(data) {
         uni.removeStorageSync('accountnoPwd');
         uni.removeStorageSync('accountnoPwd');
         uni.setStorageSync('accountnoPwd', '');
         uni.setStorageSync('accountnoPwd', '');
     }
     }
-    let auth = uni.getStorageSync("userAuth");
+    let auth = false && uni.getStorageSync("userAuth");
     if (auth) {
     if (auth) {
         console.log("使用缓存权限")
         console.log("使用缓存权限")
         $Http.basic({
         $Http.basic({
@@ -462,16 +462,19 @@ async function handleLogin1(data) {
             } else {
             } else {
                 uni.removeStorageSync('isAdmin');
                 uni.removeStorageSync('isAdmin');
                 uni.removeStorageSync('isViewSkus');
                 uni.removeStorageSync('isViewSkus');
+                uni.removeStorageSync('isWork');
                 uni.removeStorageSync('userAuth');
                 uni.removeStorageSync('userAuth');
                 uni.setStorageSync('userAuth', res.data)
                 uni.setStorageSync('userAuth', res.data)
                 try {
                 try {
                     let app = res.data.find(v => v.system == "service").modules.find(v => v.systemmodule == "wserve").apps.find(v => v.name == "wxchatserve").meta.auth.map(v => v.option);
                     let app = res.data.find(v => v.system == "service").modules.find(v => v.systemmodule == "wserve").apps.find(v => v.name == "wxchatserve").meta.auth.map(v => v.option);
                     uni.setStorageSync('isAdmin', app.includes('admin'));
                     uni.setStorageSync('isAdmin', app.includes('admin'));
                     uni.setStorageSync('isViewSkus', app.includes('skus'));
                     uni.setStorageSync('isViewSkus', app.includes('skus'));
+                    uni.setStorageSync('isWork', app.includes('work'));
                 } catch (error) {
                 } catch (error) {
                     console.log(error)
                     console.log(error)
                     uni.setStorageSync('isAdmin', false);
                     uni.setStorageSync('isAdmin', false);
                     uni.setStorageSync('isViewSkus', false);
                     uni.setStorageSync('isViewSkus', false);
+                    uni.setStorageSync('isWork', false);
                 }
                 }
                 uni.redirectTo({
                 uni.redirectTo({
                     url: '/pages/index/index',
                     url: '/pages/index/index',

+ 2 - 2
pages/workOrder/detail.vue

@@ -232,6 +232,7 @@ function getDetail() {
 
 
 // 工序是否完成
 // 工序是否完成
 function isAllNodesCompleted() {
 function isAllNodesCompleted() {
+    if (process.env.NODE_ENV === 'development') return true;
     // 收集所有必填末级节点
     // 收集所有必填末级节点
     const requiredLeafNodes = [];
     const requiredLeafNodes = [];
 
 
@@ -264,8 +265,7 @@ function isAllNodesCompleted() {
 
 
 // 提交工单
 // 提交工单
 function submit() {
 function submit() {
-    // if (isAllNodesCompleted())
-    uni.showModal({
+    if (isAllNodesCompleted()) uni.showModal({
         confirmText: '继续提交',
         confirmText: '继续提交',
         content: '请确认工单内容,提交后不可修改!',
         content: '请确认工单内容,提交后不可修改!',
         success: ({ confirm }) => {
         success: ({ confirm }) => {

+ 3 - 2
pages/workOrder/index.vue

@@ -72,8 +72,7 @@
                         height: '70rpx',
                         height: '70rpx',
                     }" text="等待完工确认" disabled />
                     }" text="等待完工确认" disabled />
 
 
-                    <VCode v-if="item.needcode" :ref="createRef('Code' + item.sa_workorderid)" @callBack="getList"
-                        :sa_workorderid="item.sa_workorderid" />
+
                 </view>
                 </view>
                 <navigator v-if="content.where.status != '待接单' && content.where.status != '提交'"
                 <navigator v-if="content.where.status != '待接单' && content.where.status != '提交'"
                     :url="'/pages/workOrder/detail?id=' + item.sa_workorderid" class="but-box-item">
                     :url="'/pages/workOrder/detail?id=' + item.sa_workorderid" class="but-box-item">
@@ -84,6 +83,8 @@
             </view>
             </view>
         </navigator>
         </navigator>
     </My_listbox>
     </My_listbox>
+    <VCode v-for="item in list" :key="item.sa_workorderid" :ref="createRef('Code' + item.sa_workorderid)"
+        @callBack="getList" :sa_workorderid="item.sa_workorderid" />
 
 
     <up-modal negativeTop="100" :show="takeOrderShow" title="是否确认接单?" showCancelButton @confirm="takeOrders"
     <up-modal negativeTop="100" :show="takeOrderShow" title="是否确认接单?" showCancelButton @confirm="takeOrders"
         @cancel="takeOrderShow = false" ref="uModal" :asyncClose="true"></up-modal>
         @cancel="takeOrderShow = false" ref="uModal" :asyncClose="true"></up-modal>

+ 1 - 1
utils/Http.js

@@ -9,7 +9,7 @@ class HTTP {
         }];
         }];
 
 
         if (process.env.NODE_ENV === 'development') {
         if (process.env.NODE_ENV === 'development') {
-            this.baseUrl = this.urls[0].url;
+            this.baseUrl = this.urls[1].url;
         } else {
         } else {
             this.baseUrl = this.urls[0].url;
             this.baseUrl = this.urls[0].url;
         }
         }