更改人员，更改基层

src/views/PrintsManage/manage/index.vue

@@ -123,7 +123,7 @@
           <span>{{ scope.row.isPrintColor == 0 ? "否" : "是" }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="是否双面打"
         align="center"
         prop="isPrintTwo"
@@ -132,7 +132,7 @@
         <template slot-scope="scope">
           <span>{{ scope.row.isPrintTwo == 0 ? "否" : "是" }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         label="打印状态"
         align="center"
@@ -190,6 +190,25 @@
           }}</span>
         </template>
       </el-table-column>
+      <el-table-column
+        label="归还时间"
+        align="center"
+        prop="returnTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.returnTime, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="explainInfo"
+        width="120px"
+        show-overflow-tooltip
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -284,13 +303,23 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="归还时间" prop="returnTime"  class="box1">
+          <el-form-item label="归还时间" prop="returnTime" class="box1">
             <el-date-picker
+              clearable
+              size="small"
+              v-model="form.returnTime"
+              type="datetime"
+              placeholder="选择归还时间"
+              class="text"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
+            <!-- <el-date-picker
             v-model="form.returnTime"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
-          </el-date-picker>
+          </el-date-picker> -->
           </el-form-item>
           <div class="jiben">打印说明</div>
           <el-form-item label prop="explainInfo">
@@ -302,64 +331,6 @@
             />
           </el-form-item>
           <div class="jiben">文件信息</div>
-          <!-- <el-form-item label="文件名称">
-          <el-input v-model="form.name" placeholder="请输入文件名称" />
-        </el-form-item>
-        <el-form-item label="打印份数" prop="printNumber">
-          <el-input
-            v-model="form.printNumber"
-            :min="0"
-            placeholder="请输入打印份数"
-          />
-        </el-form-item>
-        <el-form-item label="文件大小" prop="size">
-          <el-input v-model="form.size" placeholder="请输入文件大小" />
-        </el-form-item> -->
-          <!-- <el-form-item label="单位ID" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位ID" />
-        </el-form-item>-->
-          <!-- <el-form-item label="单位名称" prop="unitName">
-          <el-input v-model="form.unitName" placeholder="请输入单位名称" />
-        </el-form-item>-->
-          <!-- <el-form-item label="文件类型" prop="type">
-          <el-input v-model="form.type" placeholder="请输入文件类型" />
-        </el-form-item> -->
-          <!-- <el-form-item label="级别" prop="levelM">
-          <el-select v-model="form.levelM" clearable placeholder="请选择级别">
-            <el-option
-              v-for="dict in levelMs"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
-          <!-- <el-form-item label="是否需要归还" prop="isReturn">
-          <el-radio-group v-model="form.isReturn" style="width:200px;" size="mini">
-            <el-radio label="1">归还</el-radio>
-            <el-radio label="0">无需归还</el-radio>
-          </el-radio-group>
-        </el-form-item>-->
-          <!-- <el-form-item label="是否为彩打" prop="isPrintColor">
-          <el-radio-group
-            v-model="form.isPrintColor"
-            style="width: 200px"
-            size="mini"
-          >
-            <el-radio label="1">是</el-radio>
-            <el-radio label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="是否为双面打" prop="isPrintTwo">
-          <el-radio-group
-            v-model="form.isPrintTwo"
-            style="width: 200px"
-            size="mini"
-          >
-            <el-radio label="1">是</el-radio>
-            <el-radio label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item> -->
           <div class="box3" v-for="(item, i) in tomList" :key="i">
             <el-form
               ref="refform"
@@ -618,13 +589,23 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="归还时间" prop="returnTime"  class="box1">
+        <el-form-item label="归还时间" prop="returnTime" class="box1">
           <el-date-picker
+            clearable
+            size="small"
+            v-model="form1.returnTime"
+            type="datetime"
+            placeholder="选择归还时间"
+            class="text"
+            value-format="yyyy-MM-dd HH:mm:ss"
+          >
+          </el-date-picker>
+          <!-- <el-date-picker
           v-model="form1.returnTime"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择日期">
-        </el-date-picker>
+        </el-date-picker> -->
         </el-form-item>
         <div class="jiben">打印说明</div>
         <el-form-item label prop="explainInfo">
@@ -800,7 +781,7 @@
             placeholder="请输入打印份数"
           />
         </el-form-item>
-        
+
         <!-- <el-form-item label="是否需要归还" prop="isReturn">
           <el-radio-group
             v-model="dyform.isReturn"
@@ -842,7 +823,8 @@
         </el-form-item>
         <div class="jiben jiben2">打印说明</div>
         <div
-          style="width: 98.5%;
+          style="
+            width: 98.5%;
             height: 45px;
             font-size: 14px;
             line-height: 45px;
@@ -932,7 +914,8 @@
             上一页</el-button
           >
           <div
-            style="width: 50px;
+            style="
+              width: 50px;
               height: 28px;
               background: #f4f4f4;
               text-align: center;
@@ -1123,14 +1106,14 @@ export default {
         printfileName: [
           { required: true, message: "打印人不能为空", trigger: "change" },
         ],
-        returnTime:[
+        returnTime: [
           { required: true, message: "归还时间不能为空", trigger: "change" },
-        ]
+        ],
       },
       ruless: {
-        returnTime:[
+        returnTime: [
           { required: true, message: "归还时间不能为空", trigger: "change" },
-        ]
+        ],
       },
       //级别
       levelMs: [],
