新增领导列表登记本

src/views/PrintsLog/printlog/index.vue

@@ -251,6 +251,16 @@
         <!-- <el-form-item label="单位名称" prop="unitName">
           <el-input v-model="form.unitName" placeholder="请输入单位名称" />
         </el-form-item>-->
+        <!-- <div
+          style="
+            font-size: 18px;
+            color: red;
+            margin-bottom: 36px;
+            margin-left: 40%;
+          "
+        >
+          未归还份数 <span>{{ form.num }}</span>
+        </div> -->
         <el-form-item label="打印文件名称" prop="printName">
           <el-input v-model="form.printName" placeholder="请输入打印文件名称" />
         </el-form-item>
@@ -283,43 +293,18 @@
           <el-input
             v-model="form.returnNumber"
             @blur="returnNumberblur"
-            placeholder="请输入打印份数"
+            placeholder="请输入归还份数"
           />
         </el-form-item>
+        <el-form-item label="未归还份数" prop="">
+          <el-input v-model="form.num" placeholder="" disabled />
+        </el-form-item>
         <el-form-item label="文件打印人" prop="printfileName">
           <el-input
             v-model="form.printfileName"
             placeholder="请输入文件打印人"
           />
-          <!-- <el-select v-model="form.printfileName" filterable clearable placeholder="请选择文件打印人">
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>-->
-        </el-form-item>
-        <!-- <el-form-item label="备注说明" prop="prize">
-          <el-input v-model="form.prize" type="textarea" placeholder />
-        </el-form-item>-->
-        <!-- <el-form-item label="文件打印人" prop="printfileName">
-          <el-input v-model="form.printfileName" placeholder="请输入文件打印人" />
-        </el-form-item>-->
-        <!-- <el-form-item label="打印时间" prop="printTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.printTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择打印时间"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="归还份数" prop="returnNumber">
-          <el-input v-model="form.returnNumber" placeholder="请输入归还份数" />
         </el-form-item>
