刘秀芳 преди 2 дни
родител
ревизия
0a838972d4

+ 19 - 0
src/components/popup/priceSheetPopup.vue

@@ -373,7 +373,26 @@ const handleSaveImage = async () => {
     }
 };
 
+// 检查是否有"转入农事"权限
+const hasPlanPermission = computed(() => {
+    try {
+        const userInfoStr = localStorage.getItem("localUserInfo");
+        if (!userInfoStr) return false;
+        const userInfo = JSON.parse(userInfoStr);
+        const permissions = userInfo.agriculturalPermissions || [];
+        return permissions.includes("转入农事");
+        // return userInfo.agriculturalRole !== 3;
+    } catch (error) {
+        console.error("解析用户信息失败:", error);
+        return false;
+    }
+});
+
 const handleEdit = () => {
+    if (!hasPlanPermission.value) {
+        ElMessage.warning("您暂无权限操作");
+        return;
+    }
     // 编辑报价逻辑
     // 可以触发编辑事件或打开编辑页面
     const queryData = route.query?.miniJson ? JSON.parse(route.query?.miniJson) : {};

+ 3 - 2
src/views/old_mini/modify_work/addWork.vue

@@ -257,13 +257,13 @@
                                                         </div>
                                                     </div>
                                         </div>
-                                        <div class="input-box mark-box">
+                                        <!-- <div class="input-box mark-box">
                                             <el-input
                                                 v-model="domain.remark"
                                                 style="width: 100%"
                                                 placeholder="备注:用药注意事项"
                                             />
-                                        </div>
+                                        </div> -->
                                         <div class="action-btn">
                                             <el-button
                                                 class="btn delete-btn"
@@ -1708,6 +1708,7 @@ const handleDeleteInteract = () => {
             //     }
             // }
             .action-btn {
+                margin-top: 12px;
                 display: flex;
                 justify-content: flex-end;
                 .btn {

+ 1 - 1
src/views/old_mini/modify_work/completedWork.vue

@@ -592,7 +592,7 @@ const handlePriceInfo = async () => {
     const { data } = await VE_API.z_farm_work_record_cost.getByRecordId({ farmWorkRecordId: detailData.value.id });
     priceDataObj = data;
     // 执行方式为1:无人机,则使用无人机价格,否则使用人工价格
-    detailData.value.serviceMuPrice = data?.executionMethod === 1 ? data?.uavServicePrice : data?.manualServicePrice;
+    detailData.value.serviceMuPrice = data?.farmWorkServiceCost;
     if (priceDataObj && Object.keys(priceDataObj).length > 0) {
         // 合并外层字段
         quotationData.value = {

+ 4 - 0
src/views/old_mini/modify_work/detailWork.vue

@@ -361,6 +361,10 @@ const handleTimelineAction = (item) => {
 };
 
 const editPrice = () => {
+    if (!hasPlanPermission.value) {
+        ElMessage.warning("您暂无权限操作");
+        return;
+    }
     router.push({
         path: "/modify",
         query: {

+ 3 - 2
src/views/old_mini/modify_work/modify.vue

@@ -301,7 +301,7 @@
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="input-box mark-box">
+                                                <!-- <div class="input-box mark-box">
                                                     <el-input
                                                         v-model="domain.remark"
                                                         style="width: 100%"
@@ -309,7 +309,7 @@
                                                         :rows="2"
                                                         placeholder="备注:用药注意事项"
                                                     />
-                                                </div>
+                                                </div> -->
                                                 <div class="action-btn">
                                                     <el-button
                                                         class="btn delete-btn"
@@ -2278,6 +2278,7 @@ const handleDeleteInteract = () => {
             //     }
             // }
             .action-btn {
+                margin-top: 12px;
                 display: flex;
                 justify-content: flex-end;
                 .btn {

+ 3 - 2
src/views/old_mini/task_condition/components/interact.vue

@@ -77,8 +77,8 @@
                                 </div>
                                 <div class="tag-card">
                                     <div class="card-content">
-                                        <div class="card-main-text">冲梢风险</div>
-                                        <div class="card-sub-text">预计风险</div>
+                                        <div class="card-main-text">{{ item.sourceData?.currentPhenologyStartDate || '--' }}</div>
+                                        <div class="card-sub-text">起始时间</div>
                                     </div>
                                 </div>
                                 <div class="tag-card">
@@ -582,6 +582,7 @@ function handleRemindCustomer(item) {
                     align-items: center;
                     justify-content: center;
                     text-align: center;
+                    height: 100%;
                     .card-main-text {
                         font-size: 16px;
                         font-weight: 500;

+ 10 - 8
src/views/old_mini/user/index.vue

@@ -1,11 +1,11 @@
 <template>
     <div class="user-index" :style="{ height: `calc(100vh - ${tabBarHeight}px)` }">
         <div class="user-header">
-            <el-input class="search" v-model="input" placeholder="搜索">
+            <!-- <el-input class="search" v-model="input" placeholder="搜索">
                 <template #prefix>
                     <el-icon><search /></el-icon>
                 </template>
-            </el-input>
+            </el-input> -->
             <div class="button" @click="handleAddClient">
                 <img src="@/assets/img/mine/firend-icon.png" alt="" />
                 新增客户
@@ -21,9 +21,9 @@
                         {{ item.name }}
                         <span class="span">{{ item.children?.length || 0 }}</span>
                     </template>
-                    <template #value>
+                    <!-- <template #value>
                         <div @click.stop="hadnleManage(item)" class="text">管理</div>
-                    </template>
+                    </template> -->
                     <farm-info-card
                         v-for="ele in item.children"
                         :key="ele.agriculturalStoreId"
@@ -72,9 +72,9 @@
                 </collapse-item>
             </collapse>
         </div>
-        <div class="footer">
+        <!-- <div class="footer">
             <div class="btn" @click="showPopup">新建分组</div>
-        </div>
+        </div> -->
     </div>
     <!-- 添加分组弹窗 -->
     <add-popup :show="showGroupPopup"></add-popup>
@@ -261,7 +261,7 @@ const handleDetail = (path, farmId, agriculturalStoreId, schemeId) => {
             }
         }
         .button {
-            width: calc(100% - 100px);
+            width: 100%;
             background: #fff;
             display: flex;
             align-items: center;
@@ -278,8 +278,10 @@ const handleDetail = (path, farmId, agriculturalStoreId, schemeId) => {
     .list {
         width: 100%;
         margin-top: 12px;
-        height: calc(100% - 90px);
+        height: calc(100% - 36px);
         overflow: auto;
+        padding-bottom: 12px;
+        box-sizing: border-box;
         
         .map-container {
             width: 100%;