@@ -1368,7 +1351,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       // this.tomList=[]
-      (this.tomList = [
+      this.tomList = [
         {
           // 文件名称
           name: null,
@@ -1384,13 +1367,12 @@ export default {
           isPrintTwo: null,
           isReturn: null,
         },
-      ]),
-        (this.fileList = []);
+      ];
+      this.fileList = [];
       this.reset();
       const id = row.id || this.ids;
       getManage(id).then((response) => {
         this.form1 = response.data;
-
         this.form1.isPrintColor = response.data.isPrintColor + "";
         this.form1.isPrintTwo = response.data.isPrintTwo + "";
         // this.tomList[0].name=this.form.name
@@ -1401,7 +1383,6 @@ export default {
         // this.tomList[0].levelM=this.form.levelM
         //   this.tomList[0].isPrintColor=this.form.isPrintColor
         // this.tomList[0].isPrintTwo=this.form.isPrintTwo
-
         this.open1 = true;
         this.title1 = "修改集中文印";
       });
@@ -1661,7 +1642,7 @@ export default {
     dysubmitForm() {
       this.$refs["dyform"].validate((valid) => {
         if (valid) {
-          // 
+          //
           console.log(this.dyform);
           if (this.dyform.isReturn == 1) {
             this.dyform.statusG = 0;

src/views/barracksManagement/flats/index.vue

@@ -95,12 +95,12 @@
         width="130"
       />
       <el-table-column label="部职别" align="center" prop="duty" width="130" />
-      <el-table-column
+      <!-- <el-table-column
         label="是否符合申请条件"
         align="center"
         prop="whether"
         width="150"
-      />
+      /> -->
       <el-table-column
         label="住房待遇等级"
         align="center"

src/views/barracksManagement/scadred/index.vue

@@ -107,7 +107,7 @@
         prop="monthlyPropertyFee"
       />
       <el-table-column label="总金额" align="center" prop="totalAmount" />
-      <el-table-column
+      <!-- <el-table-column
         label="录入时间"
         align="center"
         prop="createtime"
@@ -118,7 +118,7 @@
             dateFormat("YYYY-mm-dd HH:MM:SS", scope.row.createtime)
           }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         label="操作"
         align="center"

src/views/combatduty/grassdutyinfo/index.vue

@@ -817,7 +817,8 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
+      var queryParams = {};
+      queryParams.type=this.queryParams.type;
       this.$modal
         .confirm("是否确认导出今日所有基层值班数据项？")
         .then(() => {

src/views/grassrootsregistration/statistics/index.vue

@@ -144,7 +144,7 @@
               <a target="_blank">预览</a>
             </span>
           </el-button>
-          <el-button size="btu" type="text" style="background: #E6A23C;">
+          <el-button size="btxia" type="text">
             <span class="chakan1">
               <a :href="downurl + scope.row.filePath" :download="scope.row.fileName">下载</a>
             </span>
@@ -605,4 +605,29 @@ export default {
   color: #fff;
   border-color: #fff !important;
 }
+::v-deep .el-button--btxia.is-active,
+.el-button--btxia:active {
+  background: #E6A23C;
+  border-color: #E6A23C;
+  color: #FFFFFF;
+}
+
+::v-deep .el-button--btxia:focus,
+.el-button--btxia:hover {
+  background: #E6A23C;
+  border-color: #E6A23C;
+  color: #FFFFFF;
+}
+
+::v-deep .el-button--btxia {
+  width: 46px !important;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  border-color: #E6A23C;
+  height: 29px;
+}
 </style>

src/views/militaryvehicleManagement/thebus/index.vue

@@ -107,6 +107,7 @@
         align="center"
         prop="vehiclemodel"
         :formatter="vehicleModel"
+        width="130"
       />
       <el-table-column
         label="车辆负责人"
@@ -126,8 +127,8 @@
         prop="contactnumber"
         width="120"
       />
-      <el-table-column label="发动机号" align="center" prop="engineNumber" />
-      <el-table-column label="车架号" align="center" prop="frameNumber" />
+      <el-table-column label="发动机号" align="center" prop="engineNumber" width="150"/>
+      <el-table-column label="车架号" align="center" prop="frameNumber" width="190"/>
       <el-table-column
         label="车辆来源"
         align="center"

src/views/regulations/fileinfo/index.vue

@@ -42,18 +42,6 @@
                 <!-- 阅读量 readVolume -->
                 <div style="display: flex">
                   <!-- <span
-                    style="
-                      font-size: 14px;
-                      color: rgba(204, 204, 204, 1);
-
-                      width: 100px;
-                      margin-left: 30px;
-                      display: block;
-                      text-align: start;
-                    "
-                    >上传人：{{ scope.row.createUser }}</span
-                  >-->
-                  <span
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
@@ -62,7 +50,7 @@
                       display: block;
                       text-align: start;
                     "
-                  >页数：{{ scope.row.theNumberPages }}</span>
+                  >页数：{{ scope.row.theNumberPages }}</span> -->
                   <span
                     style="
                       font-size: 14px;
@@ -433,7 +421,7 @@
         style="color: pink"
         :title="title3"
         :visible.sync="open33"
-        width="1001px"
+        width="1500px"
         append-to-body
         id="fileinfodocx"
         class="el-dialog__header"
@@ -451,7 +439,7 @@
       <el-dialog
         :title="title3"
         :visible.sync="previewDialog"
-        width="1001px"
+        width="1500px"
         append-to-body
         id="fileinfopdf"
         class="el-dialog__header"