问题清单修改

src/views/material/basic/unitType/index.vue

@@ -63,6 +63,9 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column label="序号" type="index" width="100" align="center">
+        <template slot-scope="scope">
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         label="单位类型名称"
@@ -129,13 +132,13 @@
       </el-table-column>
     </el-table>
 
-    <!-- <pagination
+     <pagination
       v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
-    /> -->
+    />
 
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -300,7 +303,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 1000,
+        pageSize: 10,
         dictType: "bm_unit_type",
         dictLabel: undefined,
       },

src/views/material/cost/component/applyHome.vue

@@ -18,9 +18,9 @@
                     :options="unitList"
                     :props="selectTreeProps"
                     filterable
-                    clearable 
-                    collapse-tags 
-                    @change="unitChange" 
+                    clearable
+                    collapse-tags
+                    @change="unitChange"
                     popper-class="popper-select"
                     placeholder="请选择单位"
                 ></el-cascader>  -->
@@ -38,9 +38,9 @@
                         :options="proList"
                         :props="selectTreeProps"
                         filterable clearable
-                        collapse-tags 
+                        collapse-tags
                         @change="proChange"
-                        placeholder="请选择工程"  
+                        placeholder="请选择工程"
                     ></el-cascader>  -->
             </el-form-item>
             <el-form-item prop="agreementCode">
@@ -106,7 +106,7 @@
                     }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="协议编号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/> 
+            <el-table-column label="协议编号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/>
             <el-table-column label="结算单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
             <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
             <el-table-column label="合计费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
@@ -152,7 +152,8 @@
 
         <!-- 协议单弹窗 -->
         <el-dialog :visible.sync="openPrint" width="1100px" append-to-body>
-            <div style="height: 600px; overflow-y: scroll">
+          <div id="checkId">
+            <div style="height: 600px; overflow-y: scroll" >
                 <vue-easy-print tableShow ref="remarksPrintRef" class="print">
                 <div style="text-align: center; font-weight: 600; font-size: 16px">
                     机具设备有偿使用费结算协议书
@@ -161,52 +162,52 @@
                     <div class="item" style=" width: 65%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px;">
                     </div>
                     <div class="item" style=" width: 35%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px;">
-                        <span>协议号：</span> 
-                    </div> 
-                </div> 
-                <div class="tabelColumn"> 
+                        <span>协议号：</span>
+                    </div>
+                </div>
+                <div class="tabelColumn">
                     <div class="columnLabel" style="width: 20%;">工程名称：</div>
-                    <div class="columnContent" style="width: 80%;">金上-湖北线路工程（川12标）</div> 
+                    <div class="columnContent" style="width: 80%;">金上-湖北线路工程（川12标）</div>
                 </div>
-                <div class="tabelColumn"> 
+                <div class="tabelColumn">
                     <div class="columnLabel" style="width: 20%;">承租单位：</div>
-                    <div class="columnContent" style="width: 40%;">金上-湖北线路工程（川12标）项目部</div> 
+                    <div class="columnContent" style="width: 40%;">金上-湖北线路工程（川12标）项目部</div>
                     <div class="columnLabel" style="width: 10%;border-left: 1px solid #9c9c9c;">日期：</div>
-                    <div class="columnContent" style="width: 30%;">2024-12-01</div> 
+                    <div class="columnContent" style="width: 30%;">2024-12-01</div>
                 </div>
-                <div class="tabelColumn"> 
+                <div class="tabelColumn">
                     <div class="columnLabel" style="width: 100%;">结算项目及金额(元)</div>
                 </div>
-                <div class="tabelColumn"> 
+                <div class="tabelColumn">
                     <div class="columnLabel" style="width: 60%;">一、施工机具有偿使用费：</div>
-                    <div class="columnContent" style="width: 40%;">￥ 13144247. 44</div> 
+                    <div class="columnContent" style="width: 40%;">￥ 13144247. 44</div>
                 </div>
-                <div class="tabelColumn"> 
+                <div class="tabelColumn">
                     <div class="columnLabel" style="width: 60%;">二、施工机具维修费：</div>
