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

src/components/DataAcquisition/index.vue

@@ -19,7 +19,7 @@
                 <el-form-item
                   prop="collCalue"
                   :label="
-                    listItem.normfeeName + '（' + listItem.funit_dictText + '）'
+                    listItem.normfeeName + '（' + listItem.funitName + '）'
                   "
                 >
                   <el-input
@@ -33,9 +33,8 @@
           </template>
         </el-row>
       </el-tab-pane>
-
-      <el-tab-pane label="审批记录" name="审批记录">
-        <el-timeline>
+      <div style="font-size: 18px; font-weight: 600; margin-bottom: 20px;">审批记录：</div>
+      <el-timeline>
           <el-timeline-item
             v-for="(item, index) in taskList.formobj.taskVoList"
             :timestamp="item.createTime"
@@ -44,17 +43,12 @@
           >
             <el-card>
               <p>
-                {{ item.execId }} {{ item.acname }} 于 {{ item.createTime }}
+                {{ item.execName  +"------" +statusArr[item.status]+"------" +item.createTime }} <span v-if="item.comments != null">{{+"------备注："+ comments }}</span>
               </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>
-      <div class="remark_text">{{ taskList.remark }}</div>
-    </div>
   </div>
 </template>
 
@@ -77,13 +71,21 @@ export default {
       openDetail: false,
       form: {},
       edit: false,
-    };
+      statusArr:{
+        '0': '待审核',
+        '1': '同意',
+        '2': '驳回',
+        '3': '退回',
+    },
+  }
   },
   computed: {},
   methods: {
+
     handleClose() {
       this.check = false;
     },
+
     submitForm(type) {
       let p = [];
       p = this.form.feeLists.map((item, index) => {
@@ -182,7 +184,6 @@ export default {
     },
   },
   created() {
-    console.log(this.taskList);
 
     this.tabList = JSON.parse(JSON.stringify(this.taskList.formobj.feeLists));
     //去重获取tab

src/components/selectTree/index.vue

@@ -0,0 +1,86 @@
+<template>
+    <el-select
+        filterable
+        v-model="modelValue"
+        :placeholder="placeholder"
+        ref="selectUpResId"
+      >
+      <el-option
+        :value="modelValue" 
+        style="overflow: auto; height: 100%"
+        hidden
+        />
+      <el-tree
+        :data="dataList"
+        :props="defaultProps"
+        :node-key="nodeKey"
+        :expand-on-click-node="expandNode" 
+        :check-on-click-node="checkNode" 
+        check-strictly
+        @node-click="handleNodeClick"
+      />
+    </el-select>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            form: {
+               label: '',
+               id: ''
+             },
+             dataList:[]
+        }
+      
+    },
+    props: {
+        param: {
+          type: Array,
+          required: true
+        },
+        placeholder: {
+            type: String,
+            default: '请选择'
+        },
+        formatId: {
+            type: String,
+            default: 'deptId'
+        },
+        defaultProps: {
+            type: Object,
+            default: () => {
+                return {
+                    children: "children",
+                    label: "deptName"
+                }
+             }
+        },
+        nodeKey: {
+            type: String,
+            default: 'deptId'
+        },
+        expandNode: {
+            type: Boolean,
+            default: false
+        },
+        checkNode: {
+            type: Boolean,
+            default: true
+        },
+        modelValue: {
+            type: String,
+            default: ''
+        }
+    },
+    created() {
+        this.dataList = this.handleTree(this.param, this.formatId);
+    },
+    methods: {
+        handleNodeClick(data) {
+          this.$emit('setNodeValue', data)
+          this.$refs.selectUpResId.blur()
+        }
+    }
+}
+</script>

src/views/AttendMeeting/index.vue

@@ -344,7 +344,7 @@ export default {
         param: {},
         title: "发起会议",
         width: "750px",
-        height: "60%",
+        height: "70%",
       });
     },
     /** 修改按钮操作 */

src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -163,6 +163,11 @@
                   <el-input v-model="form.gdzctz" placeholder="请输入固定资产投资"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="经营总收入" prop="jysr">
+                  <el-input v-model="form.jysr" placeholder="请输入经营总收入"></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </el-tab-pane>
@@ -344,6 +349,9 @@ export default {
             trigger: "blur"
           }
         ],
+        jysr: [
+          { required: true, message: "经营总收入不能为空", trigger: "blur" },
+          ],
         zcfl: [
           { required: true, message: "资产分类 不能为空", trigger: "blur" },
         ],

