1

src/views/bdglregular/regularinfo/index.vue

@@ -635,16 +635,16 @@
           type="primary"
           @click="submitForm2"
           v-if="btnnum != 0 && btnnum != 1 && zg == 3"
-          >确 定</el-button
+          >确 定1</el-button
         >
         <el-button type="primary" @click="tongguofun" v-if="btnnum == 0"
-          >通 过1</el-button
+          >通 过</el-button
         >
         <el-button type="primary" @click="zhenggaifun" v-if="btnnum == 0"
-          >重新整改1</el-button
+          >重新整改</el-button
         >
         <el-button type="primary" @click="weitongguofun" v-if="btnnum == 1"
-          >确 定</el-button
+          >确 定2</el-button
         >
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
@@ -951,6 +951,7 @@
             v-model="form.wenjianname"
             style="width: 600px"
             class="wenjian"
+            disabled
           />
           <a
             :href="url + form.documentProof"
@@ -1108,17 +1109,15 @@ export default {
           { required: true, message: "负责人不能为空", trigger: "change" },
         ],
         question: [
-          { required: true, message: "存在问题或加分事由不能为空", trigger: "change" },
+          {
+            required: true,
+            message: "存在问题或加分事由不能为空",
+            trigger: "change",
+          },
         ],
         correctiveAction: [
           { required: true, message: "整改措施不能为空", trigger: "change" },
         ],
-        pictureProof: [
-          { required: true, message: "图片举证不能为空", trigger: "change" },
-        ],
-        documentProof: [
-          { required: true, message: "文件举证不能为空", trigger: "change" },
-        ],
       },
       //单位
       unitId: [],
