Merge branch 'test' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into test

src/components/DataAcquisition/index.vue

@@ -1,62 +1,55 @@
 <template>
   <div>
     <el-tabs v-model="activeName" type="border-card">
-      <div>
-        <el-tab-pane
-          v-for="(item, index) in tabList"
-          :key="index + 'tabs'"
-          :label="item.normName"
-          :name="item.normName"
-        >
-          <el-row :gutter="10">
-            <template v-for="listItem in taskList.feeLists">
-              <el-form
-                v-if="listItem.normId == item.normId"
-                :model="listItem"
-                :ref="'form' + listItem.normfeeId"
-                :key="listItem.normfeeId"
-              >
-                <el-col :span="12">
-                  <el-form-item
-                    prop="collCalue"
-                    :label="
-                      listItem.normfeeName +
-                      '（' +
-                      listItem.funit_dictText +
-                      '）'
-                    "
-                  >
-                    <el-input
-                      :disabled="!edit"
-                      v-model="listItem.collCalue"
-                      :placeholder="'请输入' + listItem.normfeeName"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-form>
-            </template>
-          </el-row>
-        </el-tab-pane>
-      </div>
-
-      <div>
-        <el-tab-pane label="审批记录" name="审批记录">
-          <el-timeline>
-            <el-timeline-item
-              v-for="(item, index) in taskList.taskVoList"
-              :timestamp="item.createTime"
-              placement="top"
-              :key="index + 'taskHisAction'"
+      <el-tab-pane
+        v-for="(item, index) in tabList"
+        :key="index + 'tabs'"
+        :label="item.normName"
+        :name="item.normName"
+      >
+        <el-row :gutter="10">
+          <template v-for="listItem in taskList.formobj.feeLists">
+            <el-form
+              v-if="listItem.normId == item.normId"
+              :model="listItem"
+              :ref="'form' + listItem.normfeeId"
+              :key="listItem.normfeeId"
             >
-              <el-card>
-                <p>
-                  {{ item.execId }} {{ item.acname }} 于 {{ item.createTime }}
-                </p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </el-tab-pane>
-      </div>
+              <el-col :span="12">
+                <el-form-item
+                  prop="collCalue"
+                  :label="
+                    listItem.normfeeName + '（' + listItem.funit_dictText + '）'
+                  "
+                >
+                  <el-input
+                    :disabled="!edit"
+                    v-model="listItem.collCalue"
+                    :placeholder="'请输入' + listItem.normfeeName"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-form>
+          </template>
+        </el-row>
+      </el-tab-pane>
+
+      <el-tab-pane label="审批记录" name="审批记录">
+        <el-timeline>
+          <el-timeline-item
+            v-for="(item, index) in taskList.formobj.taskVoList"
+            :timestamp="item.createTime"
+            placement="top"
+            :key="index + 'taskHisAction'"
+          >
+            <el-card>
+              <p>
+                {{ item.execId }} {{ item.acname }} 于 {{ item.createTime }}
+              </p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </el-tab-pane>
     </el-tabs>
     <div class="remark" v-if="form.remark != null">
       <div class="remark_title">驳回理由：</div>
