Merge branch 'master' of http://106.52.242.177:3000/askqvn/crm-app

pages/clueDetail/tabs/clueInfo/index.vue

@@ -10,11 +10,17 @@
 					<template v-if="params.type === '1'">
 						<view class="Info_item" v-for="(item,index) in caseInfoColumn" :key="item.prop">
 							<text class="label">{{item.label}}</text>
-							<text v-if="item.color" class="value highlight" :style="handleStyle(item.color)">
-								{{clueDetail[item.prop]}}
-							</text>
 							<show-real-text :real="clueDetail.telephone" :type='params.type'
 								v-if="item.prop === 'telephone'"></show-real-text>
+							<view class="input_wrap" v-else-if="item.input">
+								<input v-model="clueDetail[item.prop]" 
+									:disabled="!hasEditPermission"
+									style="text-align: right; padding-right: 10px;"
+									@blur="updateClueMainInfo" />
+							</view>
+							<text v-else-if="item.color" class="value highlight" :style="handleStyle(item.color)">
+								{{clueDetail[item.prop]}}
+							</text>
 							<text v-else class="value">{{clueDetail[item.prop]}}</text>
 						</view>
 					</template>
@@ -22,7 +28,9 @@
 						<view class="Info_item" v-for="(item,index) in caseInfoColumn" :key="item.prop">
 							<text class="label">{{item.label}}</text>
 							<view class="input_wrap" v-if="item.input">
-								<input v-model="clueDetail[item.prop]" style="text-align: right; padding-right: 10px;"
+								<input v-model="clueDetail[item.prop]" 
+									:disabled="!hasEditPermission"
+									style="text-align: right; padding-right: 10px;"
 									@blur="updateClueMainInfo" />
 							</view>
 							<text v-else-if="item.color" class="value highlight" :style="handleStyle(item.color)">
@@ -48,6 +56,7 @@
 		cloneDeep,
 		isEqual
 	} from 'lodash';