-                    <div class="columnContent" style="width: 40%;">￥ 13144247. 44</div> 
+                    <div class="columnContent" style="width: 40%;">￥ 13144247. 44</div>
                 </div>
-                <div class="tabelColumn"> 
+                <div class="tabelColumn">
                     <div class="columnLabel" style="width: 60%;">三、施工机具丢失费：</div>
-                    <div class="columnContent" style="width: 40%;">￥ 13144247. 44</div> 
+                    <div class="columnContent" style="width: 40%;">￥ 13144247. 44</div>
                 </div>
-                <div class="tabelColumn"> 
+                <div class="tabelColumn">
                     <div class="columnLabel" style="width: 60%;">四、施工机具损坏赔偿费：</div>
-                    <div class="columnContent" style="width: 40%;">￥ 13144247. 44</div> 
+                    <div class="columnContent" style="width: 40%;">￥ 13144247. 44</div>
                 </div>
-                <div class="tabelColumn"> 
+                <div class="tabelColumn">
                     <div class="columnLabel" style="width: 20%;">费用合计金额（大写）：</div>
-                    <div class="columnContent" style="width: 40%;">贰仟肆佰伍拾陆万伍仟肆佰捌拾玖元肆角伍分</div>  
-                    <div class="columnContent" style="width: 40%;">￥ 24565489.45</div> 
+                    <div class="columnContent" style="width: 40%;">贰仟肆佰伍拾陆万伍仟肆佰捌拾玖元肆角伍分</div>
+                    <div class="columnContent" style="width: 40%;">￥ 24565489.45</div>
                 </div>
-                <div class="tabelColumn"> 
+                <div class="tabelColumn">
                     <div class="columnLabel" style="width: 20%;">说明：</div>
-                    <div class="columnContent" style="width: 80%;">本协议一式三份，甲方一份，乙方一份，经双方签字后生效。</div> 
+                    <div class="columnContent" style="width: 80%;">本协议一式三份，甲方一份，乙方一份，经双方签字后生效。</div>
                 </div>
-                <div class="tabelColumn" style="border: 1px solid #9c9c9c;"> 
+                <div class="tabelColumn" style="border: 1px solid #9c9c9c;">
                     <div class="columnLabel" style="width: 20%;">备注：</div>
-                    <div class="columnContent" style="width: 80%;">此费用仅为在机具设备分公司发生费用，未计从项目部领用机具费用。</div> 
+                    <div class="columnContent" style="width: 80%;">此费用仅为在机具设备分公司发生费用，未计从项目部领用机具费用。</div>
                 </div>
-                
+
 
                 <div class="fillIn" style="margin-top: 20px; display: flex; justify-content: space-between;">
                     <div class="item" style="width: 33%">
@@ -229,6 +230,7 @@
                 </div>
                 </vue-easy-print>
             </div>
+          </div>
 
             <div slot="footer" class="dialog-footer" style="text-align: center">
                 <el-button type="primary" @click="print">打 印</el-button>
