1

src/views/PrintsLog/printlog/index.vue

@@ -123,6 +123,7 @@
           </el-tooltip>
         </template>
       </el-table-column>
+      <el-table-column label="单位" align="center" prop="unitId" :formatter="unitFn"/>
       <el-table-column label="打印份数" align="center" prop="printNumber" />
       <!-- <el-table-column
         label="是否需要归还(0否1是)"
@@ -494,8 +495,18 @@ export default {
       this.levelMs = response.data;
     });
     this.getUser()
+    this.danWeis()
   },
   methods: {
+    unitFn(row){
+      var name =""
+      this.danWeisList.map(item=>{
+        if(item.deptId==row.unitId){
+          name=item.deptName
+        }
+      })
+      return name
+    },
     // 获取登录信息
     getUser() {
       getUserProfile().then((response) => {

src/views/PrintsManage/manage/index.vue

@@ -284,14 +284,6 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="归还时间" prop="returnTime" class="box1">
-            <el-date-picker
-              v-model="form.returnTime"
-              type="date"
-              placeholder="选择日期"
-            >
-            </el-date-picker>
-          </el-form-item> -->
           <div class="jiben">打印说明</div>
           <el-form-item label prop="explainInfo">
             <el-input
@@ -618,10 +610,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="归还时间" prop="returnTime" class="box1">
-          <el-date-picker v-model="form1.returnTime" type="date" placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item> -->
         <div class="jiben">打印说明</div>
         <el-form-item label prop="explainInfo">
           <el-input
@@ -798,11 +786,11 @@
         </el-form-item>
         <el-form-item label="归还时间" prop="returnTime">
           <el-date-picker
-            v-model="dyform.returnTime"
-            type="date"
-            placeholder="选择日期"
-          >
-          </el-date-picker>
+          v-model="dyform.returnTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
         </el-form-item>
         <!-- <el-form-item label="是否需要归还" prop="isReturn">
           <el-radio-group
@@ -1661,12 +1649,13 @@ export default {
     dysubmitForm() {
       this.$refs["dyform"].validate((valid) => {
         if (valid) {
+          // 
+          console.log(this.dyform);
           if (this.dyform.isReturn == 0) {
             this.dyform.statusG = 1;
           } else {
             this.dyform.statusG = 0;
           }
-
           printCode(this.dyform).then((res) => {
             if (res.code == 200) {
               if (this.dyform.type == "pdf") {

src/views/access/accessControl/index.vue

@@ -61,7 +61,7 @@
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
         <template scope="scope">
-          <span>{{
+          <span>>{{
             (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
           }}</span>
         </template>
@@ -171,7 +171,7 @@ export default {
     },
     // 重置
     resetQuery() {
-      this.queryParams.pageNum = 0;
+      this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
       this.queryParams.starttime = "";
       this.queryParams.endtime = "";