+	import { checkPermi } from '@/utils/permission';
 
 	const caseInfoColumn = [{
 			prop: 'name',
@@ -151,7 +160,12 @@
 			        console.error('解析remarkDict失败:', error)
 			        return null
 			      }
-			    }
+			    },
+			hasEditPermission() {
+				if (this.params?.type === '2') return true;
+				if (this.params?.type === '1') return checkPermi(['crm:PublicClue:detail:edit']);
+				return false;
+			}
 		},
 		methods: {
 			async updateClueMainInfo() {

pages/orderDetailRefactored/components/OrderDetailView.vue

@@ -24,6 +24,7 @@
         :follow-up-list="followUpList"
         @next="handleNext"
         @update-file-ids="handleUpdateFileIds"
+        @price-updated="$emit('price-updated')"
       />
     </view>
     

pages/orderDetailRefactored/components/PageFour.vue

@@ -894,6 +894,7 @@ export default {
                   stockStatus:0,//库存状态，0待入库，1已入库，因为是我们是预入库，所以是0
                   origin:this.orderDetail.website,//来源
                   actualPrice:this.currentReceipt.sellingPrice|| '',//实价，也就是顶部的第三个价格sellingPrice
+                  price:this.currentReceipt.sellingPrice|| '',//官方指导价，也就是顶部的第三个价格sellingPrice
                 }
                 if (!this.currentReceipt.warehouseId) {
                   //当没有仓库id的时候调用新增仓库接口

pages/orderDetailRefactored/components/PageTwo.vue

@@ -124,6 +124,7 @@
                   placeholder="0" 
                   min="0"
                   @input="onPriceInput" 
+                  @blur="saveApprovedPrice"
                 />
               </view>
             </view>
@@ -324,10 +325,23 @@ export default {
     /**
      * 快速调整价格
      */
-    quickChangePrice(amount) {
+    async quickChangePrice(amount) {
       let newPrice = this.approvedPrice + amount
       newPrice = Math.max(0, newPrice)
       this.approvedPrice = newPrice
+
+      await uni.$u.api.updateReceiptForm({
+        id: this.currentReceipt.id,
+        sellingPrice: newPrice
+      })
+      this.$emit('price-updated')
+    },
+    async saveApprovedPrice() {
+      await uni.$u.api.updateReceiptForm({
+        id: this.currentReceipt.id,
+        sellingPrice: this.approvedPrice
+      })
+      this.$emit('price-updated')
     },
 
     /**

pages/orderDetailRefactored/index.vue

@@ -24,7 +24,7 @@
 
     <!-- 订单详情视图 -->
     <OrderDetailView :order-detail="orderDetail" :top-info="topInfo" :order-id="orderId"
-      :current-receipt="currentReceipt" />
+      :current-receipt="currentReceipt" @price-updated="refreshCurrentReceipt" />
 
     <!-- 加一单模态窗 -->
     <u-modal :show="addOneModalVisible" title="加一单" showCancelButton @cancel="handleAddOneCancel"
@@ -173,6 +173,24 @@ export default {
     },
 
     /**
+     * 刷新当前收单（用于价格等修改后同步顶部信息）
+     */
+    async refreshCurrentReceipt() {
+      if (!this.currentReceipt || !this.currentReceipt.id) return
+      try {
+        const res = await uni.$u.api.getReceiptForm(this.currentReceipt.id)
+        if (res.code === 200 && res.data) {
+          this.currentReceipt = res.data
+          this.topInfo.brand = res.data.brand || '暂无'
+          this.topInfo.model = res.data.model || '暂无'
+          this.topInfo.price = res.data.sellingPrice ?? '暂无'
+        }
+      } catch (error) {
+        console.error('刷新当前收单失败:', error)
+      }
+    },
+
+    /**
      * 点击收单项
      */
     async handleReceiptClick(item) {

store/getters.js

@@ -13,6 +13,8 @@ const getters = {
   isDS: (state) => state.user.isDS,
   isOut: (state) => state.user.isOut,
   recordId : (state) => state.app.recordId,
-  dialing : (state) => state.app.dialing
+  dialing : (state) => state.app.dialing,
+  permissions: (state) => state.user.permissions,
+  roles: (state) => state.user.userInfo.roles || []
 }
 export default getters

store/modules/user.js

@@ -25,11 +25,12 @@ export default {
 		homeOff: false, // 居家
 		isOut: false, // 外访
 		uuid: null, // 设备id
+		permissions: [], // 权限列表
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			// ip: "https://crm.nanjingshiyu.com/prod-api", // ip
-			ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			ip: "https://crm.nanjingshiyu.com/prod-api", // ip
+			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip
@@ -162,6 +163,9 @@ export default {
 		SET_SHOW_ROLE_SWITCH(state, show) {
 			state.showRoleSwitch = show;
 		},
+		SET_PERMISSIONS: (state, permissions) => {
+			state.permissions = permissions || [];
+		},
 		SWITCH_ROLE({}, role) {
 			setTimeout(() => {
 				const allIndices = [0, 1, 2, 3, 4, 5, 6];
@@ -207,6 +211,12 @@ export default {
 			return new Promise((resolve, reject) => {
 				uni.$u.api.getInfo().then(res => {
 					commit("SET_USERINFO", res.user);
+					// 保存权限列表
+					if (res.permissions && res.permissions.length > 0) {
+						commit("SET_PERMISSIONS", res.permissions);
+					} else {
+						commit("SET_PERMISSIONS", []);
+					}
 					commit("SET_BELONGSYSTEM", {
 						code: state.system.value,
 						callback: (flag) => {
@@ -248,6 +258,7 @@ export default {
 
 				commit("SET_TOKEN", "");
 				commit("SET_USERINFO", {});
+				commit("SET_PERMISSIONS", []); // 清空权限列表
 				dispatch("app/logoutCloseData", null, {
 					root: true
 				});

utils/permission.js

@@ -0,0 +1,60 @@
+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
+    console.log('permissionsxxxxxxxx', permissions);
+    const permissionDatas = value
+    const all_permission = "*:*:*";
+
+    if (!permissions || !Array.isArray(permissions) || permissions.length === 0) {
+      return false
+    }
+
+    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 {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";
+
+    if (!roles || !Array.isArray(roles) || roles.length === 0) {
+      return false
+    }
+
+    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
+  }
+}