@@ -1465,23 +1464,28 @@ export default {
     submitForm2() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-      if (this.form.documentProof) {
-        if (typeof this.form.documentProof != "string") {
-          let documentProofs = this.form.documentProof;
-          this.form.documentProof = documentProofs[0].url;
-          this.form.wenjianname = documentProofs[0].name;
+          if (this.form.pictureProof || this.form.documentProof) {
+            if (this.form.documentProof) {
+              console.log(this.form.documentProof.length>0)
+              if (typeof this.form.documentProof != "string") {
+                let documentProofs = this.form.documentProof;
+                this.form.documentProof = documentProofs[0].url;
+                this.form.wenjianname = documentProofs[0].name;
+              }
+            }
+            this.form.caoZuoType = this.queryParams.caoZuoType;
+            editquestion(this.form).then((response) => {
+              this.$modal.msgSuccess("整改成功");
+              this.open = false;
+              this.open1 = false;
+              // this.open3=false;
+              this.getList();
+            });
+          }else{
+            this.$message.error("请上传图片或者文件！")
+          }
         }
-      }
-      this.form.caoZuoType = this.queryParams.caoZuoType;
-      editquestion(this.form).then((response) => {
-        this.$modal.msgSuccess("整改成功");
-        this.open = false;
-        this.open1 = false;
-        // this.open3=false;
-        this.getList();
       });
-    }
-    });
     },
     /** 提交按钮 */
     submitForm() {

src/views/bdglregular/specialinfo/index.vue

@@ -598,13 +598,13 @@
           type="primary"
           @click="submitForm"
           v-if="btnnum != 0 && btnnum != 1 && zg != 3"
-          >确 定</el-button
+          >确 定1</el-button
         >
         <el-button
           type="primary"
           @click="submitForm2"
           v-if="btnnum != 0 && btnnum != 1 && zg == 3"
-          >确 定</el-button
+          >确 定2</el-button
         >
         <el-button type="primary" @click="tongguofun" v-if="btnnum == 0"
           >通 过</el-button
@@ -613,7 +613,7 @@
           >重新整改</el-button
         >
         <el-button type="primary" @click="weitongguofun" v-if="btnnum == 1"
-          >确 定</el-button
+          >确 定3</el-button
         >
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
@@ -820,12 +820,12 @@
           <imageUpload v-model="form.pictureProof" :limit="1" />
           <!-- <el-input v-model="form.pictureProof" placeholder="请输入图片举证" /> -->
         </el-form-item>
-        <div class="jiben" v-if="jiannum != 0">文件举证</div>
+        <div class="jiben" v-if="jiannum != 0&&wenName==1">文件举证</div>
         <el-form-item
           label
           prop="documentProof"
           :class="{ active: isActive }"
-          v-if="jiannum != 0"
+          v-if="jiannum != 0&&wenName==1"
         >
           <!-- <fileUpload v-model="form.documentProof" /> -->
           <!-- <fileUpload v-model="form.documentProof" :limit="1" /> -->
@@ -990,12 +990,12 @@ export default {
         correctiveAction: [
           { required: true, message: "整改措施不能为空", trigger: "change" },
         ],
-        pictureProof: [
-          { required: true, message: "图片举证不能为空", trigger: "change" },
-        ],
-        documentProof: [
-          { required: true, message: "文件举证不能为空", trigger: "change" },
-        ],
+        // pictureProof: [
+        //   { required: true, message: "图片举证不能为空", trigger: "change" },
+        // ],
+        // documentProof: [
+        //   { required: true, message: "文件举证不能为空", trigger: "change" },
+        // ],
       },
       //单位
       unitId: [],
@@ -1011,6 +1011,7 @@ export default {
       isdisabled: false,
       zg: null,
       open3: false,
+      wenName:null,
       isActive: null,
       url: process.env.VUE_APP_BASE_API,
       // 树形结构列表
@@ -1264,6 +1265,11 @@ export default {
       getSpecialinfo(id).then((response) => {
         this.disabled = true;
         this.form = response.data;
+        if(response.data.wenjianname){
+          this.wenName=1
+        }else{
+          this.wenName=0
+        }
         this.open3 = true;
         this.title = "修改经常性检查";
         this.jiannum = 1;
@@ -1303,22 +1309,27 @@ export default {
     submitForm2() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if (this.form.documentProof) {
-            if (typeof this.form.documentProof != "string") {
-              let documentProofs = this.form.documentProof;
-              this.form.documentProof = documentProofs[0].url;
-              this.form.wenjianname = documentProofs[0].name;
+          if (this.form.pictureProof || this.form.documentProof) {
+            if (this.form.documentProof) {
+              if (typeof this.form.documentProof != "string") {
+                let documentProofs = this.form.documentProof;
+                this.form.documentProof = documentProofs[0].url;
+                this.form.wenjianname = documentProofs[0].name;
+              }
             }
-          }
-          this.form.caoZuoType = this.queryParams.caoZuoType;
-          editquestion(this.form).then((response) => {
-            this.$modal.msgSuccess("整改成功");
-            this.open = false;
-            this.open3 = false;
-            // this.open3=false;
-            this.getList();
-          });
+            console.log(this.form);
+            this.form.caoZuoType = this.queryParams.caoZuoType;
+            editquestion(this.form).then((response) => {
+              this.$modal.msgSuccess("整改成功");
+              this.open = false;
+              this.open3 = false;
+              // this.open3=false;
+              this.getList();
+            });
+        } else {
+          this.$message.error("请上传图片或者文件！");
         }
+      }
       });
     },
     /** 提交按钮 */
@@ -1559,7 +1570,10 @@ hr {
 ::v-deep img {
   object-fit: cover;
 }
- ::v-deep  .box5 .el-form-item__content{
+::v-deep .box5 .el-form-item__content {
   width: 200px;
- }
+}
+::v-deep .el-link.el-link--default{
+  color: #fff;
+}
 </style>

src/views/grassrootsregistration/bdgleven/index.vue

@@ -124,6 +124,7 @@
       <!-- <el-table-column label="记录人" align="center" prop="peopleJiLu" /> -->
       <!-- <el-table-column label="会议议题" align="center" prop="title" /> -->
       <el-table-column label="召开地点" align="center" prop="address" />
+      <el-table-column label="会议时间" align="center" prop="convokeTime" />
       <el-table-column
         label="操作"
         align="center"
@@ -206,7 +207,7 @@
           <el-form-item label="召开地点" prop="address" class="address">
             <el-input v-model="form.address" placeholder="请输入召开地点" />
           </el-form-item>
-          <el-form-item label="会议形式" prop="meetingForm">
+          <!-- <el-form-item label="会议形式" prop="meetingForm">
             <el-select v-model="form.meetingForm" placeholder="请选择会议形式">
               <el-option
                 v-for="(item, i) in huiYiList"
@@ -216,7 +217,7 @@
               >
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="主持人" prop="compereId">
             <el-select
               ref="headerSearchSelect"
@@ -330,7 +331,7 @@
         :close-on-click-modal="false"
       >
         <div style="margin-bottom: 20px; margin-left: 28%;font-size:16px;  font-weight: 700;">
-          会议形式:<span style="margin-right:30px">{{ names }}</span> 会议时间：<span >{{ tiemse }}</span>
+          会议时间：<span >{{ tiemse }}</span>
         </div>
         <div v-for="item in arr" :key="item" class="divbox">
           <img :src="baseUrl + item" alt="" />
@@ -446,9 +447,9 @@ export default {
         title: [
           { required: true, message: "会议议题不能为空", trigger: "blur" },
         ],
-        meetingForm:[
-          { required: true, message: "会议形式不能为空", trigger: "blur" },
-        ]
+        // meetingForm:[
+        //   { required: true, message: "会议形式不能为空", trigger: "blur" },
+        // ]
       },
       //  是否为查看
       opens: true,

src/views/grassrootsregistration/bdglevens/index.vue

@@ -88,6 +88,7 @@
           show-overflow-tooltip
         />
         <el-table-column label="召开地点" align="center" prop="address" />
+        <el-table-column label="会议时间" align="center" prop="convokeTime" />
         <el-table-column
           label="操作"
           align="center"
@@ -142,7 +143,6 @@
           font-weight: 700;
         "
       >
-        会议形式:<span style="margin-right: 30px">{{ names }}</span>
         会议时间：<span>{{ tiemse }}</span>
       </div>
       <div v-for="item in arr" :key="item" class="divbox">

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -14,7 +14,7 @@
           @input="handleQuery"
         />
       </el-form-item>
-
+<!-- 
       <el-form-item label="" prop="compereId">
         <el-select
           v-model="queryParams.compereId"
@@ -30,7 +30,7 @@
           >
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -111,13 +111,26 @@
         </template>
       </el-table-column>
       <el-table-column label="召开地点" align="center" prop="address" />
-      <el-table-column label="主持人" align="center" prop="compereRen" />
+      <el-table-column
+        label="会议形式"
+        align="center"
+        show-overflow-tooltip
+        prop="meetingForm"
+        :formatter="meetingFormFn"
+      />
+      <el-table-column
+        label="会议时间"
+        align="center"
+        show-overflow-tooltip
+        prop="convokeTime"
+      />
+      <!-- <el-table-column label="主持人" align="center" prop="compereRen" />
       <el-table-column
         label="参加人"
         align="center"
         prop="joinId"
         show-overflow-tooltip
-      />
+      /> -->
       <el-table-column
         label="列席人"
         align="center"
@@ -558,11 +571,21 @@ export default {
     this.getSuo();
     this.onEditor();
     //会议形式
-    this.getDicts("sys_huiyi").then((response) => {
+    this.getDicts("sys_tuan").then((response) => {
       this.huiYiList = response.data;
     });
   },
   methods: {
+    // 翻译
+    meetingFormFn(row) {
+      var name = null;
+      this.huiYiList.map((item) => {
+        if (item.dictValue == row.meetingForm) {
+          name = item.dictLabel;
+        }
+      });
+      return name;
+    },
     //change方法
     changeSelect() {
       for (var key in this.form1) {
@@ -803,7 +826,7 @@ export default {
             this.title = "查看团支部会议登记本";
             this.menuRoleVisible = true;
             this.tableStatus = false;
-            return this.names
+            return this.names;
           }
         }
         // this.wordInfo = response.data;

src/views/grassrootsregistration/bdglmeetings/index.vue

@@ -78,12 +78,18 @@
           </template>
         </el-table-column>
         <el-table-column label="召开地点" align="center" prop="address" />
-        <el-table-column label="主持人" align="center" prop="compereRen" />
         <el-table-column
-          label="参加人"
+          label="会议形式"
           align="center"
-          prop="joinId"
           show-overflow-tooltip
+          prop="meetingForm"
+          :formatter="meetingFormFn"
+        />
+        <el-table-column
+          label="会议时间"
+          align="center"
+          show-overflow-tooltip
+          prop="convokeTime"
         />
         <el-table-column
           label="列席人"
@@ -212,11 +218,21 @@ export default {
   created() {
     this.getSoulist();
     //会议形式
-    this.getDicts("sys_huiyi").then((response) => {
+    this.getDicts("sys_tuan").then((response) => {
       this.huiYiList = response.data;
     });
   },
   methods: {
+    // 翻译
+    meetingFormFn(row) {
+      var name = null;
+      this.huiYiList.map((item) => {
+        if (item.dictValue == row.meetingForm) {
+          name = item.dictLabel;
+        }
+      });
+      return name;
+    },
     resetQuery() {
       this.form.year = null;
       getMeetingList().then((res) => {

src/views/grassrootsregistration/bdglparty/index.vue

@@ -14,7 +14,7 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="compereId">
+      <!-- <el-form-item label="" prop="compereId">
         <el-select
           v-model="queryParams.compereId"
           placeholder="请选择主持人"
@@ -31,7 +31,7 @@
           >
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -112,13 +112,26 @@
           <span>{{ onEditor(scope.row.title) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="主持人" align="center" prop="compereRen" />
+      <el-table-column
+        label="会议形式"
+        align="center"
+        show-overflow-tooltip
+        prop="meetingForm"
+        :formatter="meetingFormFn"
+      />
+      <el-table-column
+        label="会议时间"
+        align="center"
+        show-overflow-tooltip
+        prop="convokeTime"
+      />
+      <!-- <el-table-column label="主持人" align="center" prop="compereRen" />
       <el-table-column
         label="参加人"
         align="center"
         prop="joinId"
         show-overflow-tooltip
-      />
+      /> -->
       <el-table-column label="召开地点" align="center" prop="address" />
       <el-table-column
         label="操作"
@@ -367,9 +380,17 @@
       id="chakan"
       :close-on-click-modal="false"
     >
-    <div style="margin-bottom: 20px; margin-left: 28%;font-size:16px;  font-weight: 700;">
-      会议形式:<span style="margin-right:30px">{{ names }}</span> 会议时间：<span >{{ tiemse }}</span>
-    </div>
+      <div
+        style="
+          margin-bottom: 20px;
+          margin-left: 28%;
+          font-size: 16px;
+          font-weight: 700;
+        "
+      >
+        会议形式:<span style="margin-right: 30px">{{ names }}</span>
+        会议时间：<span>{{ tiemse }}</span>
+      </div>
       <div v-for="item in arr" :key="item" class="divbox">
         <img :src="baseUrl + item" alt="" />
       </div>
@@ -494,9 +515,9 @@ export default {
         absentIds: [
           { required: true, message: "缺席人不能为空", trigger: "blur" },
         ],
-        meetingForm:[
+        meetingForm: [
           { required: true, message: "会议形式不能为空", trigger: "blur" },
-        ]
+        ],
       },
       // 人员
       renYuan: [],
@@ -531,6 +552,16 @@ export default {
     });
   },
   methods: {
+    // 翻译
+    meetingFormFn(row) {
+      var  name=null
+      this.huiYiList.map((item) => {
+        if (item.dictValue == row.meetingForm) {
+          name = item.dictLabel;
+        }
+      });
+      return name
+    },
     //change方法
     changeSelect() {
       for (var key in this.form1) {

src/views/grassrootsregistration/bdglpartys/index.vue

@@ -77,13 +77,26 @@
             <span>{{ onEditor(scope.row.title) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="主持人" align="center" prop="compereRen" />
+        <el-table-column
+          label="会议形式"
+          align="center"
+          show-overflow-tooltip
+          prop="meetingForm"
+          :formatter="meetingFormFn"
+        />
+        <el-table-column
+          label="会议时间"
+          align="center"
+          show-overflow-tooltip
+          prop="convokeTime"
+        />
+        <!-- <el-table-column label="主持人" align="center" prop="compereRen" />
         <el-table-column
           label="参加人"
           align="center"
           prop="joinId"
           show-overflow-tooltip
-        />
+        /> -->
         <el-table-column label="召开地点" align="center" prop="address" />
         <el-table-column
           label="操作"
@@ -137,7 +150,8 @@
       :before-close="closes"
     >
       <div
-        style="  margin-bottom: 20px;
+        style="
+          margin-bottom: 20px;
           margin-left: 28%;
           font-size: 16px;
           font-weight: 700;
@@ -199,6 +213,16 @@ export default {
     });
   },
   methods: {
+    // 翻译
+    meetingFormFn(row) {
+      var name = null;
+      this.huiYiList.map((item) => {
+        if (item.dictValue == row.meetingForm) {
+          name = item.dictLabel;
+        }
+      });
+      return name;
+    },
     resetQuery() {
       this.form.year = null;
       getPartyList().then((res) => {

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -14,7 +14,7 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="compereId">
+      <!-- <el-form-item label="" prop="compereId">
         <el-select
           v-model="queryParams.compereId"
           placeholder="请选择主持人"
@@ -30,7 +30,7 @@
           >
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button size="btr " @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -106,8 +106,19 @@
           <span>{{ onEditor(scope.row.title) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="记录人" align="center" prop="peopleJiLu" />
-      <el-table-column label="主持人" align="center" prop="compereRen" />
+      <el-table-column
+        label="会议形式"
+        align="center"
+        show-overflow-tooltip
+        prop="meetingForm"
+        :formatter="meetingFormFn"
+      />
+      <el-table-column
+        label="会议时间"
+        align="center"
+        show-overflow-tooltip
+        prop="convokeTime"
+      />
       <el-table-column
         label="列席人"
         align="center"
@@ -353,17 +364,17 @@
       id="chakan"
       :close-on-click-modal="false"
     >
-    <div
-    style="
-      margin-bottom: 20px;
-      margin-left: 28%;
-      font-size: 16px;
-      font-weight: 700;
-    "
-  >
-    会议形式:<span style="margin-right: 30px">{{ names }}</span>
-    会议时间：<span>{{ tiemse }}</span>
-  </div>
+      <div
+        style="
+          margin-bottom: 20px;
+          margin-left: 28%;
+          font-size: 16px;
+          font-weight: 700;
+        "
+      >
+        会议形式:<span style="margin-right: 30px">{{ names }}</span>
+        会议时间：<span>{{ tiemse }}</span>
+      </div>
       <!-- <bdglsoldier v-show="menuRoleVisible" :message="wordInfo"></bdglsoldier> -->
       <div v-for="item in arr" :key="item" class="divbox">
         <img :src="baseUrl + item" alt="" />
@@ -505,7 +516,7 @@ export default {
       arr: [],
       // 会议形式
       huiYiList: [],
-      names : null,
+      names: null,
       tiemse: null,
     };
   },
@@ -515,11 +526,21 @@ export default {
     this.getSuo();
     this.onEditor();
     //会议形式
-    this.getDicts("sys_huiyi").then((response) => {
+    this.getDicts("sys_wei").then((response) => {
       this.huiYiList = response.data;
     });
   },
   methods: {
+    // 翻译
+    meetingFormFn(row) {
+      var name = null;
+      this.huiYiList.map((item) => {
+        if (item.dictValue == row.meetingForm) {
+          name = item.dictLabel;
+        }
+      });
+      return name;
+    },
     //change方法
     changeSelect() {
       for (var key in this.form1) {
@@ -746,7 +767,7 @@ export default {
             this.title = "查看军人委员会会议登记本";
             this.menuRoleVisible = true;
             this.tableStatus = false;
-            return this.names
+            return this.names;
           }
         }
         // this.wordInfo = response.data;

src/views/grassrootsregistration/bdglsoldiers/index.vue

@@ -74,8 +74,19 @@
             <span>{{ onEditor(scope.row.title) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="记录人" align="center" prop="peopleJiLu" />
-        <el-table-column label="主持人" align="center" prop="compereRen" />
+        <el-table-column
+          label="会议形式"
+          align="center"
+          show-overflow-tooltip
+          prop="meetingForm"
+          :formatter="meetingFormFn"
+        />
+        <el-table-column
+          label="会议时间"
+          align="center"
+          show-overflow-tooltip
+          prop="convokeTime"
+        />
         <el-table-column
           label="列席人"
           align="center"
@@ -204,11 +215,21 @@ export default {
   created() {
     this.getSoulist();
     //会议形式
-    this.getDicts("sys_huiyi").then((response) => {
+    this.getDicts("sys_wei").then((response) => {
       this.huiYiList = response.data;
     });
   },
   methods: {
+    // 翻译
+    meetingFormFn(row) {
+      var name = null;
+      this.huiYiList.map((item) => {
+        if (item.dictValue == row.meetingForm) {
+          name = item.dictLabel;
+        }
+      });
+      return name;
+    },
     resetQuery() {
       this.form.year = null;
       getSoldierList(this.year).then((res) => {

src/views/regulations/fileinfo/index.vue

@@ -965,6 +965,7 @@ export default {
     },
     // 返回目录
     turnback() {
+      this.nunms=0
       this.parentId = "";
       this.addbtn = true;
       this.queryParams1.pageNum = 1;