Преглед на файлове

完成了要事日记的审批,页面时间的搜索

sunyanqiang преди 3 години
родител
ревизия
346fae0750
променени са 1 файла, в които са добавени 68 реда и са изтрити 24 реда
  1. 68 24
      src/views/grassrootsregistration/bdgldiary/index.vue

+ 68 - 24
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -9,6 +9,8 @@
           type="date"
           :editable="false"
           placeholder="选择日期"
+          value-format="yyyy-MM-dd"
+          @change="shiJian"
         >
         </el-date-picker>
       </div>
@@ -121,9 +123,10 @@
         >
           <template slot-scope="scope">
             <el-button
+              v-if="scope.row.examine != '1'"
               size="btd"
               type="text"
-              @click="handleChakan(scope.row)"
+              @click="handleChakans(scope.row)"
               v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
               ><span class="chakan">审批</span></el-button
             >
@@ -221,7 +224,7 @@
           <el-form-item label="值班首长" prop="peopleId">
             <el-select v-model="form.lead" placeholder="请选择首长" clearable>
               <el-option
-                :label="item.userName"
+                :label="item.nickName"
                 v-for="(item, i) in shouZhang"
                 :key="i"
                 :value="item.userId"
@@ -353,7 +356,7 @@
               />
             </div>
           </el-form-item>
-          <div class="jiben">人员动</div>
+          <div class="jiben">人员及装备变动</div>
           <el-form-item prop="transfer">
             <div class="box4">
               <el-input
@@ -375,7 +378,7 @@
               />
             </div>
           </el-form-item>
-          <div class="jiben">内务情况</div>
+          <div class="jiben">武器装备、军容风纪、内务卫生检查情况</div>
           <el-form-item prop="internal">
             <div class="box4">
               <el-input
@@ -477,51 +480,56 @@
             >
             </el-date-picker>
           </el-form-item>
-          <div class="jiben">病号处理情况</div>
-          <el-form-item prop="invalid">
+          <div class="jiben">值班交接情况</div>
+          <el-form-item prop="dutyinfoA">
             <div class="box4">
               <el-input
-                v-model="form.invalid"
+                v-model="form.dutyinfoA"
                 type="textarea"
                 placeholder="请输入内容"
                 autosize
               />
             </div>
           </el-form-item>
-          <div class="jiben">上级通知</div>
-          <el-form-item prop="notice">
+          <div class="jiben">值日交接情况</div>
+          <el-form-item prop="dutyinfoC">
             <div class="box4">
               <el-input
-                v-model="form.notice"
+                v-model="form.dutyinfoC"
                 type="textarea"
                 placeholder="请输入内容"
                 autosize
               />
             </div>
           </el-form-item>
-          <div class="jiben">一周工作计划合集</div>
-          <el-form-item prop="weekwork">
+          <div class="jiben">厨房交接情况</div>
+          <el-form-item prop="dutyinfoE">
             <div class="box4">
               <el-input
-                v-model="form.weekwork"
+                v-model="form.dutyinfoE"
                 type="textarea"
                 placeholder="请输入内容"
                 autosize
               />
             </div>
           </el-form-item>
-          <el-form-item label="审批" prop="examine" v-show="false">
-            <el-input v-model="form.examine" placeholder="请输入审批" />
-          </el-form-item>
-          <el-form-item label="审批" prop="peopleId1" v-show="false">
-            <el-input v-model="form.peopleId1" placeholder="请输入审批" />
+          <div class="jiben">病号处理情况</div>
+          <el-form-item prop="invalid">
+            <div class="box4">
+              <el-input
+                v-model="form.invalid"
+                placeholder="请输入内容"
+                type="textarea"
+                autosize
+              />
+            </div>
           </el-form-item>
-          <div class="jiben">审批不通过原因</div>
-          <el-form-item prop="contents">
+          <div class="jiben">上级通知、指示及其他重要事项</div>
+          <el-form-item prop="notice">
             <div class="box4">
               <el-input
-                v-model="form.contents"
-                placeholder="请输入审批不通过原因"
+                v-model="form.notice"
+                placeholder="请输入内容"
                 type="textarea"
                 autosize
               />
@@ -669,6 +677,9 @@
           ref="menuRole"
           :message="wordInfo"
         ></bdgldiary>
+        <div slot="footer" class="dialog-footer" v-if="statusShen">
+          <el-button type="primary" @click="queDing">通过</el-button>
+        </div>
       </el-dialog>
     </div>
   </div>
@@ -706,6 +717,8 @@ export default {
   name: "Bdgldiary",
   data() {
     return {
+      // 审批状态
+      statusShen: false,
       //查看页面
       menuRoleVisible: false,
       wordInfo: {},
@@ -878,7 +891,6 @@ export default {
           percentage: null,
         },
       ],
-      textarea: "",
     };
   },
 
@@ -892,6 +904,38 @@ export default {
     this.treeselect();
   },
   methods: {
+    //审批按钮操作
+    handleChakans(row) {
+      // 是否隐藏按钮
+      this.opens = false;
+      this.statusShen = true;
+      const id = row.id || this.ids;
+      getBdgldiary(id).then((response) => {
+        this.wordInfo = response.data;
+        this.title = "审批要事日记";
+        this.menuRoleVisible = true;
+      });
+    },
+
+    // 审批页面确定
+    queDing() {
+      console.log(1);
+      this.wordInfo.examine = "1";
+
+      if (this.wordInfo.id != null) {
+        updateBdgldiary(this.wordInfo).then((response) => {
+          console.log(response);
+          this.menuRoleVisible = false;
+          this.getList();
+        });
+      }
+    },
+    // 搜索时间触发
+    shiJian(data) {
+      console.log(data);
+      this.queryParams.diaryTime = data;
+      this.getList();
+    },
     // 应到人数失去焦点触发
     yinDao() {
       this.xunlian.forEach((item) => {
@@ -1228,6 +1272,7 @@ export default {
     handleChakan(row) {
       // 是否隐藏按钮
       this.opens = false;
+      this.statusShen = false;
       const id = row.id || this.ids;
       getBdgldiary(id).then((response) => {
         this.wordInfo = response.data;
@@ -1245,7 +1290,6 @@ export default {
           this.form.kinsfolk = this.relatives;
           if (this.form.id != null) {
             updateBdgldiary(this.form).then((response) => {
-              console.log(this.form);
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();