Merge remote-tracking branch 'origin/develop' into develop

src/components/roleTree/index.vue

@@ -124,6 +124,26 @@
                 this.isVisible2 = false
             },
             saveUserInfo () {
+                if (this.nodeList.length) {
+                    let ids = ''
+                    this.nodeList.forEach(item => {
+                        if (ids.length > 0) {
+                            ids += ','
+                            ids += item
+                        } else {
+                            ids = item
+                        }
+                    })
+                    let oldList = []
+                    this.$http.get('SarInstitution/institution/getNextById', {
+                        ids: ids
+                    }, {
+                        _this: this
+                    }, res => {
+                        oldList = res
+                    })
+                } else {
+                }
                 this.isVisible2 = false
                 this.$emit('checkedRole', this.roleList)
             },

src/pages/processCenter/pages/creatProcess/bzdy/step5.vue

@@ -356,10 +356,12 @@
             },
             handleSave() {
                 this.saveLoading = true
+                let json = this.form
+                json.responUserList = this.tableData
                 let _formData = new FormData()
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
-                    form: this.form,
+                    form: json,
                     commentText: this.commentText,
                 }))
                 saveTaskForPub(_formData).then(res => {

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -374,7 +374,7 @@
                     <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
                         <el-input
                                 v-model="plForm.technicalRequir"
-                                placeholders="请输入核心技术要求"
+                                placeholder="请输入核心技术要求"
                                 maxlength="500"
                         ></el-input>
                     </el-form-item>

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -727,6 +727,7 @@ export default {
     uploadBackSuccess (res, file, fileList) {
       if (res.ok) {
         this.fileInfoList.push(res.data)
+        this.listForm.fileName = this.fileInfoList
         this.$message.success('上传成功')
       } else {
         this.$message.error(res.message)
@@ -784,7 +785,6 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item.commentText);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         if(item.form === undefined){

src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue

@@ -46,8 +46,8 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                    <div class="table-jump" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
-                      {{ item.fileName }}
+                        <span @click="updataFj(item)">{{ item.fileName }}</span>
                         <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -375,7 +375,6 @@ export default {
       let _formData = new FormData();
       let json = this.form;
       json.data = this.data;
-      console.log(json);
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "3");
       _formData.append("taskIds", this.taskIds);
@@ -426,6 +425,7 @@ export default {
           this.form.endTime = data.endTime || data.form.endTime;
           this.form.cname = data.cname || data.form.cname;
           this.oldData = JSON.parse(JSON.stringify(data.summaryList))
+          console.log(data);
           data.summaryList.forEach(item => {
             if (item.state) {
             } else {
@@ -433,6 +433,12 @@ export default {
             }
             item.type = false;
           });
+          data.info.forEach(item => {
+            if (item.state) {
+            } else {
+              item.state = "1";
+            }
+          });
           this.json = data;
           this.data = data.info
           if (data.introduce) {

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -869,7 +869,11 @@ export default {
         }, {
           _this: this
         }, res => {
-          this.listForm.breakdownList = res.data;
+          let breakdown = res.data
+          breakdown.forEach(item => {
+            delete item.termsConditions
+          })
+          this.listForm.breakdownList = breakdown;
           this.ListModel = false;
         }, e => {
           this.$message.error("添加失败");

src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue

@@ -381,35 +381,34 @@
         <el-button type="primary" size="mini" @click="okStand">添加</el-button>
       </div>
     </el-drawer>
-    <ProcessFooter
-      show-save
-      show-transfer
-      show-affirm
-      :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
-      @submit="handleSubmit"
-      @transfer="handleTransfer"
-      @save="handleSave"
-      :approval="true"
-    >
-    </ProcessFooter>
 <!--    <ProcessFooter-->
-<!--      :show-save="submitShow"-->
+<!--      show-save-->
-<!--      :show-transfer="submitShow"-->
+<!--      show-transfer-->
-<!--      :show-affirm="submitShow"-->
+<!--      show-affirm-->
-<!--      :show-submit="submitShow"-->
-<!--      :show-confirm="acceptShow"-->
 <!--      :submitLoading="isSubmit"-->
 <!--      :transfer-loading="isTransfer"-->
 <!--      :saveLoading="saveLoading"-->
 <!--      @submit="handleSubmit"-->
 <!--      @transfer="handleTransfer"-->
 <!--      @save="handleSave"-->
-<!--      @accept="handleAccept"-->
 <!--      :approval="true"-->
 <!--    >-->
 <!--    </ProcessFooter>-->
+    <ProcessFooter
+      :show-save="submitShow"
+      :show-transfer="submitShow"
+      :show-affirm="submitShow"
+      show-confirm
+      :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
+      :saveLoading="saveLoading"
+      @submit="handleSubmit"
+      @transfer="handleTransfer"
+      @save="handleSave"
+      @accept="handleAccept"
+      :approval="true"
+    >
+    </ProcessFooter>
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
         check-box

src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue

@@ -2,37 +2,38 @@
 <template>
   <div id="listOfMeeting" class="child3">
     <!-- 第一第二行表单 -->
-    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+    <el-form :inline="true" :model="form" class="demo-form-inline">
       <el-form-item label="会议名称">
-        <el-input v-model="formQuery.name" size="small" placeholder="请输入会议名称"></el-input>
+        <el-input v-model="form.meeting" size="small" placeholder="请输入会议名称"></el-input>
       </el-form-item>
       <el-form-item label="会议时间">
-        <el-select v-model="formQuery.time" size="small" placeholder="请选择会议时间">
+        <el-date-picker
-          <el-option label="1" value="one"></el-option>
+                v-model="form.time"
-          <el-option label="2" value="two"></el-option>
+                size="small"
-        </el-select>
+                value-format="yyyy-MM-dd HH:mm:ss"
+                type="datetime"
+                placeholder="请选择会议时间">
+        </el-date-picker>
       </el-form-item>
       <el-form-item label="参加单位">
-        <el-select v-model="formQuery.part" size="small" placeholder="请选择参加单位">
+        <el-input v-model="form.participants" size="small" placeholder="请输入主要议题">
-          <el-option label="1" value="one"></el-option>
+        </el-input>
-          <el-option label="2" value="two"></el-option>
-        </el-select>
       </el-form-item>
       <el-form-item label="主要议题">
-        <el-input v-model="formQuery.theme" size="small" placeholder="请输入主要议题">
+        <el-input v-model="form.issues" size="small" placeholder="请输入主要议题">
         </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="">查询</el-button>
+        <el-button type="primary" size="small" @click="queryForm">查询</el-button>
-        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+        <el-button type="" size="small" @click="resetForm">清空</el-button>
       </el-form-item>
       <el-divider/>
       <div style="float: left">
-        <el-button type="primary" size="small" @click="drawer = true">新增</el-button>
+        <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
-        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
+<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
+<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
-        <el-button type="primary" size="small" onclick="">模板下载</el-button>
+<!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
     </el-form>
     <el-divider/>
@@ -53,99 +54,91 @@
         </el-table-column>
         <el-table-column
           align="center"
-          type="index"
+          prop="host"
-          label="序号"
-          width="100"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="holdUnit"
           label="主办单位"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingName"
+          prop="meeting"
           label="会议名称"
           width="150"
         >
         </el-table-column>
-
         <el-table-column
           align="center"
-          prop="meetingTime"
+          prop="time"
           label="会议时间"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingArea"
+          prop="place"
           label="会议地点"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="costStandard"
+          prop="contributions"
           label="会费标准"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="reality"
+          prop="occurs"
           label="会费实际发生"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="costList"
+          prop="expenses"
           label="费用列支"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="partner"
+          prop="user"
           label="参会人员"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="leader"
+          prop="leadership"
           label="主管领导"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="unit"
+          prop="participants"
-          label="参与单位"
+          label="参会单位"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingMeans"
+          prop="information"
           label="会议资料"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingSound"
+          prop="recording"
           label="会议录音"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingTheme"
+          prop="issues"
           label="主要议题"
           width="150"
         >
@@ -156,6 +149,9 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="''">
+                    查看
+                  </el-dropdown-item>
                   <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="''">
                     编辑
                   </el-dropdown-item>
@@ -170,114 +166,139 @@
       </el-table>
       <loading :loading="loading">加载中...</loading>
       <pagination
-        :page="formQuery.page"
+        :page="form.page"
         :total="tableTotal"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"/>
     </div>
     <!-- 新增抽屉 -->
     <el-drawer
-      size="50%"
+      size="1000px"
+      :before-close="addDrawerClose"
       :title="drawerTitle"
       :visible.sync="drawerTable">
-      <div style="margin: 10px;">
+      <div class="demo-drawer-content" v-if="drawerTable">
-        <el-form label-width="150px" style="overflow-y: scroll" ref="formShowData" :model="formShowData" :rules="formRules">
+        <div class="content">
-          <el-form-item label="主办单位">
+          <div class="standard-table-search">
-            <el-input v-model="formShowData.holdUnit" type="text" placeholder="请填写"></el-input>
+            <el-row :gutter="24">
-          </el-form-item>
+              <el-col :span="24">
-          <el-form-item label="会议名称">
+                <el-form :model="addForm"  inline class="label-input-form" label-width="180px" :rules="formRules" ref="addForm">
-            <el-input v-model="formShowData.meetingName" type="text" placeholder="请填写"></el-input>
+                  <el-form-item prop="host" label="主办单位" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          </el-form-item>
+                    <el-input
-          <el-form-item label="会议时间">
+                            :disabled="DrawerType === 'see'"
-            <el-select v-model="formShowData.meetingTime" type="text" placeholder="请选择">
+                            v-model="addForm.host"
-              <el-option label="1" value="one"></el-option>
+                            placeholder="请输入主办单位"
-              <el-option label="2" value="two"></el-option>
+                            :maxlength="500"/>
-            </el-select>
+                  </el-form-item>
-          </el-form-item>
+                  <el-form-item prop="meeting" label="会议名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-form-item label="会议地点">
+                    <el-input
-            <el-select v-model="formShowData.meetingArea" type="text" placeholder="请填写">
+                            :disabled="DrawerType === 'see'"
-              <el-option label="1" value="one"></el-option>
+                            v-model="addForm.meeting"
-              <el-option label="2" value="two"></el-option>
+                            placeholder="请输入会议名称"
-            </el-select>
+                            :maxlength="500"/>
-          </el-form-item>
+                  </el-form-item>
-          <el-form-item label="会费标准">
+                  <el-form-item label="会议时间" style="width: 100%; margin-right:10px" prop="time" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.costStandard" placeholder="请选择" type="text">
+                    <el-date-picker
-              <el-option label="1" value="one"></el-option>
+                            v-model="addForm.time"
-              <el-option label="2" value="two"></el-option>
+                            :disabled="DrawerType === 'see'"
-            </el-select>
+                            value-format="yyyy-MM-dd HH:mm:ss"
-          </el-form-item>
+                            type="datetime"
-          <el-form-item label="会费实际发生">
+                            placeholder="请选择会议时间">
-            <el-select v-model="formShowData.reality" placeholder="请选择">
+                    </el-date-picker>
-              <el-option label="1" value="one"></el-option>
+                  </el-form-item>
-              <el-option label="2" value="two"></el-option>
+                  <el-form-item prop="place" label="会议地点" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            </el-select>
+                    <el-input
-          </el-form-item>
+                            :disabled="DrawerType === 'see'"
-          <el-form-item label="费用列支">
+                            v-model="addForm.place"
-            <el-select v-model="formShowData.costList" placeholder="请选择">
+                            placeholder="请输入会议地点"
-              <el-option label="1" value="one"></el-option>
+                            :maxlength="500"/>
-              <el-option label="2" value="two"></el-option>
+                  </el-form-item>
-            </el-select>
+                  <el-form-item prop="contributions" label="会费标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          </el-form-item>
+                    <el-input
-          <el-form-item label="参会人员">
+                            :disabled="DrawerType === 'see'"
-            <el-input v-model="formShowData.partner" type="text" placeholder="请填写"></el-input>
+                            v-model="addForm.contributions"
-          </el-form-item>
+                            placeholder="请输入会费标准"
-          <el-form-item label="主管领导">
+                            :maxlength="500"/>
-            <el-input v-model="formShowData.leader" placeholder="请填写">
+                  </el-form-item>
-            </el-input>
+                  <el-form-item prop="occurs" label="会费实际发生" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          </el-form-item>
+                    <el-input
-          <el-form-item label="参与单位">
+                            :disabled="DrawerType === 'see'"
-            <el-input v-model="formShowData.unit" type="text" placeholder="请填写"></el-input>
+                            v-model="addForm.occurs"
-          </el-form-item>
+                            placeholder="请输入会费实际发生"
-          <el-form-item label="会议录音">
+                            :maxlength="500"/>
-            <el-input v-model="formShowData.meetingSound" type="text" placeholder="请填写"></el-input>
+                  </el-form-item>
-          </el-form-item>
+                  <el-form-item prop="expenses" label="费用列支" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-form-item label="主要议题">
+                    <el-input
-            <el-input v-model="formShowData.meetingTheme" type="text" placeholder="请填写"></el-input>
+                            :disabled="DrawerType === 'see'"
-          </el-form-item>
+                            v-model="addForm.expenses"
-        </el-form>
+                            placeholder="请输入费用列支"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="user" label="参会人员" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.user"
+                            placeholder="请输入参会人员"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="leadership" label="主管领导" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.leadership"
+                            placeholder="请输入主管领导"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="participants" label="参会单位" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.participants"
+                            placeholder="请输入参会单位"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="information" label="会议资料" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.information"
+                            placeholder="请输入会议资料"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="recording" label="会议录音" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.recording"
+                            placeholder="请输入会议录音"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="issues" label="主要议题" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.issues"
+                            placeholder="请输入主要议题"
+                            :maxlength="500"/>
+                  </el-form-item>
+                </el-form>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
       </div>
-      <div class="demo-drawer-footer">
+      <div class="demo-drawer-footer" v-if="DrawerType !== 'see'">
-        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button
-        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+                size="mini"
+                class="common-button-primary"
+                icon="el-icon-check"
+                type="primary"
+                :loading="subLoading"
+                @click="submit">提交
+        </el-button>
+        <el-button
+                size="mini"
+                class="common-button-default"
+                icon="el-icon-close"
+                @click="addDrawerClose">取消</el-button>
       </div>
-
     </el-drawer>
-
-    <!--    <div>
-          &lt;!&ndash; 导入弹框 &ndash;&gt;
-          <el-dialog
-              title="导入文件"
-              :visible.sync="dialogVisible1"
-              width="30%"
-          >
-            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
-          </el-dialog>
-          &lt;!&ndash;   导出弹框 &ndash;&gt;
-          <el-dialog
-              title="导出文件"
-              :visible.sync="dialogVisible2"
-              width="30%"
-          >
-            <el-form :model="formInlineOut">
-              <el-form-item label="名称" >
-                <el-input v-model="formInlineOut.name" style="width:350px"></el-input>
-              </el-form-item>
-              <el-form-item label="序号" >
-                <el-input v-model="formInlineOut.num" style="width:350px"></el-input>
-              </el-form-item>
-              <el-form-item label="备注" >
-                <el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
-              </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible2 = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible2 = false">确 定</el-button>
-          </span>
-          </el-dialog>
-        </div>-->
   </div>
-
-
 </template>
 
 <script>
@@ -285,79 +306,249 @@ export default {
   name: "child3",
   data() {
     return {
+      subLoading: false,
       loading: false,
-      formQuery: {
+      form: {
-        name: '',
+        meeting: '',
         time: '',
-        part: '',
+        participants: '',
-        theme: '',
+        issues: '',
-        current: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
       },
       tableTotal: 0,
       tableData: [],
       multipleSelection: [],
-      formShowData: {
+      addForm: {
-        holdUnit: '',
+        host: '',
-        mneetingName: '',
+        meeting: '',
-        meetingTime: '',
+        time: '',
-        meetingArea: '',
+        place: '',
-        costStandard: '',
+        contributions: '',
-        reality: '',
+        occurs: '',
-        costList: '',
+        expenses: '',
-        partner: '',
+        user: '',
-        leader: '',
+        leadership: '',
-        unit: '',
+        participants: '',
-        meetingMeans: '',
+        information: '',
-        meetingSound: '',
+        recording: '',
-        meetingTheme: ''
+        issues: '',
+      },
+      formRules: {
+        host: [
+          {required: true, message: '请输入主办单位', trigger: 'blur'},
+        ],
+        meeting: [
+          {required: true, message: '请输入会议名称', trigger: 'blur'},
+        ],
+        time: [
+          {required: true, message: '请选择会议时间', trigger: 'change'},
+        ],
+        place: [
+          {required: true, message: '请输入会议地点', trigger: 'blur'},
+        ],
+        contributions: [
+          {required: true, message: '请输入会费标准', trigger: 'blur'},
+        ],
+        occurs: [
+          {required: true, message: '请输入会费实际发生', trigger: 'blur'},
+        ],
+        expenses: [
+          {required: true, message: '请输入费用列支', trigger: 'blur'},
+        ],
+        user: [
+          {required: true, message: '请输入参会人员', trigger: 'blur'},
+        ],
+        leadership: [
+          {required: true, message: '请输入主管领导', trigger: 'blur'},
+        ],
+        participants: [
+          {required: true, message: '请输入参会单位', trigger: 'blur'},
+        ],
+        information: [
+          {required: true, message: '请输入会议资料', trigger: 'blur'},
+        ],
+        recording: [
+          {required: true, message: '请输入会议录音', trigger: 'blur'},
+        ],
+        issues: [
+          {required: true, message: '请输入主要议题', trigger: 'blur'},
+        ],
       },
-      formRules: {},
-
       drawerTitle: '',
       drawerTable: false,
-
+      DrawerType: '',
     }
   },
-
+  mounted () {
-  created() {
+    this.getData()
-    console.log(4)
   },
-
   methods: {
+    formDataAdd () {
+      this.DrawerType = 'add'
+      this.drawerTitle = '新增'
+      this.drawerTable = true
+    }, // 新增
+    queryForm () {
+      this.form.page = 1
+      this.getData()
+    }, // 查询
+    getData () {
+      this.loading = true
+      this.$http.get('wgdCensusLeo/wgd-wbtj/queryAllWbtjs', this.form, {
+        _this: this
+      }, res => {
+        this.loading = false
+        if (res.ok) {
+          this.tableData = res.data.list
+          this.tableTotal = res.data.count
+        }
+      })
+    }, // 获取数据
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-    //新增方法
     submit() {
-    },
+      this.$refs['addForm'].validate((valid) => {
-    //删除方法
+        if (valid) {
-    deleteDetail() {},
+          this.subLoading = true
-    //清空
+          let url = ''
-    resetForm() {},
+          let tips = ''
-
+          if (this.DrawerType === 'edit') {
+            url = 'wgdCensusLeo/wgd-wbtj/modWbtj'
+            tips = '编辑'
+          }else if (this.DrawerType === 'add') {
+            url = 'wgdCensusLeo/wgd-wbtj/addWbtj'
+            tips = '添加'
+          }
+          this.$http.post(url, this.addForm, {
+            _this: this
+          }, res => {
+            this.subLoading = false
+            if (res.ok) {
+              this.drawerTable = false
+              this.$message.success(tips + '成功')
+              this.getData()
+            } else {
+              this.$message.warning(tips + '失败')
+            }
+          })
+        } else {
+          this.$message.warning('请检查表单是否填写正确')
+        }
+      })
+    }, // 提交
+    addDrawerClose () {
+      this.addForm = {}
+      this.drawerTable = false
+    },// 关闭
+    deleteDetail() {
+      if (this.multipleSelection.length) {
+        this.$confirm('您是否确认删除选中数据?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          let ids = ''
+          this.multipleSelection.forEach(item => {
+            if (ids.length > 0) {
+              ids += ','
+              ids += item.id
+            } else {
+              ids = item.id
+            }
+          })
+          this.$http.post('wgdCensusLeo/wgd-wbtj/delWbtjs', {
+            ids: ids
+          }, {
+            _this: this
+          }, res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.form.page = 1
+              this.getData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {})
+      } else {
+        this.$message.warning('请选择要删除的数据')
+      }
+    }, //删除方法
+    resetForm() {
+      this.form.meeting = ''
+      this.form.time = ''
+      this.form.participants = ''
+      this.form.issues = ''
+      this.form.page = 1
+      this.getData()
+    }, //清空
     // 列表更多按钮
     handleCommand(command) {
       switch (command[1]) {
+        case "查看":
+          this.drawerTitle = '查看'
+          this.DrawerType = 'see'
+          this.drawerTable = true
+          this.addForm = command[0]
+          break
         case "编辑":
-          this.editRowOne(command[0]);
+          this.DrawerType = 'edit'
+          this.drawerTitle = '编辑'
+          this.drawerTable = true
+          this.addForm = {
+            id: command[0].id,
+            host: command[0].host,
+            meeting: command[0].meeting,
+            time: this.$moment(command[0].time).format("YYYY-MM-DD HH:mm:ss"),
+            place: command[0].place,
+            contributions: command[0].contributions,
+            occurs: command[0].occurs,
+            expenses: command[0].expenses,
+            user: command[0].user,
+            leadership: command[0].leadership,
+            participants: command[0].participants,
+            information: command[0].information,
+            recording: command[0].recording,
+            issues: command[0].issues,
+          }
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.$confirm('您是否确认删除选中数据?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            confirmButtonClass: 'common-button-primary',
+            roundButton: true
+          }).then(() => {
+            this.$http.post('wgdCensusLeo/wgd-wbtj/delWbtjs', {
+              ids: command[0].id
+            }, {
+              _this: this
+            }, res => {
+              if (res.ok) {
+                this.$message.success('删除成功')
+                this.form.page = 1
+                this.getData()
+              } else {
+                this.$message.warning('删除失败')
+              }
+            })
+          }).catch(() => {})
           break;
       }
     },
-    editRowOne() {},
-    deleteRowOne() {},
     /** 分页  */
     pageChange(page) {
-      this.formQuery.page = page
+      this.form.page = page
-      this.getTableData()
+      this.getData()
     },
     pageSizeChange(pageSize) {
-      this.formQuery.pageSize = pageSize
+      this.form.pageSize = pageSize
-      this.getTableData()
+      this.getData()
     },
   }
 }
@@ -368,7 +559,11 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-
+  .add-form-item {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+    }
+  }
   .pagination {
     position: inherit!important;
   }

src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue

@@ -2,36 +2,30 @@
 <template>
   <div id="listOfStandard" class="child4">
     <!-- 第一第二行表单 -->
-    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+    <el-form :inline="true" :model="form" class="demo-form-inline">
       <el-form-item label="标准编号">
-        <el-input v-model="formQuery.num" size="small" placeholder="请输入标准编号"></el-input>
+        <el-input v-model="form.number" size="small" placeholder="请输入标准编号"></el-input>
       </el-form-item>
       <el-form-item label="标准名称">
-        <el-select v-model="formQuery.name" size="small" placeholder="请选择标准名称"></el-select>
+        <el-input v-model="form.name" size="small" placeholder="请输入标准名称"></el-input>
-        <el-option label="1" value="one"></el-option>
-        <el-option label="2" value="two"></el-option>
       </el-form-item>
       <el-form-item label="标准制/修订">
-        <el-select v-model="formQuery.revise" size="small" placeholder="请选择标准制/修订">
+        <el-input v-model="form.revised" size="small" placeholder="请输入标准制/修订"></el-input>
-          <el-option label="1" value="one"></el-option>
-          <el-option label="2" value="two"></el-option>
-        </el-select>
       </el-form-item>
       <el-form-item label="主持/参与">
-        <el-input v-model="formQuery.directPartner" size="small" placeholder="请选择主持/参与">
+        <el-input v-model="form.preside" size="small" placeholder="请输入标主持/参与"></el-input>
-        </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="">查询</el-button>
+        <el-button type="primary" size="small" @click="queryForm">查询</el-button>
-        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+        <el-button type="" size="small" @click="resetForm">清空</el-button>
       </el-form-item>
       <el-divider/>
       <div style="float: left">
-        <el-button type="primary" size="small" @click="drawer = true">新增</el-button>
+        <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
-        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
+<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
+<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
-        <el-button type="primary" size="small" onclick="">模板下载</el-button>
+<!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
     </el-form>
     <el-divider/>
@@ -51,14 +45,6 @@
           align="center"
           type="selection"
           width="50">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          type="index"
-          label="序号"
-          width="50"
-        >
-
         </el-table-column>
         <el-table-column
           align="center"
@@ -69,145 +55,140 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="standardNum"
+          prop="number"
           label="标准号"
           width="150"
         >
         </el-table-column>
-
         <el-table-column
           align="center"
-          prop="standardName"
+          prop="name"
           label="标准名称"
           width="150"
         >
-
         </el-table-column>
         <el-table-column
           align="center"
-          prop="codeNum"
+          prop="projectId"
           label="项目代号"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="codeName"
+          prop="projectName"
           label="项目名称"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="standardType"
+          prop="type"
           label="标准类型"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="directPartner"
+          prop="preside"
           label="主持或参与"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="startTime"
+          prop="dataStart"
           label="发布日期"
           width="150"
         >
-          <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
         <el-table-column
           align="center"
-          prop="putTime"
+          prop="dataImplement"
           label="实施日期"
           width="150"
         >
-          <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
         <el-table-column
           align="center"
-          prop="organ"
+          prop="body"
           label="颁布机构"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="headDraft"
+          prop="drafting"
           label="牵头起草单位"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="recordTime"
+          prop="dataRecord"
           label="备案时间"
           width="150"
         >
-          <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
         <el-table-column
           align="center"
-          prop="putUnit"
+          prop="report"
           label="提报单位名称"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="partner"
+          prop="participants"
           label="参与人"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="writer"
+          prop="celebrity"
           label="署名人"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="standardCost"
+          prop="costMarking"
           label="制标费用"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="elseCost"
+          prop="costOther"
           label="其他费用"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="revise"
+          prop="revised"
           label="标准制/修订"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="prize"
+          prop="status"
           label="获奖情况"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="writerSort"
+          prop="signature"
           label="署名排序"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="remarks"
+          prop="remark"
           label="备注"
           width="150"
         >
@@ -218,6 +199,9 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="''">
+                    查看
+                  </el-dropdown-item>
                   <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="''">
                     编辑
                   </el-dropdown-item>
@@ -232,153 +216,199 @@
       </el-table>
       <loading :loading="loading">加载中...</loading>
       <pagination
-        :page="formQuery.page"
+        :page="form.page"
         :total="tableTotal"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"/>
     </div>
     <!-- 新增抽屉 -->
     <el-drawer
-      size="50%"
+            size="1000px"
-      :title="drawerTitle"
+            :before-close="addDrawerClose"
-      :visible.sync="drawerTable">
+            :title="drawerTitle"
-      <div style="margin: 10px;">
+            :visible.sync="drawerTable">
-        <el-form label-width="150px" style="overflow-y: scroll" ref="formShowData" :model="formShowData" :rules="formRules">
+      <div class="demo-drawer-content" v-if="drawerTable">
-          <el-form-item label="所处阶段">
+        <div class="content">
-            <el-select v-model="formShowData.stage" type="text" placeholder="请填写">
+          <div class="standard-table-search">
-              <el-option label="1" value="one"></el-option>
+            <el-row :gutter="24">
-              <el-option label="2" value="two"></el-option>
+              <el-col :span="24">
-            </el-select>
+                <el-form :model="addForm"  inline class="label-input-form" label-width="180px" :rules="formRules" ref="addForm">
-          </el-form-item>
+                  <el-form-item prop="stage" label="所处阶段" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-form-item label="标准号">
+                    <el-input
-            <el-input v-model="formShowData.standardNum" type="text" placeholder="请填写"></el-input>
+                            :disabled="DrawerType === 'see'"
-          </el-form-item>
+                            v-model="addForm.stage"
-          <el-form-item label="标准名称">
+                            placeholder="请输入所处阶段"
-            <el-input v-model="formShowData.standardName" type="text" placeholder="请填写">
+                            :maxlength="500"/>
-            </el-input>
+                  </el-form-item>
-          </el-form-item>
+                  <el-form-item prop="number" label="标准号" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-form-item label="标准类型">
+                    <el-input
-            <el-select v-model="formShowData.standardType" type="text" placeholder="请选择">
+                            :disabled="DrawerType === 'see'"
-              <el-option label="1" value="one"></el-option>
+                            v-model="addForm.number"
-              <el-option label="2" value="two"></el-option>
+                            placeholder="请输入标准号"
-            </el-select>
+                            :maxlength="500"/>
-          </el-form-item>
+                  </el-form-item>
-          <el-form-item label="主持或参与">
+                  <el-form-item prop="name" label="标准名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.directPartner" placeholder="请选择" type="text">
+                    <el-input
-              <el-option label="1" value="one"></el-option>
+                            :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                            v-model="addForm.name"
-            </el-select>
+                            placeholder="请输入标准名称"
-          </el-form-item>
+                            :maxlength="500"/>
-          <el-form-item label="发布日期">
+                  </el-form-item>
-            <el-select v-model="formShowData.startTime" placeholder="请选择">
+                  <el-form-item prop="projectId" label="项目代号" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-              <el-option label="1" value="one"></el-option>
+                    <el-input
-              <el-option label="2" value="two"></el-option>
+                            :disabled="DrawerType === 'see'"
-            </el-select>
+                            v-model="addForm.projectId"
-          </el-form-item>
+                            placeholder="请输入项目代号"
-          <el-form-item label="实施日期">
+                            :maxlength="500"/>
-            <el-select v-model="formShowData.putTime" placeholder="请选择">
+                  </el-form-item>
-              <el-option label="1" value="one"></el-option>
+                  <el-form-item prop="projectName" label="项目名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-              <el-option label="2" value="two"></el-option>
+                    <el-input
-            </el-select>
+                            :disabled="DrawerType === 'see'"
-          </el-form-item>
+                            v-model="addForm.projectName"
-          <el-form-item label="颁布机构">
+                            placeholder="请输入项目名称"
-            <el-input v-model="formShowData.organ" type="text" placeholder="请填写"></el-input>
+                            :maxlength="500"/>
-          </el-form-item>
+                  </el-form-item>
-          <el-form-item label="牵头起草单位">
+                  <el-form-item prop="type" label="标准类型" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.headDraft" placeholder="请填写">
+                    <el-input
-            </el-input>
+                            :disabled="DrawerType === 'see'"
-          </el-form-item>
+                            v-model="addForm.type"
-          <el-form-item label="备案时间">
+                            placeholder="请输入标准类型"
-            <el-input v-model="formShowData.recordTime" type="text" placeholder="请填写"></el-input>
+                            :maxlength="500"/>
-          </el-form-item>
+                  </el-form-item>
-          <el-form-item label="提报单位名称">
+                  <el-form-item prop="preside" label="主持或参与" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.putUnit" type="text" placeholder="请填写"></el-input>
+                    <el-input
-          </el-form-item>
+                            :disabled="DrawerType === 'see'"
-          <el-form-item label="参与人">
+                            v-model="addForm.preside"
-            <el-select v-model="formShowData.partner" type="text" placeholder="请填写">
+                            placeholder="请输入主持或参与"
-              <el-option label="1" value="one"></el-option>
+                            :maxlength="500"/>
-              <el-option label="2" value="two"></el-option>
+                  </el-form-item>
-            </el-select>
+                  <el-form-item prop="dataStart" label="发布日期" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          </el-form-item>
+                    <el-date-picker
-          <el-form-item label="标准制/修订">
+                            v-model="addForm.dataStart"
-            <el-select v-model="formShowData.revise" type="text" placeholder="请填写">
+                            :disabled="DrawerType === 'see'"
-              <el-option label="1" value="one"></el-option>
+                            value-format="yyyy-MM-dd"
-              <el-option label="2" value="two"></el-option>
+                            type="date"
-            </el-select>
+                            placeholder="请选择发布日期">
-          </el-form-item>
+                    </el-date-picker>
-          <el-form-item label="获奖情况">
+                  </el-form-item>
-            <el-input v-model="formShowData.prize" type="text" placeholder="请填写"></el-input>
+                  <el-form-item prop="dataImplement" label="实施日期" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          </el-form-item>
+                    <el-date-picker
-          <el-form-item label="署名排序">
+                            v-model="addForm.dataImplement"
-            <el-input v-model="formShowData.writerSort" type="text" placeholder="请填写"></el-input>
+                            :disabled="DrawerType === 'see'"
-          </el-form-item>
+                            value-format="yyyy-MM-dd"
-          <el-form-item label="备注">
+                            type="date"
-            <el-input v-model="formShowData.remarks" type="text" placeholder="请填写"></el-input>
+                            placeholder="请选择实施日期">
-          </el-form-item>
+                    </el-date-picker>
-        </el-form>
+                  </el-form-item>
-      </div>
+                  <el-form-item prop="body" label="颁布机构" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-      <div class="demo-drawer-footer">
+                    <el-input
-        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+                            :disabled="DrawerType === 'see'"
-        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+                            v-model="addForm.body"
+                            placeholder="请输入颁布机构"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="drafting" label="牵头起草单位" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.drafting"
+                            placeholder="请输入牵头起草单位"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="dataRecord" label="备案时间" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-date-picker
+                            v-model="addForm.dataRecord"
+                            :disabled="DrawerType === 'see'"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetime"
+                            placeholder="请选择备案时间">
+                    </el-date-picker>
+                  </el-form-item>
+                  <el-form-item prop="report" label="提报单位名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.report"
+                            placeholder="请输入提报单位名称"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="participants" label="参与人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.participants"
+                            placeholder="请输入参与人"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="celebrity" label="署名人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.celebrity"
+                            placeholder="请输入署名人"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="costMarking" label="制标费用" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.costMarking"
+                            placeholder="请输入制标费用"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="costOther" label="其他费用" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.costOther"
+                            placeholder="请输入其他费用"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="revised" label="标准制/修订" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.revised"
+                            placeholder="请输入标准制/修订"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="status" label="获奖情况" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.status"
+                            placeholder="请输入获奖情况"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="signature" label="署名排序" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.signature"
+                            placeholder="请输入署名排序"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="remark" label="备注" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.remark"
+                            placeholder="请输入备注"
+                            :maxlength="500"/>
+                  </el-form-item>
+                </el-form>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
       </div>
+      <div class="demo-drawer-footer" v-if="DrawerType !== 'see'">
+          <el-button
+                  size="mini"
+                  class="common-button-primary"
+                  icon="el-icon-check"
+                  type="primary"
+                  :loading="subLoading"
+                  @click="submit">提交
+          </el-button>
+          <el-button
+                  size="mini"
+                  class="common-button-default"
+                  icon="el-icon-close"
+                  @click="addDrawerClose">取消</el-button>
+        </div>
     </el-drawer>
-
-
-    <!--    <div>
-          &lt;!&ndash; 导入弹框 &ndash;&gt;
-          <el-dialog
-              title="导入文件"
-              :visible.sync="dialogVisible1"
-              width="30%"
-          >
-            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
-          </el-dialog>
-          &lt;!&ndash;   导出弹框 &ndash;&gt;
-          <el-dialog
-              title="导出文件"
-              :visible.sync="dialogVisible2"
-              width="30%"
-          >
-            <el-form :model="formInlineOut">
-              <el-form-item label="名称" >
-                <el-input v-model="formInlineOut.name" style="width:350px"></el-input>
-              </el-form-item>
-              <el-form-item label="序号" >
-                <el-input v-model="formInlineOut.num" style="width:350px"></el-input>
-              </el-form-item>
-              <el-form-item label="备注" >
-                <el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
-              </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible2 = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible2 = false">确 定</el-button>
-          </span>
-          </el-dialog>
-          &lt;!&ndash;  删除提示弹框  &ndash;&gt;
-          <el-dialog
-              :visible.sync="dialogVisible3"
-              width="30%"
-              title="提 示："
-              height="100px"
-          >
-          <span >
-            <div class="icon">
-            <svg t="1628502929427" class="icon" viewBox="0 0 1024 1024" version="1.1"
-                 xmlns="http://www.w3.org/2000/svg" p-id="1418" width="200" height="200">
-              <path d="M512 1024A512 512 0 1 1 512 0a512 512 0 0 1 0 1024z m48-784a48 48 0 0 0-96 0v352a48 48 0 0 0 96 0v-352zM512 736A48 48 0 1 0 512 832a48 48 0 0 0 0-96z" p-id="1419" fill="#d81e06">
-              </path>
-            </svg></div>
-            确认删除这些数据？</span>
-            <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible3 = false">不用了</el-button>
-            <el-button type="primary" @click="dialogVisible3 = false">好  的</el-button>
-          </span>
-          </el-dialog>
-        </div>-->
   </div>
-
-
 </template>
 
 <script>
@@ -386,89 +416,289 @@ export default {
   name: "child4",
   data() {
     return {
+      subLoading: false,
       loading: false,
-      formQuery: {
+      form: {
-        num: '',
+        number: '',
         name: '',
-        revise: '',
+        revised: '',
-        directPartner: '',
+        preside: '',
-        current: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
-
       },
       tableTotal: 0,
       tableData: [],
       multipleSelection: [],
-
+      addForm: {
-      formShowData: {
         stage: '',
-        standardNum: '',
+        number: '',
-        standardName: '',
+        name: '',
-        codeNum: '',
+        projectId: '',
-        codeName: '',
+        projectName: '',
-        standardType: '',
+        type: '',
-        directPartner: '',
+        preside: '',
-        startTime: '',
+        dataStart: '',
-        putTime: '',
+        dataImplement: '',
-        organ: '',
+        body: '',
-        headDraft: '',
+        drafting: '',
-        recordTime: '',
+        dataRecord: '',
-        putUnit: '',
+        report: '',
-        partner: '',
+        participants: '',
-        writer: '',
+        celebrity: '',
-        standardCost: '',
+        costMarking: '',
-        elseCost: '',
+        costOther: '',
-        revise: '',
+        revised: '',
-        prize: '',
+        status: '',
-        writerSort: '',
+        signature: '',
-        remarks: ''
+        remark: '',
       },
-
       drawerTitle: '',
       drawerTable: false,
-      formRules: {}
+      formRules: {
+        stage:  [
+          {required: true, message: '请输入所处阶段', trigger: 'blur'},
+        ],
+        number: [
+          {required: true, message: '请输入标准号', trigger: 'blur'},
+        ],
+        name: [
+          {required: true, message: '请输入标准名称', trigger: 'blur'},
+        ],
+        projectId: [
+          {required: true, message: '请输入项目代号', trigger: 'blur'},
+        ],
+        projectName: [
+          {required: true, message: '请输入项目名称', trigger: 'blur'},
+        ],
+        type: [
+          {required: true, message: '请输入标准类型', trigger: 'blur'},
+        ],
+        preside: [
+          {required: true, message: '请输入主持或参与', trigger: 'blur'},
+        ],
+        dataStart: [
+          {required: true, message: '请选择发布日期', trigger: 'change'},
+        ],
+        dataImplement: [
+          {required: true, message: '请选择实施日期', trigger: 'change'},
+        ],
+        body: [
+          {required: true, message: '请输入颁布机构', trigger: 'blur'},
+        ],
+        drafting: [
+          {required: true, message: '请输入牵头起草单位', trigger: 'blur'},
+        ],
+        dataRecord: [
+          {required: true, message: '请选择备案时间', trigger: 'change'},
+        ],
+        report: [
+          {required: true, message: '请输入提报单位名称', trigger: 'blur'},
+        ],
+        participants: [
+          {required: true, message: '请输入参与人', trigger: 'blur'},
+        ],
+        celebrity: [
+          {required: true, message: '请输入署名人', trigger: 'blur'},
+        ],
+        costMarking: [
+          {required: true, message: '请输入制标费用', trigger: 'blur'},
+        ],
+        costOther: [
+          {required: true, message: '请输入其他费用', trigger: 'blur'},
+        ],
+        revised: [
+          {required: true, message: '请输入标准制/修订', trigger: 'blur'},
+        ],
+        status: [
+          {required: true, message: '请输入获奖情况', trigger: 'blur'},
+        ],
+        signature: [
+          {required: true, message: '请输入署名排序', trigger: 'blur'},
+        ],
+        remark: [
+          {required: true, message: '请输入备注', trigger: 'blur'},
+        ],
+      },
+      DrawerType: '',
     }
   },
-
+  mounted () {
-  created() {
+    this.getData()
-    console.log(3)
   },
-
   methods: {
+    formDataAdd () {
+      this.DrawerType = 'add'
+      this.drawerTitle = '新增'
+      this.drawerTable = true
+    }, // 新增
+    getData () {
+      this.loading = true
+      this.$http.get('wgdCensusLeo/wgd-wbxd/queryAllWbxds', this.form, {
+        _this: this
+      }, res => {
+        this.loading = false
+        if (res.ok) {
+          this.tableData = res.data.list
+          this.tableTotal = res.data.count
+        }
+      })
+    }, // 获取数据
+    queryForm () {
+      this.form.page = 1
+      this.getData()
+    }, // 查询
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-    //新增方法
+    submit () {
-    submit: function () {},
+      this.$refs['addForm'].validate((valid) => {
-    //删除方法
+        if (valid) {
-    deleteDetail: function (index, rows) {},
+          this.subLoading = true
-
+          let url = ''
-    //清空
+          let tips = ''
-    resetForm(formName) {},
+          if (this.DrawerType === 'edit') {
-
+            url = 'wgdCensusLeo/wgd-wbxd/modWbxd'
-
+            tips = '编辑'
+          }else if (this.DrawerType === 'add') {
+            url = 'wgdCensusLeo/wgd-wbxd/addWbxd'
+            tips = '添加'
+          }
+          this.$http.post(url, this.addForm, {
+            _this: this
+          }, res => {
+            this.subLoading = false
+            if (res.ok) {
+              this.drawerTable = false
+              this.$message.success(tips + '成功')
+              this.getData()
+            } else {
+              this.$message.warning(tips + '失败')
+            }
+          })
+        } else {
+          this.$message.warning('请检查表单是否填写正确')
+        }
+      })
+    }, // 提交
+    addDrawerClose () {
+      this.addForm = {}
+      this.drawerTable = false
+    }, // 关闭
+    deleteDetail () {
+      if (this.multipleSelection.length) {
+        this.$confirm('您是否确认删除选中数据?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          let ids = ''
+          this.multipleSelection.forEach(item => {
+            if (ids.length > 0) {
+              ids += ','
+              ids += item.id
+            } else {
+              ids = item.id
+            }
+          })
+          this.$http.post('wgdCensusLeo/wgd-wbxd/delWbxds', {
+            ids: ids
+          }, {
+            _this: this
+          }, res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.form.page = 1
+              this.getData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {})
+      } else {
+        this.$message.warning('请选择要删除的数据')
+      }
+    }, //删除方法
+    resetForm () {
+      this.form.number = ''
+      this.form.name = ''
+      this.form.revised = ''
+      this.form.preside = ''
+      this.form.page = 1
+      this.getData()
+    }, //清空
     // 列表更多按钮
     handleCommand(command) {
       switch (command[1]) {
+        case "查看":
+          this.drawerTitle = '查看'
+          this.DrawerType = 'see'
+          this.drawerTable = true
+          this.addForm = command[0]
+          break
         case "编辑":
-          this.editRowOne(command[0]);
+          this.DrawerType = 'edit'
+          this.drawerTitle = '编辑'
+          this.drawerTable = true
+          this.addForm = {
+            id: command[0].id,
+            stage: command[0].stage,
+            number: command[0].number,
+            name: command[0].name,
+            projectId: command[0].projectId,
+            projectName: command[0].projectName,
+            type: command[0].type,
+            preside: command[0].preside,
+            dataStart: this.$moment(command[0].dataStart).format("YYYY-MM-DD HH:mm:ss"),
+            dataImplement: this.$moment(command[0].dataImplement).format("YYYY-MM-DD HH:mm:ss"),
+            body: command[0].body,
+            drafting: command[0].drafting,
+            dataRecord: this.$moment(command[0].dataRecord).format("YYYY-MM-DD HH:mm:ss"),
+            report: command[0].report,
+            participants: command[0].participants,
+            celebrity: command[0].celebrity,
+            costMarking: command[0].costMarking,
+            costOther: command[0].costOther,
+            revised: command[0].revised,
+            status: command[0].status,
+            signature: command[0].signature,
+            remark: command[0].remark,
+          }
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.$confirm('您是否确认删除选中数据?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            confirmButtonClass: 'common-button-primary',
+            roundButton: true
+          }).then(() => {
+            this.$http.post('wgdCensusLeo/wgd-wbxd/delWbxds', {
+              ids: command[0].id
+            }, {
+              _this: this
+            }, res => {
+              if (res.ok) {
+                this.$message.success('删除成功')
+                this.form.page = 1
+                this.getData()
+              } else {
+                this.$message.warning('删除失败')
+              }
+            })
+          }).catch(() => {})
           break;
       }
     },
-    editRowOne() {},
-    deleteRowOne() {},
     /** 分页  */
     pageChange(page) {
-      this.formQuery.page = page
+      this.form.page = page
-      this.getTableData()
+      this.getData()
     },
     pageSizeChange(pageSize) {
-      this.formQuery.pageSize = pageSize
+      this.form.pageSize = pageSize
-      this.getTableData()
+      this.getData()
     },
   }
 }
@@ -479,7 +709,11 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-
+  .add-form-item {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+    }
+  }
   .pagination {
     position: inherit!important;
   }