@@ -243,12 +245,13 @@
 import {
     // getProjectList,
     getUnitList,
-    // getAgreementInfoById, 
-} from '@/api/back/index.js'  
+    // getAgreementInfoById,
+} from '@/api/back/index.js'
 import { getSltAgreementInfo,getProjectListByUnitIds,getAgreementInfoById } from '@/api/cost/cost'
 import vueEasyPrint from "vue-easy-print";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import printJS from 'print-js'
 export default {
     name: 'CostApplyList',
     dicts: ['cost_status'],
@@ -262,7 +265,7 @@ export default {
             // 非单个禁用
             single: true,
             // 非多个禁用
-            multiple: true, 
+            multiple: true,
             // 总条数
             total: 0,
             // 单位数据
@@ -273,10 +276,10 @@ export default {
             projectIds: null,
             selectTreeProps: {
                 children: 'children',
-                label: 'name', 
+                label: 'name',
                 value: 'id',
                 multiple: true,//false
-            },  
+            },
             // statusList: [
             //     { id: '1', name: '未结算' },
             //     { id: '2', name: '已结算' },
@@ -284,11 +287,11 @@ export default {
             //     { id: '4', name: '已驳回' },
             // ],
             // 表格数据
-            tableList: [], 
+            tableList: [],
             // 查询参数
             queryParams: {
                 pageNum: 1,
-                pageSize: 10, 
+                pageSize: 10,
                 sltStatus: '',
                 isCommit:'',
                 unitId: null,
@@ -310,7 +313,7 @@ export default {
     //         }
     //     });
     // },
-    created() { 
+    created() {
         this.GetUnitData()
         // this.GetProData()
         this.getList()
@@ -326,7 +329,7 @@ export default {
                 label: node.name,
                 children: node.children,
             };
-        }, 
+        },
         // 获取 来往单位 列表数据
         async GetUnitData() {
                 const params = {
@@ -335,7 +338,7 @@ export default {
                 const res = await getUnitList(params)
                 this.unitList = res.data;
                 if(this.queryParams.projectId){
-             this.getAgreementInfo() 
+             this.getAgreementInfo()
                 }
 
         },
@@ -355,8 +358,8 @@ export default {
                 this.queryParams.agreementId = null
                 this.queryParams.agreementCode = null
                 this.GetProData()
-            },500)  
-        }, 
+            },500)
+        },
         // 获取 工程名称 列表数据
         async GetProData() {
                 const unitIdsAsNumbers = this.unitIds.map(id => Number(id));
@@ -365,8 +368,8 @@ export default {
                 }
                 const res = await getProjectListByUnitIds(params)
                 this.proList = res.data;
-               
-                this.getAgreementInfo() 
+
+                this.getAgreementInfo()
         },
         proChange(val){
             // if(val&&val.length>0){
@@ -377,7 +380,7 @@ export default {
             // this.GetUnitData()
             setTimeout(()=>{
                 this.GetUnitData()
-            },500) 
+            },500)
         },
         // 获取 协议id
         async getAgreementInfo() {
@@ -399,7 +402,7 @@ export default {
                     this.queryParams.agreementCode = res.data.map(item => item.agreementCode).join(',');
                 }
             }
-        }, 
+        },
         /** 查询列表 */
         getList() {
             this.loading = true
@@ -417,7 +420,7 @@ export default {
                 this.total = response.total
                 this.loading = false
             })
