Explorar o código

Merge branch 'master' of http://121.41.40.202:3000/web/for_client into master

yangyj hai 1 ano
pai
achega
fea7398f09

+ 1 - 0
index.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh">
     <head>
+        <script type="text/javascript" src="/plugins/webfunny.js"></script>
         <meta charset="UTF-8"/>
         <link rel="icon" href="/favicon.ico"/>
         <meta name="viewport" content="width=device-width, initial-scale=1.0"/>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
public/plugins/webfunny.js


+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20231026110423"
+  "value": "20231107112126"
 }

+ 3 - 1
src/global/components/table-form/index.vue

@@ -293,7 +293,7 @@ const setPasteKeyList = async (event) => {
             await setSingleCopyValue(checkList, keysList)
         }
         //复制单个粘贴
-        if (checkList.length === 1 && keysList.length > 1) {
+        if (checkList.length === 1 && keysList.length >= 1) {
             await setCopySingleValue(checkList, keysList)
         }
         //清除缓存
@@ -311,6 +311,8 @@ const setCopySingleValue = async (checkList, keysList) => {
         form_val = form_val ? form_val + '、' + val : val
         keys.splice(0, 1) //删除第一个元素
     }
+    console.log('key', key)
+    console.log('form_val', form_val)
     await setTableFormInfoValue(key, form_val)
     HTableForm.setCheckKeyStyle(key, activeKey.value, true)
 }

+ 1 - 1
src/plugins/HTableForm.js

@@ -1,6 +1,6 @@
 import { createApp } from 'vue/dist/vue.esm-bundler.js'
 import { getTokenHeader } from '~src/api/request/header'
-import { isArray, isNullES, toParse } from 'js-fast-way'
+import { isArray, toParse } from 'js-fast-way'
 
 //自定义组件或二次封装的组件
 import HcTableFormUpload from '~com/plugins/table-form/hc-form-upload.vue'

+ 1 - 1
src/router/modules/base.js

@@ -398,7 +398,7 @@ export default [
             {
                 path: '/patrol/safe',
                 name: 'patrol-menu-safe',
-                meta: { title: '安全巡检' },
+                meta: { title: '巡检列表' },
                 component: () => import('~src/views/patrol/safe.vue'),
             },
             {

+ 6 - 0
src/store/modules/user.js

@@ -21,6 +21,12 @@ export const useAppLogin = async (form) => {
         store.setRefreshTokenVal(res['refresh_token'])
         store.setTenantId(res['tenant_id'])
         store.setUserInfo(res)
+        window.localStorage.wmUserInfo = JSON.stringify({
+            userId: res['user_id'],
+            userTag: res['real_name'],
+            projectVersion: '3.5.0',
+            env: 'pro',
+        })
         const routerRes = await setRouterData()
         if (!routerRes) {
             return Promise.reject({ msg: '路由异常' })

+ 16 - 9
src/views/patrol/add.vue

@@ -103,7 +103,7 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row :gutter="20">
+                <el-row v-if="addForm.isRectify === 1" :gutter="20">
                     <el-col :span="12">
                         <el-form-item label="整改日期" prop="rectifyDate">
                             <el-date-picker
@@ -116,13 +116,14 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row :gutter="20">
+                <el-row v-if="addForm.isRectify === 1" :gutter="20">
                     <el-col :span="8">
                         <el-form-item label="整改人" prop="rectifyUser">
                             <HcTasksUser
-                                :disabled="type === 'changeRow' || type === 'review' || type === 'view'" :is-change-popele="true"
-                                :contract-id="contractId" :project-id="projectId" :users="peoples"
-                                ui="w-full" @change="tasksUserChange"
+                                v-if="isShowUser" :disabled="type === 'changeRow' || type === 'review' || type === 'view'"
+                                :is-change-popele="true" :contract-id="contractId" :project-id="projectId"
+                                :users="peoples" ui="w-full"
+                                @change="tasksUserChange"
                             />
                         </el-form-item>
                     </el-col>
@@ -163,7 +164,7 @@
                                 <el-link v-else @click="openAttachment(row)">{{ row.rectifyAttachmentName }}</el-link>
                             </template>
                               
-                            <el-link v-else type="primary" @click="clickAttachment(row, index)">
+                            <el-link v-else type="primary" :disabled="type === 'review' || type === 'view'" @click="clickAttachment(row, index)">
                                 上传
                             </el-link>
                         </template>
@@ -212,11 +213,12 @@
                                 check-strictly
                                 @nodeTap="wbsElTreeClick"
                                 @check="divisionTreeCheck"
+                                @check-change="divisionTreeCheckChange"
                             >
                                 <template #default="{ node, data }">
                                     <span style="font-size: 16px;">{{ data.title }}</span>
                                 </template>
-                            </HcDataTree>>
+                            </HcDataTree>
                         </div>
                     </el-scrollbar>
                     <el-scrollbar v-show="!isSearchTree" class="scroll-bar-right-16">
@@ -338,7 +340,7 @@ const tableColumn = ref([
 
 
 
-
+const isShowUser = ref(true)
 onActivated(()=>{
     getTypeOptions()
     const routerQuery = useRoutes?.query
@@ -350,6 +352,11 @@ onActivated(()=>{
         addForm.value = {}
         processDataList.value = []
         peoples.value = ''
+        isShowUser.value = false
+        setTimeout(() => {
+            isShowUser.value = true
+        }, 10)
+        
     }
     if (type.value === 'changeRow') {
 
@@ -548,7 +555,7 @@ const linksRelateModalSave = ()=>{
             primaryKeyId: ele.primaryKeyId,
             autoExpandKeys:TreeAutoExpandKeys.value,
             isShowImage:0,
-            contractId:contractId.value,
+            contractId:ele.contractId,
   
         })
     })

+ 2 - 2
src/views/patrol/safe.vue

@@ -18,8 +18,8 @@
                 </template>
                 <template #action="{ row }">
                     <el-link v-if="row.submitRectify == 2 && row.isRectify == 1" type="primary" @click="reviewRow(row)">复核</el-link>
-                    <el-link type="primary" :disabled="row.isRectify === 3" @click="updateRow(row)">修改</el-link>
-                    <el-link type="primary" :disabled="row.isRectify === 3" @click="delRow(row)">删除</el-link>
+                    <el-link type="primary" :disabled="row.submitRectify === '2'" @click="updateRow(row)">修改</el-link>
+                    <el-link type="primary" :disabled="row.submitRectify === '2'" @click="delRow(row)">删除</el-link>
                 </template>
             </HcTable>
             <template #action>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio