Merge branch 'V4.3.3' into feature

# Conflicts:
#	src/views/modules/shequzhili/eventOld/eventList.vue

src/views/modules/communityParty/activity/eventDetails.vue

@@ -92,7 +92,7 @@
                         </div>
                     </div>
                        <!-- 报名名单 -->
-                    <div v-if="formData.status!==0||formData.online == 1" style="margin-top: 20px;">
+                    <div v-if="formData.status!==0 && formData.online == 1" style="margin-top: 20px;">
                         <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
                             报名名单
                         </div>

src/views/modules/communityParty/comPromotion/add.vue

@@ -172,10 +172,13 @@ export default {
              
             }
             this.formType=typeid
-           
+           console.log(typeid);
-            console.log(this.formData,"5164");
+            console.log(this.formType,"5164");
             this.endLoading();
+            if(typeid=="add"){
               this.setDefaultReleaseTime()
+            }
+           
         },
     async advertisingTag () {
           const url = "/actual/base/advertisingTag/page"
@@ -276,6 +279,7 @@ export default {
               let url = '/actual/base/communityPublicity/update'
               this.formData.sendMsg= this.formData.sendMsg? 1:0
               this.formData.top= this.formData.top? 1:0
+              this.formData.status=0
               console.log(this.formData,"formData");
               const { data, code, msg } = await requestPost(url, this.formData)
               if (code === 0) {
@@ -296,6 +300,7 @@ export default {
               console.log(this.formData,"formData");
               this.formData.sendMsg= this.formData.sendMsg? 1:0
               this.formData.top= this.formData.top? 1:0
+  
               const { data, code, msg } = await requestPost(url, this.formData)
               if (code === 0) {
                   this.$message({

src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue

@@ -24,7 +24,7 @@
                 prop="categoryCode">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
 
-                    <el-cascader v-model.trim="formData.categoryCode" :options="demandOptions" clearable class="cell-width-1"
+                    <el-cascader v-model.trim="formData.categoryCode" :props="{label:'categoryName',value:'categoryCode',children:'childCateList'}" :options="demandOptions" clearable class="cell-width-1"
                         @change="handleCateSlect"></el-cascader>
                 </div>
 
@@ -363,9 +363,8 @@ export default {
         //     }
         // },
         async getDemandOptions() {
-            const url = "/governance/icresidemanddict/demandoption"
+            const url = "/actual/base/serviceitem/listAllCategory"
-            let params = {}
+            const { data, code, msg } = await requestPost(url)
-            const { data, code, msg } = await requestPost(url, params)
             if (code === 0) {
                 this.demandOptions = this.getFlagData(
                     this.getTreeData(data),
@@ -391,10 +390,10 @@ export default {
             if (!Array.isArray(data)) return [];
             let arr = data.map((item) => {
                 let _item = {};
-                if (item.children) {
+                if (item.childCateList) {
-                    if (item.children.length === 0)
+                    if (item.childCateList.length === 0)
-                        _item = { ...item, children: undefined };
+                        _item = { ...item, childCateList: undefined };
-                    else _item = { ...item, children: this.getTreeData(item.children) };
+                    else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
                 } else {
                     _item = { ...item };
                 }
@@ -406,8 +405,8 @@ export default {
             if (!Array.isArray(data)) return [];
             let arr1 = data.filter((item) => item[flag]);
             let arr2 = arr1.map((item) => {
-                if (item.children)
+                if (item.childCateList)
-                    return { ...item, children: this.getFlagData(item.children, flag) };
+                    return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
                 else return item;
             });
             // console.log('arrr-oppp', arr2)
@@ -432,11 +431,11 @@ export default {
                 this.$message.error("请先选择服务类型!");
                 return;
             }
-            const url = "/actual/base/serviceitem/listServerOrg";
+            const url = "/actual/base/serviceitem/listServerOrgNewTask";
             let params = {
-                serviceTypeId: this.formData.categoryCode,
+                serverOrgCategoryCode: this.formData.categoryCode[1],
                 serverOrgType: val,
-                businessType: "resi_service",
+                serverParentOrgCategoryCode:this.formData.categoryCode[0],
             };
             let { data, code, msg } = await requestPost(url, params);
             if (code == 0) {

src/views/modules/workSys/promotionTab/AddpromotionTab.vue

@@ -10,6 +10,9 @@
               <el-input v-model.trim="tagName" size="small" class="item_width_1" clearable placeholder="请输入">
                 </el-input>
             </div>
+          </el-form-item>
+                    <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
+                    <el-switch v-model="status" :active-value="1" :inactive-value="0"></el-switch>
                 </el-form-item>
         </el-form>
       </div>

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

@@ -7,7 +7,12 @@
             <el-input v-model.trim="tagName" size="small" class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
-
+          <el-form-item label="首页显示">
+            <el-select class="item_width_1" v-model.trim="status" size="small" placeholder="请选择" clearable>
+              <el-option v-for="item in statuslist" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <div style="display: flex; justify-content: flex-end;">
             <el-button style="margin-left:10px" class="diy-button--blue" size="small"
               @click="handleSearch">查询</el-button>
@@ -29,12 +34,17 @@
         <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
         <el-table-column prop="tagName" header-align="center" align="center" label="标签名称" >
         </el-table-column>
-        <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" >
+        <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" width="380">
+          <template slot-scope="scope">
+            <span>{{ scope.row.status === 1 ? '显示' : '关闭' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" width="380">
           <template slot-scope="scope">
             <span>{{ scope.row.status === 1 ? '显示' : '关闭' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" >
+        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" width="380">
         </el-table-column>
 
         <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">

src/views/modules/workSys/promotionTab/viewPromotionalTags.vue

@@ -8,6 +8,9 @@
                         <span>{{ tagName }}</span>
                     </div>
                 </el-form-item>
+                <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
+                    <el-switch v-model="online" disabled></el-switch>
+                </el-form-item>
             </el-form>
         </div>