-        }, 
+        },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1
@@ -426,10 +429,10 @@ export default {
         /** 重置按钮操作 */
         resetQuery() {
             this.unitIds=[]
-            this.projectIds=[] 
+            this.projectIds=[]
             this.queryParams={
                 pageNum: 1,
-                pageSize: 10, 
+                pageSize: 10,
                 sltStatus: '',
                 isCommit:'',
                 unitId: null,
@@ -439,7 +442,7 @@ export default {
             }
             this.resetForm('queryForm')
             this.handleQuery()
-        }, 
+        },
         //结算申请
         handleApply(row) {
             let arr = [];
@@ -476,7 +479,14 @@ export default {
         },
         //维修任务单打印
         print() {
-          this.$refs.remarksPrintRef.print();
+          // this.$refs.remarksPrintRef.print();
+          printJS({
+            printable: 'checkId',
+            type: 'html',
+            targetStyles: ['*'],
+            maxWidth:'1400'
+            // 其他配置选项
+          });
         },
 
         /** 删除按钮操作 */
@@ -517,19 +527,19 @@ export default {
     display: flex;
     align-items: center;
     border: 1px solid #9c9c9c;
-    // margin-bottom: 1px; 
+    // margin-bottom: 1px;
     border-bottom: none;
 }
 .columnLabel {
     height: 50px;
     line-height: 50px;
-    text-align: center; 
+    text-align: center;
     border-left: none;
 }
 .columnContent {
     height: 50px;
     line-height: 50px;
-    text-align: center; 
+    text-align: center;
     border-left: 1px solid #9c9c9c;
-} 
+}
 </style>

src/views/material/part/partAcceptTwo/index.vue

@@ -251,6 +251,7 @@ import { passAll, rejectAll } from '@/api/part/partAccept';
 import vueEasyPrint from "vue-easy-print";
 import { downloadFile } from '@/utils/download'
 import { getToken } from '@/utils/auth'
+import printJS from 'print-js'
   export default {
     name: "PartAcceptTwo",
     dicts: ['part_task_status'],

src/views/material/repair/scrapLedger/index.vue

@@ -9,7 +9,7 @@
               value-format="yyyy-MM">
             </el-date-picker>
         </el-form-item>
-        <el-form-item  prop="keyWord">
+<!--        <el-form-item  prop="keyWord">
             <el-input
                 v-model="queryParams.keyWord"
                 placeholder="请输入关键词"
@@ -17,7 +17,7 @@
                 @keyup.enter.native="handleQuery"
                 maxlength="20"
             />
-        </el-form-item>
+        </el-form-item>-->
 
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>

src/views/material/repair/scrapLedgerReview/index.vue

@@ -8,7 +8,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item  prop="time">
+<!--      <el-form-item  prop="time">
         <el-date-picker
           v-model="queryParams.time"
           type="daterange"
@@ -17,6 +17,16 @@
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd">
         </el-date-picker>
+      </el-form-item>-->
+      <el-form-item prop="time">
+        <el-date-picker
+          v-model="queryParams.time"
+          type="month"
+          placeholder="请选择月份"
+          value-format="yyyy-MM"
+          :clearable="false"
+          :editable="false"
+        />
       </el-form-item>
       <el-form-item  prop="keyWord">
         <el-input
@@ -80,7 +90,7 @@
       <el-table-column
         type="selection"
         width="55"
-        align="center" 
+        align="center"
         :reserve-selection="true"
       />
       <el-table-column label="序号" align="center" width="80" type="index">
@@ -112,7 +122,7 @@
         <template slot-scope="scope">
           <span style="color:#70B603">{{ '待审核'}}</span>
         </template>
-      </el-table-column>      
+      </el-table-column>
       <!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>       -->
       <el-table-column label="操作" align="center" width="180" >
         <template slot-scope="scope">
@@ -227,10 +237,11 @@ export default {
       this.loading = true;
       const params = {
         keyWord: this.queryParams.keyWord,
-        startTime: this.queryParams.time && this.queryParams.time[0],
-        endTime: this.queryParams.time && this.queryParams.time[1],
+        month: this.queryParams.time,
+        // startTime: this.queryParams.time && this.queryParams.time[0],
+        // endTime: this.queryParams.time && this.queryParams.time[1],
         pageSize: this.queryParams.pageSize,
-        pageNum: this.queryParams.pageNum 
+        pageNum: this.queryParams.pageNum
       }
       console.log('11111111111',params)
      await getTotalList(params).then((response) => {
@@ -245,7 +256,7 @@ export default {
     getTopData() {
       getTotalPrice().then((response) => {
         console.log("xxxxxxxx",response)
-        this.reviewPeriod = response.data.month==null ? '': response.data.month;  
+        this.reviewPeriod = response.data.month==null ? '': response.data.month;
         this.reviewCost = response.data.totalCost==null ? 0: response.data.totalCost;
       });
     },

src/views/system/config/index.vue

@@ -151,10 +151,10 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="参数名称" prop="configName">
-          <el-input v-model="form.configName" placeholder="请输入参数名称" readonly />
+          <el-input v-model="form.configName" placeholder="请输入参数名称" :readonly="form.configId != undefined" />
         </el-form-item>
         <el-form-item label="参数键名" prop="configKey">
-          <el-input v-model="form.configKey" placeholder="请输入参数键名" readonly />
+          <el-input v-model="form.configKey" placeholder="请输入参数键名"  :readonly="form.configId != undefined" />
         </el-form-item>
         <el-form-item label="参数键值" prop="configValue">
           <el-input v-model="form.configValue" placeholder="请输入参数键值" />