yuanmingze vor 4 Monaten
Ursprung
Commit
af6d50c7ce

+ 2 - 2
.env.development

@@ -1,8 +1,8 @@
 NODE_ENV = 'development'
 VUE_APP_TYPE= 'dev'
-# VUE_APP_URL = 'http://10.144.62.235:9999'
+VUE_APP_URL = 'http://10.144.62.235:9999'
 # VUE_APP_URL = 'https://mic.freerr.cn'
-VUE_APP_URL = 'https://mic.cnbg.com.cn'
+# VUE_APP_URL = 'https://mic.cnbg.com.cn'
 # VUE_APP_URL = 'https://cnbg.yaoyi.net'
 # VUE_APP_URL = 'http://192.168.110.25:9999'
 # VUE_APP_URL = 'https://mic-t.cnbg.com.cn'

BIN
dist.7z


+ 9 - 4
src/views/serviceManagement/servicesToBeReviewed/components/TaskDetail.vue

@@ -6,7 +6,15 @@
     <template v-if="configList && configList.length > 0">
       <div style="max-height: 270px; overflow: auto">
         <div v-for="item in configList" :key="item.id" class="field-box">
-          <template v-if="item.taskFiledType == 'domain' || item.taskFiledType == 'select' || item.taskFiledType == 'tree'">
+          <!-- 城市选择 -->
+          <template v-if="item.taskFiledType === 'tree'">
+            <div class="title-value">{{ item.taskFiledValue }}:</div>
+            <div class="desc-value">
+              {{ wmTaskContent[item.taskFiledKey] || '--' }}
+            </div>
+          </template>
+
+          <template v-if="item.taskFiledType == 'domain' || item.taskFiledType == 'select'">
             <div class="title-value">{{ item.taskFiledValue }}:</div>
             <div class="desc-value" v-show="!(item.taskTypeId == '19' && item.taskFiledKey == 'temp3')">
               {{ getDesc(item) }}
@@ -265,9 +273,6 @@ export default {
     },
     getInfo(id) {
       this.getTaskInfoById(id);
-    },
-    mounted() {
-      this.getTaskInfoById(this.id);
     }
   }
 };

+ 6 - 0
src/views/serviceManagement/servicesToBeReviewed/index.vue

@@ -361,10 +361,14 @@ export default {
       case roles.includes(42):
         nodeId = 12;
         break;
+
       // 40	商务管理员: 获取审核节点为3和8   nodeid为11
       case roles.includes(40):
         nodeId = 11;
         break;
+      case roles.includes(41) && roles.includes(39):
+        nodeId = 24;
+        break;
       // 41	事业部分管领导
       case roles.includes(41):
         nodeId = 9;
@@ -376,6 +380,7 @@ export default {
       default:
         nodeId = 1;
     }
+    console.log('nodeId', nodeId);
 
     const lastYear = dayjs().subtract(1, 'year').format('YYYY');
 
@@ -634,6 +639,7 @@ export default {
         default:
           nodeId = 1;
       }
+      console.log('nodeId', nodeId);
 
       let res;
       // 单条审核