数据采集录入

src/api/portal/ARTICLE/ARTICLE.js

@@ -101,3 +101,11 @@ export function getqueryArticleDate() {
   })
 }
 
+//历史记录
+
+export function getqueryArticleHisDate() {
+  return request({
+    url: '/ARTICLE/ArticleHis',
+    method: 'get',
+  })
+}

src/api/portal/GARDENBASEDATA/GARDENBASEDATA.js

@@ -53,9 +53,10 @@ export function delGARDENBASEDATA(id) {
 }
 
 // 企业名录列表
-export function getEnterprise(id) {
+export function getEnterprise(query) {
   return request({
     url: "/system/dept/list",
     method: "get",
+    params: query,
   });
 }

src/views/ARTICLE/index.vue

@@ -104,6 +104,17 @@
         >设置重点项目录入开放时间</el-button
         >
       </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-search"
+          @click="handleSelect"
+          v-hasPermi="['business:ARTICLE:ArticleHis']"
+        >查看历史记录</el-button
+        >
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -270,6 +281,36 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 历史记录 -->
+    <el-dialog :title="historyTitle" :visible.sync="history" :close-on-click-modal="false" width="500px" append-to-body>
+      <h1>历史记录</h1>
+      <!-- <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 v-if="item.comments != null">{{
+                  "审核意见：" + item.comments
+                }}</p>
+              </p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline> -->
+    </el-dialog>
   </div>
 </template>
 
@@ -283,6 +324,7 @@ import {
   getUserInfo,
   articleDate,
   getqueryArticleDate,
+  getqueryArticleHisDate,
 } from '@/api/portal/ARTICLE/ARTICLE.js'
 import edit from "./edit.vue";
 import enterData from "./enterData.vue";
@@ -293,6 +335,7 @@ export default {
   name: "ARTICLE",
   data() {
     return {
+      bsqList:[],
       isButtonDisabled: false,
       scaleList: [
         { label: "小型", value: 1 },
@@ -323,6 +366,9 @@ export default {
       ARTICLEList: [],
       // 弹出层标题
       title: "",
+      // 历史记录列表
+      historyTitle:"",
+      history:false,
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -514,6 +560,13 @@ export default {
       this.open = true;
       this.title = "设置重点项目录入开放时间";
     },
+
+    // 查看历史记录
+    handleSelect(){
+      getqueryArticleHisDate().then(res=>{
+        console.log(res.data);
+      })
+    },
     submitForm(){
       if (new Date(this.form.endTime) < new Date(this.form.beginTime)) {
         this.$message.error('截止时间不能早于开始时间');

src/views/AttendMeeting/index.vue

@@ -87,13 +87,26 @@
     >
       <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column label="会议标题" width="360" align="center" show-overflow-tooltip  fixed prop="conferenceTitle">
+      <el-table-column
+        label="会议标题"
+        width="360"
+        align="center"
+        show-overflow-tooltip
+        fixed
+        prop="conferenceTitle"
+      >
         <template slot-scope="scope">
           {{ scope.row.conferenceTitle }}
         </template>
       </el-table-column>
 
-      <el-table-column label="协作单位" width="500" align="center" show-overflow-tooltip prop="cooperativeUnit">
+      <el-table-column
+        label="协作单位"
+        width="500"
+        align="center"
+        show-overflow-tooltip
+        prop="cooperativeUnit"
+      >
         <template slot-scope="scope">
           {{ scope.row.cooperativeUnit }}
         </template>
@@ -108,8 +121,24 @@
           <el-tag v-else-if="scope.row.status == 3" type="info">已完成</el-tag>
         </template>
       </el-table-column>
+      <el-table-column
+        label="提交人"
+        width="140"
+        align="center"
+        show-overflow-tooltip
+        prop="updateBy"
+      >
+      </el-table-column>
+      <el-table-column
+        label="提交时间"
+        width="160"
+        align="center"
+        show-overflow-tooltip
+        prop="updateTime"
+      >
+      </el-table-column>
 
-      <el-table-column label="已回复单位数量" align="center" prop="replied">
+      <el-table-column label="已回复单位数量"  width="200" align="center" prop="replied">
         <template slot-scope="scope">
           {{ scope.row.replied }}
         </template>
@@ -134,14 +163,21 @@
             size="mini"
             type="text"
             @click="handleUnit(scope.row)"
-            v-if="scope.row.condition !=1 && scope.row.status !=3   && checkPermi(['business:JOINTCONFERENCE:edit'])"
+            v-if="
+              scope.row.condition != 1 &&
+              scope.row.status != 3 &&
+              checkPermi(['business:JOINTCONFERENCE:edit'])
+            "
             >单位指派</el-button
           >
           <el-button
             size="mini"
             type="text"
             @click="handleReply(scope.row)"
-            v-if="scope.row.status != 3 &&checkPermi(['business:CONFERENCEREPLY:add'])"
+            v-if="
+              scope.row.status != 3 &&
+              checkPermi(['business:CONFERENCEREPLY:add'])
+            "
             >会议回复</el-button
           >
         </template>
@@ -159,7 +195,7 @@
 </template>
 
 <script>
-import {getUserInfo} from "@/api/portal/ARTICLE/ARTICLE"
+import { getUserInfo } from "@/api/portal/ARTICLE/ARTICLE";
 
 import {
   listJOINTCONFERENCE,
@@ -281,7 +317,7 @@ export default {
       const id = row.id || this.ids;
       this.iframe({
         obj: add,
-        param: { id: id,edit:true },
+        param: { id: id, edit: true },
         title: "单位指派",
         width: "750px",
         height: "60%",
@@ -418,7 +454,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-p{
+p {
   margin: 0;
 }
 </style>

src/views/GARDENBASEDATA/index.vue

@@ -938,7 +938,7 @@ export default {
   },
   created() {
     this.getList();
-    getEnterprise().then((res) => {
+    getEnterprise({type:3}).then((res) => {
       this.deptList = res.data;
     });
   },

src/views/GATHER/index.vue

@@ -78,14 +78,23 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="月份" prop="month">
-        <el-date-picker
+        <!-- <el-date-picker
           v-model="queryParams.month"
           type="month"
           format="MM"
           value-format="MM"
           placeholder="选择月份"
           class="se"
-        ></el-date-picker>
+        ></el-date-picker> -->
+
+        <el-select v-model="queryParams.month" placeholder="请选择月份">
+    <el-option
+      v-for="item in monthOpt"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value">
+    </el-option>
+  </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"
@@ -464,24 +473,32 @@
       center
       :title="title"
       :visible.sync="open"
-      width="65%"
+      width="95%"
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-tabs
+      <!-- <el-tabs
         v-if="this.form.type == 0"
         v-model="activeName"
         type="border-card"
         @tab-click="handleClick"
-      >
-        <el-tab-pane
-          v-for="(item, index) in tabList"
+      > -->
+        <div>
+
+       <div 
+       v-for="(item, index) in tabList"
           :key="index + 'tabs'"
           :label="item.normName"
           :name="item.normName"
-        >
-          <el-row :gutter="10">
-            <template v-for="listItem in form.feeLists">
+          style="margin:0 auto;"
+       >
+
+       <el-col :span="16" v-if="index % 2 == 0"  
+       style="padding:10px;border:1px solid rgba(0, 0, 0, .05);width: 66%;margin: 5px;"
+       >
+        {{ item.normName }}
+        
+          <template v-for="listItem in form.feeLists">
               <el-form
                 v-if="listItem.normId == item.normId"
                 :rules="
@@ -496,19 +513,15 @@
                 :key="listItem.normfeeId"
                 :disabled="listItem.sendValue == 1"
               >
-                <!-- :key="index + listIndex + listItem.normId" -->
-                <!-- :rules="rules" ref="form" -->
-
                 <el-col :span="12">
                   <el-form-item
+                  style="padding:10px;"
                     :label="
                       listItem.normfeeName + '（' + listItem.funitName + '）'
                     "
                     prop="collCalue"
                   >
-                    <!-- 这里科研失败！想动态绑定校验规则的 -->
-                    <!-- :prop="listItem.normfeeId" -->
-                    <!-- :rules="rules.listItem.normfeeId" -->
+
                     <el-input
                       v-model="listItem.collCalue"
                       :placeholder="'请输入' + listItem.normfeeName"
@@ -517,45 +530,83 @@
                 </el-col>
               </el-form>
             </template>
-          </el-row>
-          <!-- 这里是第二种写法 -->
-          <!-- <el-form :model="form" label-width="300px">
-            <el-form-item
-              v-for="(listItem, listIndex) in item.list"
-              :key="listIndex + 'item.list'"
-              :label="listItem.normfeeName"
-            >
-              <el-input
-                v-model="listItem.collCalue"
-                :placeholder="'请输入' + listItem.normfeeName"
-              ></el-input>
-            </el-form-item>
-          </el-form> -->
-        </el-tab-pane>
-      </el-tabs>
-      <template v-else-if="this.form.type == 1">
-        <el-form
-          v-for="listItem in form.feeLists"
-          :model="listItem"
-          :ref="'form' + listItem.normfeeId"
-          :rules="rules"
-          :key="listItem.normfeeId"
-        >
-          <!-- :rules="rules" ref="form" -->
-          <el-form-item
-            :label="listItem.normfeeName + '（' + listItem.funitName + '）'"
-            prop="collCalue"
+        
+
+
+      </el-col>
+          <el-col :span="8" v-else 
+          style="padding:10px;border:1px solid rgba(0, 0, 0, .05);width: 32%;margin: 5px;"
           >
-            <!-- 这里科研失败！想动态绑定校验规则的 -->
-            <!-- :prop="listItem.normfeeId" -->
-            <!-- :rules="rules.listItem.normfeeId" -->
-            <el-input
-              v-model="listItem.collCalue"
-              :placeholder="'请输入' + listItem.normfeeName"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-      </template>
+            {{ item.normName }}
+            <template v-for="listItem in form.feeLists">
+              <el-form
+                v-if="listItem.normId == item.normId"
+                :rules="
+                  validatorList(
+                    listItem.normfeeCode,
+                    listItem.normfeeName,
+                    listItem.sendValue
+                  )
+                "
+                :model="listItem"
+                :ref="'form' + listItem.normfeeId"
+                :key="listItem.normfeeId"
+                :disabled="listItem.sendValue == 1"
+              >
+                <el-col :span="24">
+                  <el-form-item
+                    :label="
+                      listItem.normfeeName + '（' + listItem.funitName + '）'
+                    "
+                    prop="collCalue"
+                  >
+
+                    <el-input
+                      v-model="listItem.collCalue"
+                      :placeholder="'请输入' + listItem.normfeeName"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-form>
+            </template>
+          </el-col>
+        
+         <!-- <template v-for="listItem in form.feeLists">
+              <el-form
+                v-if="listItem.normId == item.normId"
+                :rules="
+                  validatorList(
+                    listItem.normfeeCode,
+                    listItem.normfeeName,
+                    listItem.sendValue
+                  )
+                "
+                :model="listItem"
+                :ref="'form' + listItem.normfeeId"
+                :key="listItem.normfeeId"
+                :disabled="listItem.sendValue == 1"
+              >
+                <el-col :span="8">
+                  <el-form-item
+                    :label="
+                      listItem.normfeeName + '（' + listItem.funitName + '）'
+                    "
+                    prop="collCalue"
+                  >
+
+                    <el-input
+                      v-model="listItem.collCalue"
+                      :placeholder="'请输入' + listItem.normfeeName"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-form>
+            </template> -->
+       
+       </div>
+        </div>
+      <!-- </el-tabs> -->
+      
       <div slot="footer" class="dialog-footer">
         <el-button v-if="checkPermi(['gather:GATHER:add'])" type="primary" @click="submitForm('add')">确 定</el-button>
         <el-button v-if="checkPermi(['gather:GATHER:add'])" @click="submitForm('draft')" type="warning">暂 存</el-button>
@@ -595,7 +646,6 @@
                 :key="listItem.normfeeId"
                 :disabled="listItem.sendValue == 1"
               >
-                <!-- :rules="rules" ref="form" -->
                 <el-col :span="12">
                   <el-form-item
                     prop="collCalue"
@@ -603,9 +653,7 @@
                       listItem.normfeeName + '（' + listItem.funitName + '）'
                     "
                   >
-                    <!-- 这里科研失败！想动态绑定校验规则的 -->
-                    <!-- :prop="listItem.normfeeId" -->
-                    <!-- :rules="rules.listItem.normfeeId" -->
+
                     <el-input
                       :disabled="!edit"
                       v-model="listItem.collCalue"
@@ -617,45 +665,11 @@
             </template>
           </el-row>
 
-          <!-- 这里是第二种写法 -->
-          <!-- <el-form :model="form" label-width="150px">
-            <el-form-item
-              v-for="(listItem, listIndex) in item.list"
-              :key="listIndex + 'item.list'"
-              :label="listItem.normfeeName"
-            >
-              <el-input
-                v-model="listItem.collCalue"
-                :placeholder="'请输入' + listItem.normfeeName"
-              ></el-input>
-            </el-form-item>
-          </el-form> -->
+         
         </el-tab-pane>
       </el-tabs>
 
-      <template v-else-if="this.form.type == 1">
-        <el-form
-          v-for="listItem in form.feeLists"
-          :model="listItem"
-          :ref="'form' + listItem.normfeeId"
-          :rules="rules"
-          :key="listItem.normfeeId"
-        >
-          <!-- :rules="rules" ref="form" -->
-          <el-form-item
-            :label="listItem.normfeeName + '（' + listItem.funitName + '）'"
-            prop="collCalue"
-          >
-            <!-- 这里科研失败！想动态绑定校验规则的 -->
-            <!-- :prop="listItem.normfeeId" -->
-            <!-- :rules="rules.listItem.normfeeId" -->
-            <el-input
-              v-model="listItem.collCalue"
-              :placeholder="'请输入' + listItem.normfeeName"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-      </template>
+      
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm('edit')" v-if="edit"
           >确 定</el-button
@@ -704,7 +718,7 @@
 </template>
 
 <script>
-import { getInfo } from "@/api/login.js";
+
 import {
   compute,
   listGATHER,
@@ -732,6 +746,45 @@ export default {
   name: "GATHER",
   data() {
     return {
+
+      monthOpt: [{
+          value: '01',
+          label: '1月'
+        }, {
+          value: '02',
+          label: '2月'
+        }, {
+          value: '03',
+          label: '3月'
+        }, {
+          value: '04',
+          label: '4月'
+        }, {
+          value: '05',
+          label: '5月'
+        }, {
+          value: '06',
+          label: '6月'
+        }, {
+          value: '07',
+          label: '7月'
+        }, {
+          value: '08',
+          label: '8月'
+        }, {
+          value: '09',
+          label: '9月'
+        }, {
+          value: '10',
+          label: '10月'
+        }, {
+          value: '11',
+          label: '11月'
+        }, {
+          value: '12',
+          label: '12月'
+        }
+      ],
       // 审核、驳回
       check: false,
       // 数据id
@@ -831,9 +884,6 @@ export default {
   created() {
     this.getList();
     this.bondedList();
-    // getInfo().then((res) => {
-    //   //  this.data = res;
-    // });
   },
   methods: {
     checkPermi,

src/views/JOINTCONFERENCE/index.vue

@@ -109,6 +109,13 @@
         </template>
       </el-table-column>
 
+      <el-table-column label="提交人" width="500" align="center" show-overflow-tooltip prop="updateBy">
+      
+      </el-table-column>
+      <el-table-column label="提交时间" width="500" align="center" show-overflow-tooltip prop="updateTime">
+    
+      </el-table-column>
+
       <el-table-column label="已回复单位数量" align="center" prop="replied">
         <template slot-scope="scope">
           {{ scope.row.replied }}