src/views/GARDENBASEDATA/index.vue

@@ -217,20 +217,8 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="部门" prop="deptName">
-                  <el-select
-                    filterable
-                    v-model="form.deptName"
-                    @change="deptSelect"
-                    placeholder="请选择部门"
-                  >
-                    <el-option
-                      v-for="(item, index) in detpList"
-                      :key="index"
-                      :label="item.deptName"
-                      :value="index"
-                    >
-                    </el-option>
-                  </el-select>
+                  <!-- 树状结构组件引用 -->
+                  <select-tree :param="detpList" :placeholder="'请选择部门'" :modelValue="form.deptName" @setNodeValue="handleNodeClick" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -498,16 +486,18 @@ import {
   updateGARDENBASEDATA,
   getEnterprise,
 } from "@/api/portal/GARDENBASEDATA/GARDENBASEDATA";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import selectTree from '@/components/selectTree'
 
 export default {
   name: "GARDENBASEDATA",
+  components: { selectTree },
   data() {
     return {
       // 新增标签索引
       tabMsg: "basicMsg",
       // 部门列表
       detpList: [],
-
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层
@@ -690,16 +680,17 @@ export default {
   created() {
     this.getList();
     getEnterprise().then((res) => {
-      this.detpList = res.data;
+      this.detpList = res.data
+      
     });
   },
   methods: {
     changeIsShowStatus(val) {
       this.isShowStatus = val;
     },
-    deptSelect(val) {
-      this.form.deptId = this.detpList[val].deptId;
-      this.form.deptName = this.detpList[val].deptName;
+    handleNodeClick(data) {
+      this.$set(this.form, 'deptId', data.deptId)
+      this.$set(this.form, 'deptName', data.deptName)
     },
     setUpTimeSelect(val) {
       this.form.clrq = val;

src/views/GATHER/index.vue

@@ -476,7 +476,7 @@
                     :label="
                       listItem.normfeeName +
                       '（' +
-                      listItem.funit_dictText +
+                      listItem.funitName +
                       '）'
                     "
                     prop="collCalue"
@@ -519,7 +519,7 @@
           <!-- :rules="rules" ref="form" -->
           <el-form-item
             :label="
-              listItem.normfeeName + '（' + listItem.funit_dictText + '）'
+              listItem.normfeeName + '（' + listItem.funitName + '）'
             "
             prop="collCalue"
           >
@@ -578,7 +578,7 @@
                     :label="
                       listItem.normfeeName +
                       '（' +
-                      listItem.funit_dictText +
+                      listItem.funitName +
                       '）'
                     "
                   >
@@ -623,7 +623,7 @@
           <!-- :rules="rules" ref="form" -->z
           <el-form-item
             :label="
-              listItem.normfeeName + '（' + listItem.funit_dictText + '）'
+              listItem.normfeeName + '（' + listItem.funitName + '）'
             "
             prop="collCalue"
           >
@@ -637,22 +637,6 @@
           </el-form-item>
         </el-form>
       </template>
-
-      <!--
-      <el-form :model="form" v-else-if="this.form.type == 1">
-        <el-form-item
-          v-for="(listItem, listIndex) in form.feeLists"
-          :key="listIndex"
-          :label="listItem.normfeeName + '（' + listItem.funit_dictText + '）'"
-        >
-          <el-input
-            :disabled="!edit"
-            v-model="listItem.collCalue"
-            :placeholder="'请输入' + listItem.normfeeName"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      -->
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm('edit')" v-if="edit"
           >确 定</el-button
@@ -667,8 +651,8 @@
       </div>
 
       <div class="remark" v-if="form.taskVoList != 0">
-        <div class="remark_title">审批记录：</div>
-        <div style="padding: 4px; border-radius: 4px; background-color: #F5F7FA;">
+        <div class="remark_title" style="margin-bottom: 20px;">审批记录：</div>
+        <!-- <div style="padding: 4px; border-radius: 4px; background-color: #F5F7FA;">
           <div class="remark_item" v-for="(item, index) in form.taskVoList">
             <span>{{ item.execName }} </span>
             <span>{{
@@ -683,7 +667,30 @@
             <span> {{ item.comments }}  </span>
             <span>{{ item.createTime }} </span>
           </div>
-        </div>
+        </div> -->
+
+        <el-timeline>
+          <el-timeline-item
+            v-for="(item, index) in form.taskVoList"
+            :timestamp="item.createTime"
+            placement="top"
+            :key="index + 'taskHisAction'"
+          >
+            <el-card>
+              <p>
+                {{ item.execName }} {{
+              item.status == 0
+                ? "待审核"
+                : item.status == 1
+                ? "同意"
+                : item.status == 2
+                ? "驳回"
+                : "退回"
+            }}  {{ item.acname }} 于 {{ item.createTime }}
+              </p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
       </div>
     </el-dialog>
   </div>
@@ -1389,9 +1396,10 @@ export default {
   margin-top: 20px;
 
   .remark_title {
-    margin-bottom: 10px;
+    margin-bottom: 30px;
     font-size: 18px;
     font-weight: bold;
+
   }
 
   .remark_text {

src/views/JOINTCONFERENCE/add.vue

@@ -17,7 +17,7 @@
         ></el-input>
       </el-form-item>
 
-      <el-form-item label="协作单位" prop="dept">
+      <el-form-item label="协作单位">
         <!-- <el-select
           v-model="deptId"
           multiple
@@ -42,24 +42,24 @@
         >
         </el-cascader>
       </el-form-item>
-      <el-form-item label="协作要求">
+      <el-form-item label="协作要求" prop="collaborativeContent">
         <el-input
           type="textarea"
           rows="4"
           placeholder="请输入协作要求"
-          v-model="form.status"
+          v-model="form.collaborativeContent"
         ></el-input>
       </el-form-item>
-      <el-form-item label="状态">
+      <el-form-item label="状态" prop="type">
         <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>
+          <el-radio v-model="form.type" label="1">完结</el-radio>
+          <el-radio v-model="form.type" label="2">长期</el-radio>
+          <el-radio v-model="form.type" label="3">限期</el-radio>
         </template>
       </el-form-item>
-      <el-form-item label="限期日期">
+      <el-form-item style="padding-bottom: 20px;" label="限期日期" prop="date" >
         <el-date-picker
-          v-model="date"
+          v-model="form.date"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择日期"
@@ -105,7 +105,7 @@ export default {
     };
     return {
       // 状态选择
-      radio: null,
+      status: null,
       // 限期日期
       date: null,
 
@@ -128,10 +128,16 @@ export default {
         conferenceContent: [
           { required: true, message: "会议内容不能为空", trigger: "blur" },
         ],
-        dept: [{ validator: checkDeptId, trigger: "blur" }],
-        status: [
+     
+        type: [
+          { required: true, message: "状态不能为空", trigger: "blur" },
+        ],
+        collaborativeContent: [
           { required: true, message: "协作要求不能为空", trigger: "blur" },
         ],
+        date:[
+        { required: true, message: "限期时间不能为空", trigger: "blur" },
+        ]
       },
 
       deptListSele: [],
@@ -220,6 +226,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      if(this.seleValue.length == 0){
+        this.$message.error("请选择协作单位");
+        return;
+      }
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -245,6 +255,8 @@ export default {
             // }
             //俊豪像甲方一样，老是让我改传参
             //↑好家伙你还改错了，是seleValue不是deptId
+            //↑啥玩意？
+
             this.form.cooperativeUnitId = this.seleValue;
             this.form.deptNum = this.form.cooperativeUnitId.length;
             addJOINTCONFERENCE(this.form).then((response) => {

src/views/JOINTCONFERENCE/detail.vue

@@ -1,46 +1,111 @@
 <template>
   <div class="cmain">
-    <div class="detail_item">
+    <el-descriptions border :labelStyle="{ width: '120px' }" :column="2">
+      <el-descriptions-item label="会议标题">
+        <span v-html="form.conference.conferenceTitle"></span>
+      </el-descriptions-item>
+      <el-descriptions-item label="状态">
+        <span class="status">
+          {{
+            form.conference.type == 1
+              ? "完结"
+              : form.conference.type == 2
+              ? "长期"
+              : "限期"
+          }}</span
+        >
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <!-- <div class="detail_item">
       <div class="title">会议标题：</div>
       <p>{{ form.conference.conferenceTitle }}</p>
-    </div>
-    <div class="detail_item">
-      <div class="title">会议内容：</div>
-      <p>{{ form.conference.conferenceContent }}</p>
-    </div>
+    </div> -->
+    <el-form v-model="form" >
+      <!-- <div class="detail_item" style="align-items: start"> -->
+      <el-form-item style="margin-top: 10px;" label="会议内容" width="120px">
+        <el-input
+          :disabled="true"
+          type="textarea"
+          rows="4"
+          placeholder="请输入协作要求"
+          v-model="form.conference.conferenceContent"
+        ></el-input>
+      </el-form-item>
+      <!-- </div> -->
+      <el-form-item label="协作要求" prop="collaborativeContent">
+        <el-input
+          :disabled="true"
+          type="textarea"
+          rows="4"
+          placeholder="请输入协作要求"
+          v-model="form.conference.collaborativeContent"
+        ></el-input>
+      </el-form-item>
 
-    <div class="dept_list" v-for="(item, index) in form.reply" :key="index">
-      <div class="title">{{ item.deptName }}：</div>
-      <p>{{ item.reply }}</p>
-    </div>
+      <!-- <el-form-item label="状态" prop="type">
+        <template>
+          <el-radio disabled v-model="form.conference.type" label="1"
+            >完结</el-radio
+          >
+          <el-radio disabled v-model="form.conference.type" label="2"
+            >长期</el-radio
+          >
+          <el-radio disabled v-model="form.conference.type" label="3"
+            >限期</el-radio
+          >
+        </template>
+      </el-form-item> -->
+
+      <el-form-item label="限期日期" prop="date">
+        <el-date-picker
+          :disabled="true"
+          v-model="form.conference.date"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期"
+        >
+        </el-date-picker>
+      </el-form-item>
+
+      <div class="dept_list" v-for="(item, index) in form.reply" :key="index">
+        <div class="title">{{ item.deptName }}：</div>
+        <p>{{ item.reply }}</p>
+      </div>
 
-    <div class="detail_item wire">
-      <div class="title ">附件：</div>
-      <div class="item">
-        <div class="item_file" @click="downloadFile(fileList[index], index)" v-for="(item, index) in imgList" :key="index">
-          <img
-            class="file"
-            :src="
-              item.substring(item.lastIndexOf('.') + 1) == 'doc' ||
-              item.substring(item.lastIndexOf('.') + 1) == 'docx'
-                ? word
-                : excel
-            "
-            alt=""
-            
-          />
-          <p
-            class="img_text"
-            :title="imgList[index].replace('/profile/upload/', '')"
+      <div class="detail_item wire">
+        <div class="title">附件：</div>
+        <div class="item">
+          <div
+            class="item_file"
+            @click="downloadFile(fileList[index], index)"
+            v-for="(item, index) in imgList"
+            :key="index"
           >
-            {{ imgList[index].replace("/profile/upload/", "") }}
-          </p>
+            <img
+              class="file"
+              :src="
+                item.substring(item.lastIndexOf('.') + 1) == 'doc' ||
+                item.substring(item.lastIndexOf('.') + 1) == 'docx'
+                  ? word
+                  : excel
+              "
+              alt=""
+            />
+            <p
+              class="img_text"
+              :title="imgList[index].replace('/profile/upload/', '')"
+            >
+              {{ imgList[index].replace("/profile/upload/", "") }}
+            </p>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="mfooter">
-      <el-button @click="$layer.close(layerid)">返 回</el-button>
-    </div>
+
+      <div class="mfooter">
+        <el-button @click="$layer.close(layerid)">返 回</el-button>
+      </div>
+    </el-form>
   </div>
 </template>
 
@@ -111,14 +176,24 @@ export default {
 .cmain .detail_item {
   display: flex;
   align-items: flex-start;
-  margin-bottom: 50px;
+  margin-top: 20px;
+  margin-bottom: 20px;
 }
-.wire{
-
+.wire {
 }
 .detail_item .title {
   width: 100px;
   margin: 0;
+  font-size: 14px;
+  font-weight: 600;
+  color: #606266;
+}
+
+.status {
+  color: #409eff;
+  padding: 4px 8px;
+  border: 1px solid #409eff;
+  border-radius: 4px;
 }
 .cmain .detail_item p {
   margin: 0;
@@ -130,8 +205,7 @@ export default {
   margin-right: 10px;
 }
 
-
-.item_file{
+.item_file {
   cursor: pointer;
   display: flex;
   align-items: center;

src/views/norm/feeindex.vue

@@ -99,7 +99,7 @@
         <el-table-column
           label="计量单位"
           align="center"
-          prop="funit_dictText"
+          prop="funitName"
           width="100"
         />
         <el-table-column

src/views/task/index.vue

@@ -85,7 +85,7 @@
       <span slot="footer" class="dialog-footer" v-if="taskList.status == 0">
         <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>
+        <!-- <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>