-        <el-form-item label="原文件路径" prop="primaryPath">
-          <el-input v-model="form.primaryPath" placeholder="请输入原文件路径" />
-        </el-form-item>
-        <el-form-item label="现文件路径" prop="presentPath">
-          <el-input v-model="form.presentPath" placeholder="请输入现文件路径" />
-        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" v-if="flg != 1"
@@ -582,11 +567,18 @@ export default {
       getPrintlog(row.id).then((res) => {
         if (res.code == 200) {
           this.form = res.data;
+          if (this.form.printNumber) {
+            this.form.num =
+              this.form.printNumber - this.form.returnNumber == 0
+                ? 0
+                : this.form.printNumber - this.form.returnNumber;
+          }
           if (res.data.returnNumber) {
             this.form.returnNumber = res.data.returnNumber;
           } else {
             this.form.returnNumber = 0;
           }
+
           this.title = "归还记录";
           this.open = true;
           this.flg = 1;
@@ -620,6 +612,10 @@ export default {
       // });
     },
     returnNumberblur() {
+      if (Number(this.form.returnNumber) > Number(this.form.num)) {
+        this.$modal.msgSuccess(`应归还${Number(this.form.num)}份`);
+        this.form.returnNumber = null;
+      }
       if (
         Number(this.form.returnNumber) + Number(this.returnNumber) >
         Number(this.form.printNumber)
@@ -711,8 +707,16 @@ export default {
             this.form = response.rows[0];
             if (this.form.returnNumber) {
               this.form.returnNumber = this.form.returnNumber;
+              this.form.num =
+                this.form.printNumber - this.form.returnNumber == 0
+                  ? 0
+                  : this.form.printNumber - this.form.returnNumber;
             } else {
               this.form.returnNumber = 0;
+              this.form.num =
+                this.form.printNumber - this.form.returnNumber == 0
+                  ? 0
+                  : this.form.printNumber - this.form.returnNumber;
             }
           } else {
           }

src/views/combatduty/PeopleStatistics/index.vue

@@ -23,7 +23,7 @@
         <el-form-item label="未纳编外出" prop="notNabianOut">
           <el-input v-model="form.notNabianOut" placeholder="" />
         </el-form-item>
-        <el-form-item label="是否切换" prop="toggle">
+        <el-form-item label="是否启用" prop="toggle">
           <el-radio-group v-model="form.toggle">
             <el-radio :label="0">否</el-radio>
             <el-radio :label="1">是</el-radio>
@@ -156,7 +156,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           addPeopleStatistics(this.form).then((response) => {
-            this.$modal.msgSuccess("新增成功");
+            this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
           });

src/views/grassrootsregistration/bdglarmaments/index.vue

@@ -44,7 +44,7 @@ export default {
 
   created() {
     armamentList().then((res) => {
-      console.log(res);
+      // console.log(res);
       this.lieList = res.rows;
     });
   },

src/views/grassrootsregistration/bdgldrills/index.vue

@@ -44,7 +44,7 @@ export default {
 
   created() {
     drillList().then((res) => {
-      console.log(res);
+      // console.log(res);
       this.lieList = res.rows;
     });
   },

src/views/grassrootsregistration/bdglequips/index.vue

@@ -51,7 +51,7 @@ export default {
     chaKan(row) {
       const unitId = row;
       equipuntits(unitId).then((response) => {
-        console.log(response);
+        // console.log(response);
         this.wordInfo = response.data;
         this.title = "查看训练器材/教材登记薄";
         this.menuRoleVisible = true;

src/views/grassrootsregistration/bdglfilemanagements/index.vue

@@ -44,7 +44,7 @@ export default {
 
   created() {
     docList().then((res) => {
-      console.log(res);
+      // console.log(res);
       this.lieList = res.rows;
     });
   },

src/views/grassrootsregistration/bdglsecrecys/index.vue

@@ -46,7 +46,7 @@ export default {
 
   created() {
     getSecrecyStats().then((res) => {
-      console.log(res);
+      // console.log(res);
       this.lieList = res.rows;
     });
   },

src/views/taishi/index.vue

@@ -391,12 +391,19 @@
                     <img src="../../assets/images/zong.png" alt />
                   </td>
                   <td>
-                    <div
+                    <!-- <div
                       v-for="(item, index) in zwlist.zaiweizongshu"
                       :key="index"
                     >
                       {{ item }}
-                    </div>
+                    </div> -->
+                    <countTo
+                      v-for="(item, index) in zwlist.zaiweizongshu"
+                      :key="index"
+                      :startVal="0"
+                      :endVal="item"
+                      :duration="1000"
+                    ></countTo>
                   </td>
                 </tr>
               </table>
@@ -413,12 +420,19 @@
                     <img src="../../assets/images/zaiwei.png" alt />
                   </td>
                   <td>
-                    <div
+                    <!-- <div
                       v-for="(item, index) in zwlist.nabianzaiwei"
                       :key="index"
                     >
                       {{ item }}
-                    </div>
+                    </div> -->
+                    <countTo
+                      v-for="(item, index) in zwlist.nabianzaiwei"
+                      :key="index"
+                      :startVal="0"
+                      :endVal="item"
+                      :duration="1000"
+                    ></countTo>
                   </td>
                 </tr>
               </table>
@@ -435,12 +449,20 @@
                     <img src="../../assets/images/waichu.png" alt />
                   </td>
                   <td>
-                    <div
+                    <!-- <div
                       v-for="(item, index) in zwlist.nabianwaichu"
                       :key="index"
                     >
                       {{ item }}
-                    </div>
+                    </div> -->
+
+                    <countTo
+                      v-for="(item, index) in zwlist.nabianwaichu"
+                      :key="index"
+                      :startVal="0"
+                      :endVal="item"
+                      :duration="1000"
+                    ></countTo>
                   </td>
                 </tr>
               </table>
@@ -457,12 +479,19 @@
                     <img src="../../assets/images/zaiwei.png" alt />
                   </td>
                   <td>
-                    <div
+                    <!-- <div
                       v-for="(item, index) in zwlist.weinabianzaiwei"
                       :key="index"
                     >
                       {{ item }}
-                    </div>
+                    </div> -->
+                    <countTo
+                      v-for="(item, index) in zwlist.weinabianzaiwei"
+                      :key="index"
+                      :startVal="0"
+                      :endVal="item"
+                      :duration="1000"
+                    ></countTo>
                   </td>
                 </tr>
               </table>
@@ -479,12 +508,19 @@
                     <img src="../../assets/images/waichu.png" alt />
                   </td>
                   <td>
-                    <div
+                    <!-- <div
                       v-for="(item, index) in zwlist.weinabianwaichu"
                       :key="index"
                     >
                       {{ item }}
-                    </div>
+                    </div> -->
+                    <countTo
+                      v-for="(item, index) in zwlist.weinabianwaichu"
+                      :key="index"
+                      :startVal="0"
+                      :endVal="item"
+                      :duration="1000"
+                    ></countTo>
                   </td>
                 </tr>
               </table>
@@ -927,7 +963,7 @@
                 <div class="right3-r-main-item-r">
                   <div class="s1">本周打印数量</div>
                   <div class="s2">
-                    <b style="color: #30fdff">{{ this.wylist.mouthprints }}</b
+                    <b style="color: #30fdff">{{ this.wylist.total }}</b
                     >份
                   </div>
                 </div>
@@ -939,7 +975,7 @@
                 <div class="right3-r-main-item-r">
                   <div class="s1">归还数量</div>
                   <div class="s2">
-                    <b style="color: #2bf1b2">{{ this.wylist[1] }}</b
+                    <b style="color: #2bf1b2">{{ this.wylist.returnNumber }}</b
                     >份
                   </div>
                 </div>
@@ -951,7 +987,9 @@
                 <div class="right3-r-main-item-r">
                   <div class="s1">未归还数量</div>
                   <div class="s2">
-                    <b style="color: #ff5a5a">{{ this.wylist[0] }}</b
+                    <b style="color: #ff5a5a">{{
+                      this.wylist.weiReturnNumber
+                    }}</b
                     >份
                   </div>
                 </div>
@@ -963,7 +1001,9 @@
                 <div class="right3-r-main-item-r">
                   <div class="s1">无需归还数量</div>
                   <div class="s2">
-                    <b style="color: #738c97">{{ this.wylist.notreturns }}</b
+                    <b style="color: #738c97">{{
+                      this.wylist.noReturnNumber
+                    }}</b
                     >份
                   </div>
                 </div>
@@ -1053,6 +1093,7 @@ import {
 } from "@/api/taishi/taishi";
 import * as echarts from "echarts";
 import vueSeamlessScroll from "vue-seamless-scroll";
+import countTo from "vue-count-to";
 import Cookies from "js-cookie";
 export default {
   name: "TaiShi",
@@ -1154,6 +1195,7 @@ export default {
     zaiweipeople().then((res) => {
       if (res.code == 200) {
         // this.zwlist = res.data[0];
+        console.log(res);
         let arr = res.data[0];
         for (var i in arr) {
           this.zsz(arr, i);
@@ -1203,14 +1245,14 @@ export default {
     //集中文印
     rizongwenyin().then((res) => {
       this.wylist = res.data;
-      if (this.wylist[1]) {
-      } else {
-        this.wylist[1] = 0;
-      }
-      if (this.wylist[0]) {
-      } else {
-        this.wylist[0] = 0;
-      }
+      // if (this.wylist[1]) {
+      // } else {
+      //   this.wylist[1] = 0;
+      // }
+      // if (this.wylist[0]) {
+      // } else {
+      //   this.wylist[0] = 0;
+      // }
     });
     //军车
     juncheguanli().then((res) => {
@@ -1286,7 +1328,9 @@ export default {
       this.$router.push({ path: "/pt" }).catch(() => {});
     },
     zsz(obj, n) {
+      // var s = Number((obj[n] + "").split(""));
       var s = (obj[n] + "").split("");
+      s = s.map(Number);
       if (s.length == 1) {
         s.unshift(0, 0);
       } else if (s.length == 2) {
@@ -2059,6 +2103,7 @@ export default {
   },
   components: {
     vueSeamlessScroll,
+    countTo,
   },
 };
 </script>
@@ -2903,4 +2948,14 @@ export default {
   width: 100%;
   height: 46%;
 }
+.center1_d span {
+  display: inline-block;
+  font-size: 35px;
+  font-family: "IMPACT";
+  background-color: #0c3361;
+  margin-left: 5px;
+  width: 25px;
+  text-align: center;
+  color: #ff9000;
+}
 </style>