fix:修改bug

郭伟龙
1 parent c2963af2
Showing 8 changed files with 64 additions and 52 deletions Show diff stats
App.vue
pages/charge/visitsAndFees/createaVisit.vue
pages/charge/visitsAndFees/detail.vue
pages/charge/visitsAndFees/index.vue
pages/charge/visitsAndFees/processFlow.vue
pages/login/workbench.vue
store/mudules/tabBar.js
store/mudules/user.js
@@ -20,7 +20,9 @@
       console.log(this);
       this.$store.dispatch('GetInfo')
       let workName = uni.getStorageSync('tabName');
-      this.$store.dispatch('setTab', {data: workName});
+      if(workName){
+        this.$store.dispatch('setTab', {data: workName});
+      }
       uni.hideTabBar();
       console.log('App Show')
     },
@@ -12,7 +12,7 @@
             <u-form-item :required="item.required" :label="item.label" labelWidth="100" borderBottom
               v-if="item.type === 'date'" :prop="item.key">
               <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder" border="none"
-                disabled :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'"></u-input>
+                disabled disabledColor="#fff"></u-input>
               <u-icon slot="right" name="calendar" size="20" @click="handleDateTime(item)"></u-icon>
               <!-- <u-icon slot="right" name="calendar" size="20" @click="handleDateTime(item)"></u-icon> -->
             </u-form-item>
@@ -21,7 +21,7 @@
               v-if="item.type === 'input'" :prop="item.key">
               <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder"
                 :disabled="operationStatus ==='YD' || item.key === 'billingPersonName'" :type="item.mode"
-                :maxlength="item.max" :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'" border="none"></u-input>
+                :maxlength="item.max" disabledColor="#fff" border="none"></u-input>
               <view class="" style="width: 40rpx;height: 40rpx;"></view>
             </u-form-item>
             <!-- 选择类型 -->
@@ -29,8 +29,7 @@
               v-if="item.type === 'select'" :disabled="operationStatus ==='YD'" :prop="item.key">
               <u-input v-model="model[item.key]" v-if="!item.dict"
                 :disabled="operationStatus ==='YD' ||  item.key === 'address' || item.key ==='company' || item.disabled"
-                inputAlign="right" :placeholder="item.placeholder"
-                :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'" border="none"></u-input>
+                inputAlign="right" :placeholder="item.placeholder" disabledColor="#fff" border="none"></u-input>
               <view class="" v-else>{{getDictDataLabel(item.dict,model[item.key])}}</view>
               <u-icon slot="right" class="margin-left-xs" name="arrow-down" size="20"
                 @click="handleSelect(item)"></u-icon>
@@ -65,7 +64,7 @@
             <u-form-item :required="item.required" :label="item.label" labelWidth="100" borderBottom
               v-if="item.type === 'input' && item.show" :prop="item.key">
               <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder" disabledColor="#fff"
-                :disabled="operationStatus ==='YD'" border="none"></u-input>
+                :disabled="operationStatus ==='YD' || item.disabled" border="none"></u-input>
               <view class="" style="width: 40rpx;height: 40rpx;"></view>
             </u-form-item>
             <!-- 选择 -->
@@ -513,7 +512,7 @@
           type: "select",
           required: true,
           key: "vlgOrCmty",
-          disabled:true
+          disabled: true
         }, {
           label: '户名',
           placeholder: "请选择或输入",
@@ -631,10 +630,12 @@
         }, {
           label: '当前地址',
           required: true,
-          placeholder: "请输入",
+          placeholder: "自动定位获取",
+          // placeholder: "请输入",
           type: "input",
           key: "visitDetailedAddress",
           show: true,
+          disabled:true
         }, {
           label: '上传图片',
           required: true,
@@ -785,9 +786,13 @@
         this.model.address =
           `${this.model.userProvince}${this.model.userCity}${this.model.userDistrict}${this.model.userStreet}`
         this.model.isCharged = this.model.isCharged === 'Y' ? '是' : '否';
-        this.model.isIntent = this.model.isIntent === 'Y' ? '是' : '否';
+        // this.model.isIntent = this.model.isIntent === 'Y' ? '是' : '否';
         this.model.isVisited = this.model.isVisited === 'Y' ? '是' : '否';
         this.model.hasDm = this.model.hasDm === 'Y' ? '是' : '否';
+        this.model.chargeAmt = String(this.model.chargeAmt);
+        if (this.model.entryTime.includes(' 00:00:00')) {
+          this.model.entryTime = this.model.entryTime.slice(0, -9);
+        }
         if (this.model.isCharged === '否') {
           this.chargeData.slice(1).map(item => {
             item.show = false;
@@ -826,7 +831,7 @@
             }
           })
         }