@@ -189,7 +182,9 @@ export default {
     },
   },
   created() {
-    this.tabList = JSON.parse(JSON.stringify(this.taskList.feeLists));
+    console.log(this.taskList);
+
+    this.tabList = JSON.parse(JSON.stringify(this.taskList.formobj.feeLists));
     //去重获取tab
     //遍历如果遇到相同的id则删掉
     for (var i = 0; i < this.tabList.length - 1; i++) {

src/views/JOINTCONFERENCE/add.vue

@@ -42,6 +42,18 @@
         >
         </el-cascader>
       </el-form-item>
+      <el-form-item label="状态">
+        <template>
+          <el-radio v-model="radio" label="1">完结</el-radio>
+          <el-radio v-model="radio" label="2">长期</el-radio>
+          <el-radio v-model="radio" label="3">限期</el-radio>
+
+        </template>
+      </el-form-item>
+      <el-form-item label="限期日期">
+        <el-date-picker v-model="date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
     </el-form>
     <div class="mfooter">
       <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -80,6 +92,11 @@ export default {
       }
     };
     return {
+      // 状态选择
+      radio:null,
+      // 限期日期
+      date:null,
+
       propOpt: {
         value: "value",
         label: "label",
@@ -199,7 +216,6 @@ export default {
               this.$parent.getList();
             });
           } else {
-
             // this.form.deptName = [];
             // for (const index in this.form.deptId) {
             //   for (const i in this.deptList) {

src/views/JOINTCONFERENCE/index.vue

@@ -125,14 +125,14 @@
             size="mini"
             type="text"
             @click="goDetail(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:query']"
+            v-hasPermi="['business:ARTICLE:query']"
             >会议详情</el-button
           >
           <el-button
             size="mini"
             type="text"
             @click="handleUnit(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:add']"
+            v-hasPermi="['business:JOINTCONFERENCE:edit']"
             >单位指派</el-button
           >
         </template>
@@ -158,6 +158,7 @@ import {
   updateJOINTCONFERENCE,
 } from "@/api/portal/JOINTCONFERENCE/JOINTCONFERENCE.js";
 import { getInfo } from "@/api/login";
+import { checkPermi } from "@/utils/permission.js";
 
 import add from "./add.vue";
 import detail from "./detail.vue";

src/views/task/index.vue

@@ -16,7 +16,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table :data="INSTACTIONTASKList" @selection-change="handleSelectionChange">
+    <el-table v-hasPermi="['business:INSTACTIONTASK:byUser']" :data="INSTACTIONTASKList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="活动名称" align="center" prop="acname">
         <template slot-scope="scope">
@@ -53,16 +53,16 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.status == '0'" size="mini" type="text" @click="handleExamine(scope.row)"
-            v-hasPermi="['business:INSTACTIONTASK:query']">详情</el-button>
+          <el-button v-if="scope.row.status == '0' && checkPermi(['business:INSTACTIONTASK:query'])" size="mini" type="text" @click="handleExamine(scope.row)"
+            >详情</el-button>
 
-          <el-button v-if="scope.row.status == '0'" size="mini" type="text" @click="handlePass(scope.row)"
-            v-hasPermi="['task:instaction:approve']">通过审核</el-button>
+          <!-- <el-button v-if="scope.row.status == '0'" size="mini" type="text" @click="handlePass(scope.row)"
+            >通过审核</el-button>
           <el-button v-if="scope.row.status == '0'" size="mini" type="text" @click="handleReject(scope.row)"
-            v-hasPermi="['task:instaction:approve']">驳回</el-button>
+            >驳回</el-button> -->
 
           <el-button size="mini" type="text" @click="handleDetail(scope.row)"
-            v-hasPermi="['business:INSTACTIONTASK:query']" v-if="scope.row.status != '0'">详情</el-button>
+             v-if="scope.row.status != '0'">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -83,9 +83,9 @@
       </el-dialog>
 
       <span slot="footer" class="dialog-footer" v-if="taskList.status == 0">
-        <el-button type="primary" @click="submitBtn('同意')">同意</el-button>
-        <el-button type="warning" @click="submitBtn('驳回')">驳回</el-button>
-        <el-button type="danger" @click="submitBtn('退回')">退回</el-button>
+        <el-button v-if="checkPermi(['task:instaction:approve'])" type="primary" @click="submitBtn('同意')">同意</el-button>
+        <el-button  v-if="checkPermi(['task:instaction:reject'])"  type="warning" @click="submitBtn('驳回')">驳回</el-button>
+        <el-button  v-if="checkPermi(['task:instaction:goback'])"  type="danger" @click="submitBtn('退回')">退回</el-button>
       </span>
       <span slot="footer" class="dialog-footer" v-else>
         <el-button type="primary" @click="backDia">返回</el-button>
@@ -106,6 +106,8 @@ import CompanyUserService from "@/views/CompanyUserService/index.vue";
 import questionService from "@/views/QUESTION/questionService.vue";
 import articleTask from "@/views/ARTICLE/task/index.vue";
 import dataAcquisition from "@/components/DataAcquisition";
+import { checkPermi } from "@/utils/permission.js";
+
 
 
 import {
@@ -247,6 +249,7 @@ export default {
     this.getList();
   },
   methods: {
+    checkPermi,
     closeDia() {
       // console.log('关闭');
     },