yaoshi日记

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -133,6 +133,14 @@
         <el-table-column label="编制干部" align="center" prop="orgcadre" />
         <el-table-column label="编制战士" align="center" prop="orgsoldier" />
         <el-table-column label="编制文职" align="center" prop="orgcivilian" />
+        <el-table-column label="审批" align="center" prop="examine">
+          <template slot-scope="scope">
+            <span v-if="scope.row.examine == '1'" style="color: #67c23a"
+              >已审批</span
+            >
+            <span v-else style="color: #ff4949">未审批</span>
+          </template>
+        </el-table-column>
         <el-table-column
           width="250"
           label="操作"
@@ -141,7 +149,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              v-if="scope.row.examine != '1'"
+              v-if="scope.row.common == '1'"
               size="btd"
               type="text"
               @click="handleChakans(scope.row)"
@@ -312,14 +320,42 @@
               style="border-color: white"
             >
               <tr align="center">
-                <td width="200" height="40">区分</td>
-                <td colspan="2" width="420">内容</td>
-                <td width="100">应到人数</td>
-                <td width="100">实到人数</td>
-                <td width="100">到课率</td>
+                <td
+                  width="200"
+                  height="40"
+                  style="
+                    border-top: none;
+                    border-right: none;
+                    border-left: none;
+                  "
+                >
+                  区分
+                </td>
+                <td colspan="2" width="420" style="border-top: none">内容</td>
+                <td
+                  width="100"
+                  style="
+                    border-top: none;
+                    border-right: none;
+                    border-left: none;
+                  "
+                >
+                  应到人数
+                </td>
+                <td width="100" style="border-top: none">实到人数</td>
+                <td
+                  width="100"
+                  style="
+                    border-top: none;
+                    border-right: none;
+                    border-left: none;
+                  "
+                >
+                  到课率
+                </td>
               </tr>
               <tr align="center">
-                <td height="60">
+                <td height="60" style="border-right: none; border-left: none">
                   <el-input
                     v-model="item.dateline"
                     placeholder="请输入时间"
@@ -337,7 +373,7 @@
                     {{ item.contents }}
                   </el-input>
                 </td>
-                <td>
+                <td style="border-right: none; border-left: none">
                   <el-input
                     v-model="item.shouldArrive"
                     placeholder="应到人数"
@@ -353,7 +389,7 @@
                     oninput="value=value.replace(/[^\d]/g,'')"
                   ></el-input>
                 </td>
-                <td>
+                <td style="border-right: none; border-left: none">
                   <el-input
                     v-model="item.percentage"
                     placeholder="到课率"
@@ -534,7 +570,7 @@
           <el-form-item prop="dutyinfoA">
             <div class="box4">
               <el-input
-                v-model="form.dutyinfoA"
+                v-model="form.dutyinfoa"
                 type="textarea"
                 placeholder="请输入内容"
                 autosize
@@ -545,7 +581,7 @@
           <el-form-item prop="dutyinfoC">
             <div class="box4">
               <el-input
-                v-model="form.dutyinfoC"
+                v-model="form.dutyinfoc"
                 type="textarea"
                 placeholder="请输入内容"
                 autosize
@@ -556,7 +592,7 @@
           <el-form-item prop="dutyinfoE">
             <div class="box4">
               <el-input
-                v-model="form.dutyinfoE"
+                v-model="form.dutyinfoe"
                 type="textarea"
                 placeholder="请输入内容"
                 autosize
@@ -1365,7 +1401,6 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getBdgldiary(id).then((response) => {
-        console.log(response.data);
         this.form = response.data;
         this.xunlian = response.data.weekworkRegisters;
         // 请求人员
@@ -1373,9 +1408,18 @@ export default {
         //  请求首长
         this.getShou(this.form.unitId);
         this.open = true;
-        this.checkShop = response.data.inspect;
+        // 查铺查询
+        if (
+          response.data.inspect[0].peopleName != null ||
+          response.data.inspect[0].foremanName != null ||
+          response.data.inspect[0].sentryName != null ||
+          response.data.inspect[0].examineDate != null ||
+          response.data.inspect[0].dialogue != null
+        ) {
+          this.checkShop = response.data.inspect;
+        }
+        // 临时来对
         if (response.data.kinsfolk[0].peopleId != null) {
-          console.log(response.data.kinsfolk, 2);
           this.relatives = response.data.kinsfolk;
         }
         this.title = "修改要事日记";
@@ -1406,6 +1450,15 @@ export default {
           ) {
             this.form.kinsfolk = this.relatives;
           }
+          if (
+            (this.checkShop[0].peopleName ||
+              this.checkShop[0].foremanName ||
+              this.checkShop[0].sentryName ||
+              this.checkShop[0].examineDate ||
+              this.checkShop[0].dialogue) != null
+          ) {
+            this.form.inspect = this.checkShop;
+          }
           if (this.form.id != null) {
             updateBdgldiary(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");