-
+        console.log("填充数据", this.model);
       },
       async init() {
         console.log(this.$store);
@@ -850,9 +855,12 @@
         if (!this.$isDing) {
           return
         }
-        console.log("钉钉定位")
+        var host= window.location.origin + '/';
+        // let currentUrl = window.location.href;
+        console.log("钉钉定位",host)
+        // let currentUrl = "http://192.168.0.53:8001/"
         let data = {
-          url: "http://192.168.0.53:8001/"
+          url: host
         }
         let that = this;
         const result = await getDingtalkConfig(data);
@@ -979,7 +987,7 @@
           let col = result.data.map(item => ({
             value: item.vlgOrCmty,
             label: item.vlgOrCmty,
-            urbRurCls:item.urbRurCls
+            urbRurCls: item.urbRurCls
           }));
           this.columns = [col];
         } else if (item.key === 'userName') {
@@ -1327,11 +1335,11 @@
       copyMethods() {
         // this.copyModel.fieldPhotoFile = this.fileList.map(item => item.uuid).join(",");
         this.copyModel.isCharged = this.copyModel.isCharged === '是' ? 'Y' : 'N';
-        this.copyModel.isIntent = this.copyModel.isIntent === '是' ? 'Y' : 'N';
+        // this.copyModel.isIntent = this.copyModel.isIntent === '是' ? 'Y' : 'N';
         this.copyModel.isVisited = this.copyModel.isVisited === '是' ? 'Y' : 'N';
         this.copyModel.hasDm = this.copyModel.hasDm === '是' ? 'Y' : 'N';
         if (!this.copyModel.entryTime.includes(' 00:00:00')) {
-            this.copyModel.entryTime += ' 00:00:00';
+          this.copyModel.entryTime += ' 00:00:00';
         }
         // this.copyModel.attachmentFile = this.attachmentList.map(item => item.uuid).join(",");
       },
@@ -109,7 +109,7 @@
             name: "是否有意向",
             value: "",
             key: "isIntent",
-            dict:'sys_yes_no'
+            dict:'sys_mc_visit_intent'
           },{
             name: "房屋情况",
             value: "",
@@ -85,7 +85,7 @@
         </view>
       </view>
       <view class="flex justify-end margin-top">
-        <view class="margin-right-xs">
+        <view class="w30 margin-right-xs">
           <zb-popover placement="bottom-start" theme="dark" ref="Popover1" class="item-popover">
             <view slot="content" class="popoverCss">
               <view class="" v-if="publishChangePermission(item)">
@@ -108,7 +108,7 @@
             <u-button shape="circle">更多操作</u-button>
           </zb-popover>
         </view>
-        <view class="w25 margin-right-xs" @click="handleDetail(item)">
+        <view class="w30 margin-right-xs" @click="handleDetail(item)">
           <u-button shape="circle">查看详情</u-button>
         </view>
         <view class="w25 margin-right-xs" @click="handleEdit(item)" v-if="editPermission(item)">
@@ -318,9 +318,11 @@
     onLoad() {
       this.initData();
       this.getCompanyCascader();
+      let that = this;
       // 监听其他页面返回后刷新
       uni.$on('update', function(data) {
-        this.initData();
+        console.log("检测刷新");
+        that.initData();
       })
     },
     onShow() {},
@@ -49,7 +49,7 @@
     },
     methods: {
       descMethods(item){
-        return `提交与${item.procTime}\n意见:${item.opRemark?item.opRemark:'无'}`
+        return `提交与${item.procTime}\n操作:${item.opName?item.opName:'无'}\n意见:${item.opRemark?item.opRemark:'无'}`
       },
       async init() {
         let data = {
@@ -62,7 +62,7 @@
           rows
         } = await getMcOperationLogList(data);
         console.log(rows);
-        this.list = rows
+        this.list = rows.reverse();
       }
     }
   }
@@ -7,7 +7,7 @@
         <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" v-if="validate()"
