Merge branch 'dev-烟台0301' into yantai_dev

.env.development

@@ -1,6 +1,7 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://192.168.1.140/api
+VUE_APP_API_SERVER =  http://219.146.91.110/api
+#VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api

.env.production.sit

@@ -1,6 +1,7 @@
 NODE_ENV=production
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
-VUE_APP_API_SERVER =  http://192.168.1.140/api
+#VUE_APP_API_SERVER =  http://192.168.1.140/api
+VUE_APP_API_SERVER =  http://219.146.91.110/api
 VUE_APP_NODE_ENV=prod:sit
 VUE_APP_PUBLIC_PATH=epmet-oper
 VUE_APP_CUSTOMER=yantai

src/views/modules/communityParty/article/drafts.vue

@@ -276,7 +276,7 @@ export default {
           type: "select",
           multiple: true,
           allowCreate: true,
-          optionUrl: "/gov/voice/tag/taglist",
+          optionUrl: "/gov/voice/tag/queryAgencyTag",
           optionUrlParams: {},
           optionList: [],
           optionCook(list) {

src/views/modules/communityParty/article/index.vue

@@ -472,7 +472,7 @@ export default {
           type: "select",
           multiple: true,
           allowCreate: true,
-          optionUrl: "/gov/voice/tag/taglist",
+          optionUrl: "/gov/voice/tag/queryAgencyTag",
           optionUrlParams: {},
           optionList: [],
           optionCook(list) {

src/views/modules/workSys/articleTag/edit.vue

@@ -25,10 +25,11 @@
                           label-width="150px"
                           prop="agencyId"
                           >
+                          <!-- { checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'} -->
               <el-cascader ref="cascaderUnit"
                            v-model="formData.agencyId"
                            :options="orgOptions"
-                           :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}"
+                           :props="optionProps"
                            clearable 
                            @change="cascaderClick"
                            />
@@ -63,6 +64,14 @@ export default {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
       btnDisable: false,
       orgOptions:[],
+      optionProps: {
+        checkStrictly: true,
+        expandTrigger: 'hover',
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+      },
+      agencyIdArray:[],
       tagId:'',
       formData: {
           tagName: '',
@@ -83,6 +92,8 @@ export default {
   components: {},
   async mounted () {
     await this.getOrgTreeList()
+
+
   },
 
   methods: {
@@ -90,6 +101,7 @@ export default {
     async initForm (type, row) {
       this.startLoading()
       this.formType = type
+      
       console.log(row);
       if(type!='add'){
         this.formData.tagName = row.tagName
@@ -107,22 +119,37 @@ export default {
     },
     async getOrgTreeList() {
         this.dataListLoading = true
-        this.$http
+        // this.$http
-          .post('/gov/org/customeragency/staffinagencylist')
+        //   .post('gov/org/customeragency/agencylist', { customerId: this.customerId})
-          .then(({ data: res }) => {
+        //   .then(({ data: res }) => {
-            if (res.code !== 0) {
+        //     if (res.code !== 0) {
-              return this.$message.error(res.msg)
+        //       return this.$message.error(res.msg)
-            } else {
+        //     } else {
-              console.log('获取查询详情成功', res.data)
+        //       console.log('获取查询详情成功', res.data)
-              let { agencyList, subAgencyList } = res.data
+        //       let { agencyList, subAgencyList } = res.data
-              const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
+        //       const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
-              this.orgOptions = this.deepTree(_arr)
+        //       this.orgOptions = this.deepTree(_arr)
-            }
+        //     }
-          })
+        //   })
-          .catch(() => {
+        //   .catch(() => {
-            this.dataListLoading = false
+        //     this.dataListLoading = false
-            return this.$message.error('网络错误')
+        //     return this.$message.error('网络错误')
-          })
+        //   })
+        const url = '/gov/org/customeragency/agencylist'
+      // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'
+
+      let params = {
+        customerId: this.customerId
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.options = []
+        this.agencyIdArray.length = []
+        this.orgOptions.push(data)
+
+      } else {
+        this.$message.error(msg)
+      }
         this.dataListLoading = false
     },     
      deepTree (arr) {
@@ -141,7 +168,7 @@ export default {
       if (obj) {
         if (obj.level === "street") {
               for(let i in obj.subAgencyList){
-                this.formData.push({'agencyId':obj.subAgencyList[i].agencyId,'orgIdPath':obj.subAgencyList[i].orgIdPath})
+                this.formDatam.push({'agencyId':obj.subAgencyList[i].agencyId,'orgIdPath':obj.subAgencyList[i].orgIdPath})
               }
         } else {
                 this.formDatam.push({'agencyId':obj.agencyId,'orgIdPath':obj.orgIdPath})
@@ -239,6 +266,10 @@ export default {
   computed: {
   },
   props: {
+    customerId:{
+      type:String,
+      default:""
+    }
   }
 }
 </script>

src/views/modules/workSys/articleTag/index.vue

@@ -151,6 +151,7 @@
 			@closed="diaClose"
 		>
 			<edit
+				:customerId="customerId"
 				ref="ref_form"
 				@dialogCancle="diaClose"
 				@dialogOk="addFormOk"
@@ -180,7 +181,7 @@ export default {
 			pageNo: 0,
 			tableLoading: false,
 			isResiUser: true,
-
+			customerId:"",
 			agencyId: "",
 
 			timeRange: [],
@@ -212,6 +213,7 @@ export default {
 		this.agencyId = user.agencyId;
 
 		await this.loadTable();
+		this.customerId = localStorage.getItem("customerId");
 	},
 
 	activated() {