+      <view class="chargeCss margin-tb-xl padding flex justify-between align-center" v-if="hasPermission"
         @click="handleClick('charge')">
         <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>
@@ -25,47 +25,46 @@
     },
     data() {
       return {
-
+        toolPermissions: ['schsf:mcVisit:list', 'schsf:mcIgnition:list', 'schsf:mcConstruction:list']
       }
     },
-    computed: {
+    onShow() {
     },
     onLoad() {
-      if (!this.validate()) {
-        this.handleClick('insight');
-        // setTimeout(()=>{
-        //    uni.switchTab({
-        //      url: '/pages/market/index'
-        //    })
-        // },500)
+      this.$store.dispatch('GetInfo').then(()=>{
+        console.log("getters",this.$store.getters);
+        const hasPermission =  this.hasPermission;
+        console.log("是否有工具权限",hasPermission);
+        if (!hasPermission) {
+          this.handleClick('insight');
+        }
+      })
+    },
+    computed: {
+      hasPermission() {
+        return this.toolPermissions.some(permission => {
+          return this.$checkPermi([permission]);
+        });
       }
     },
     methods: {
       // 验证是否需要显示工具菜单
-      validate() {
-        let toolPermissions = ['schsf:mcVisit:list', 'schsf:mcIgnition:list', 'schsf:mcConstruction:list']
-        console.log(this);
-        // 假设 this.$checkPermi 是一个返回布尔值的方法
-        let hasPermission = toolPermissions.some(permission => {
-          return this.$checkPermi([permission]);
-        });
-        return hasPermission
-      },
       handleClick(workName) {
         console.log(workName);
         this.$store.dispatch('setTab', {
           data: workName
+        }).then(() => {
+          let tabList = this.$store.state.tabbar.list
+          let urls = tabList[0].pagePath
+          console.log("跳转", urls);
+          setTimeout(() => {
+            uni.switchTab({
+              url: `/${urls}`
+            })
+            console.log(this.$store.state);
+          }, 300)
         });
-        let tabList = this.$store.state.tabbar.list
-        let urls = tabList[0].pagePath
-        console.log("跳转", urls);
-        setTimeout(() => {
-          uni.switchTab({
-            url: `/${urls}`
-          })
-          console.log(this.$store.state);
-        }, 500)
       }
     }
   }
@@ -34,10 +34,9 @@ const tabbar = {
     }, {
       data
     }) {
-      console.log(tabBars);
-      console.log(111,data);
+      console.log("设置tab",data);
+      commit('SET_USER_TAB', data);
       uni.setStorageSync('tabName',data);
-      commit('SET_USER_TAB', data)
     }
   }
 }
@@ -102,6 +102,8 @@ const user = {
     CLEAR_LOGIN_INFO(state) {
       uni.removeStorageSync(AccessTokenKey)
       uni.removeStorageSync(RefreshTokenKey)
+      uni.removeStorageSync('storage_data')
+      uni.removeStorageSync('tabName')
       state.accessToken = ''
       state.refreshToken = ''
       state.userInfo = {}
	@@ -109,7 +109,7 @@		@@ -109,7 +109,7 @@
109	name: "是否有意向",	109	name: "是否有意向",
110	value: "",	110	value: "",
111	key: "isIntent",	111	key: "isIntent",
112	- dict:'sys_yes_no'	112	+ dict:'sys_mc_visit_intent'
113	},{	113	},{
114	name: "房屋情况",	114	name: "房屋情况",
115	value: "",	115	value: "",
	@@ -49,7 +49,7 @@		@@ -49,7 +49,7 @@
49	},	49	},
50	methods: {	50	methods: {
51	descMethods(item){	51	descMethods(item){
52	- return `提交与${item.procTime}\n意见:${item.opRemark?item.opRemark:'无'}`	52	+ return `提交与${item.procTime}\n操作:${item.opName?item.opName:'无'}\n意见:${item.opRemark?item.opRemark:'无'}`
53	},	53	},
54	async init() {	54	async init() {
55	let data = {	55	let data = {
	@@ -62,7 +62,7 @@		@@ -62,7 +62,7 @@
62	rows	62	rows
63	} = await getMcOperationLogList(data);	63	} = await getMcOperationLogList(data);
64	console.log(rows);	64	console.log(rows);
65	- this.list = rows	65	+ this.list = rows.reverse();
66	}	66	}
67	}	67	}
68	}	68	}