财务对账收费修改002

src/views/finance/charge/index.vue

@@ -7,6 +7,7 @@
           placeholder="请输入系统编号"
           clearable
           size="small"
+          style="width:200px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -16,6 +17,7 @@
           placeholder="请输入货权方"
           clearable
           size="small"
+          style="width:200px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -25,6 +27,7 @@
           filterable
           remote
           clearable
+          size="small"
           style="width: 200px"
           @keyup.enter.native="handleQuery"
           :remote-method="corpsRemoteMethod"
@@ -42,7 +45,7 @@
         <el-date-picker
           type="daterange"
           size="small"
-          style="width: 300px"
+          style="width: 240px"
           v-model="tableFilter.fAccbilldate"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -104,10 +107,10 @@
     </el-row>
 
     <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="50" align="center"/>
       <el-table-column label="序号" type="index" width="55" align="center"/>
-      <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno"/>
-      <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid"/>
+      <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno" width="120"/>
+      <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="120"/>
       <!--      <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="180">-->
       <!--        <template slot-scope="scope">-->
       <!--          <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>-->
@@ -115,12 +118,12 @@
       <!--      </el-table-column>-->
       <!--      <el-table-column label="制单部门" align="center" prop="fId"/>-->
       <!--      <el-table-column label="结算单位" align="center" prop="fCorpid"/>-->
-      <el-table-column label="对账日期" align="center" prop="fAccbilldate"/>
-      <el-table-column label="提单号" align="center" prop="tMblno"/>
-      <el-table-column label="应收合计" align="center" prop="fAmtdr"/>
-      <el-table-column label="应付合计" align="center" prop="fAmtcr"/>
-      <el-table-column label="备注" align="center" prop="fRemarks"/>
-      <el-table-column label="状态" align="center" prop="fBillstatus">
+      <el-table-column label="对账日期" align="center" prop="fAccbilldate" width="120"/>
+      <el-table-column label="提单号" align="center" prop="tMblno" width="120"/>
+      <el-table-column label="应收合计" align="center" prop="fAmtdr" width="120"/>
+      <el-table-column label="应付合计" align="center" prop="fAmtcr" width="120"/>
+      <el-table-column label="备注" align="center" prop="fRemarks" width="120"/>
+      <el-table-column label="状态" align="center" prop="fBillstatus" width="120">
         <template slot-scope="scope">
           <span v-if="scope.row.fBillstatus == '1'">保存</span>
           <span v-else-if="scope.row.fBillstatus == '2'">暂存</span>
@@ -130,7 +133,7 @@
           <span v-else-if="scope.row.fBillstatus == '6'">审核完成</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -138,7 +141,6 @@
             icon="el-icon-view"
             @click="check(scope.row,0)"
             v-hasPermi="['finance:contrast:edit']"
-            v-if="scope.row.fBillstatus == 6"
           >查看</el-button
           >
           <el-button
@@ -209,6 +211,7 @@
             clearable
             size="small"
             :disabled="notChange"
+            style="width:200px"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
@@ -218,6 +221,7 @@
             filterable
             remote
             clearable
+            size="small"
             style="width: 200px"
             @keyup.enter.native="handleQuery"
             :remote-method="corpsRemoteMethod"
@@ -248,6 +252,7 @@
             placeholder="请输入系统编号"
             clearable
             disabled
+            style="width: 200px"
             size="small"
             @keyup.enter.native="handleQuery"
           />
@@ -258,6 +263,7 @@
             placeholder="请输入备注"
             clearable
             size="small"
+            style="width:200px"
             :disabled="notChange"
             @keyup.enter.native="handleQuery"
           />
@@ -267,15 +273,15 @@
         <el-button type="warning" size="small" @click="charGe" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">收费</el-button>
         <el-button type="primary" size="small" @click="confirmCharge" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">确认收费</el-button>
         <el-button type="success" size="small" @click="revokeCharge" v-if="queryParams.fBillstatus === '6'">撤销收费</el-button>
-        <el-button type="info" size="small" @click="printing" :disabled="notChange">打印</el-button>
+        <el-button type="info" size="small" @click="printing">打印</el-button>
         <!--        <el-button type="danger" size="small" :disabled="notChange" v-show="Lander == Operator">撤销审批</el-button>-->
         <el-button type="danger" size="small" :disabled="tablefilter" @click="approvalRevocation" v-show="queryParams.fBillstatus === '4'">撤销审批</el-button>
       </div>
       <el-table v-loading="loading" :data="increase_s" @selection-change="handleSelectionChange_s">
         <!-- <el-table-column type="selection" width="55" align="center"/> -->
-        <el-table-column label="序号" type="index" width="55" align="center"/>
+        <el-table-column label="序号" type="index" align="center"/>
         <el-table-column label="提单号" align="center" prop="fMblno"/>
-        <el-table-column label="存货单号" align="center" prop="fBscorpno"/>if
+        <el-table-column label="存货单号" align="center" prop="fBscorpno"/>
         <el-table-column label="品名" align="center" prop="fProductName"/>
         <el-table-column label="业务日期" align="center" prop="fBsdate">
           <template slot-scope="scope">
@@ -333,6 +339,7 @@
               filterable
               remote
               clearable
+              size="small"
               style="width: 200px"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
@@ -352,6 +359,7 @@
               filterable
               remote
               clearable
+              size="small"
               style="width: 200px"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
@@ -366,10 +374,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="提单号" prop="tMblno">
-            <el-input v-model="queryParameter.fMblno" placeholder="请输入提单号" style="width: 200px;"/>
+            <el-input v-model="queryParameter.fMblno" placeholder="请输入提单号" style="width: 200px;" size="small"/>
           </el-form-item>
           <el-form-item label="对账单号" prop="fStatementNo">
-            <el-input v-model="queryParameter.fStatementNo" placeholder="请输入提单号" style="width: 200px;"/>
+            <el-input v-model="queryParameter.fStatementNo" placeholder="请输入提单号" size="small" style="width: 200px;"/>
           </el-form-item>
           <el-form-item label="费用名称" prop="fFeeid">
             <template>
@@ -377,6 +385,8 @@
                 v-model="queryParameter.fFeeid"
                 filterable
                 remote
+                size="small"
+                style="width:200px"
                 :remote-method="fWRemoteMethod"
                 placeholder="费用名称"
                 multiple
@@ -389,7 +399,7 @@
           <el-form-item label="审核日期" prop="timeExamine">
             <el-date-picker
               size="small"
-              style="width: 200px"
+              style="width: 240px"
               v-model="queryParameter.timeExamine"
               type="daterange"
               start-placeholder="开始日期"
@@ -402,7 +412,7 @@
           <el-form-item label="出入库日期" label-width="85px" prop="fAccbilldate">
             <el-date-picker
               size="small"
-              style="width: 200px"
+              style="width: 240px"
               v-model="queryParameter.timeInterval"
               type="daterange"
               start-placeholder="开始日期"
@@ -436,7 +446,7 @@
           <el-table-column label="审核日期" align="center" prop="fReviewDate"/>
           <el-table-column label="费用名称" align="center" prop="fFeeName"/>
           <el-table-column label="金额" align="center" prop="fAmtdr"/>
-          <el-table-column label="本次金额" align="center" prop="fAmt">
+          <el-table-column label="本次金额" align="center" prop="fAmt" width="100">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fAmt"
@@ -455,6 +465,7 @@
                 placeholder="请输入备注"
                 clearable
                 size="small"
+                width="100"
               />
             </template>
           </el-table-column>
@@ -465,6 +476,8 @@
         </div>
       </el-dialog>
     </el-dialog>
+
+<!--  打印页面-->
     <el-dialog
       :visible.sync="printStatus"
       width="80%"
@@ -472,23 +485,23 @@
     >
       <el-table id="print_area2" v-loading="loading" ref="table" :data="printObject" @selection-change="handleSelectionChange_s">
         <!-- <el-table-column type="selection" width="55" align="center"/> -->
-        <el-table-column label="序号" type="index" width="55" align="center"/>
-        <el-table-column label="提单号" align="center" prop="fMblno"/>
-        <el-table-column label="存货单号" align="center" prop="fBscorpno"/>
-        <el-table-column label="品名" align="center" prop="fProductName"/>
-        <el-table-column label="业务日期" align="center" prop="fBsdate">
+        <el-table-column label="序号" type="index" width="70" align="center"/>
+        <el-table-column label="提单号" align="center" prop="fMblno" width="120"/>
+        <el-table-column label="存货单号" align="center" prop="fBscorpno" width="120"/>
+        <el-table-column label="品名" align="center" prop="fProductName" width="120"/>
+        <el-table-column label="业务日期" align="center" prop="fBsdate" width="120">
           <template slot-scope="scope">
             <span>{{ scope.row.fBsdate.slice(0, 10)}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="费用名称" align="center" prop="fFeeName"/>
-        <el-table-column label="收/付" align="center" prop="fSrcdc">
+        <el-table-column label="费用名称" align="center" prop="fFeeName" width="120"/>
+        <el-table-column label="收/付" align="center" prop="fSrcdc" width="120">
           <template slot-scope="scope">
             <span v-if="scope.row.fSrcdc =='D'">收</span>
             <span v-else-if="scope.row.fSrcdc =='C'">付</span>
           </template>
         </el-table-column>
-        <el-table-column label="业务类型" align="center" prop="fBilltype">
+        <el-table-column label="业务类型" align="center" prop="fBilltype" width="120">
           <template slot-scope="scope">
             <span v-if="scope.row.fBilltype =='SJRK'">入库</span>
 
@@ -496,14 +509,13 @@
             <span v-else>{{ scope.row.fBilltype }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="金额" align="center" prop="fAmtdr"/>
-        <el-table-column label="本次金额" align="center" prop="fAmt"/>
-        <el-table-column label="备注" align="center" prop="fRemarks"/>
+        <el-table-column label="金额" align="center" prop="fAmtdr" width="120"/>
+        <el-table-column label="本次金额" align="center" prop="fAmt" width="120"/>
       </el-table>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="printStatus = false">取 消</el-button>
-    <el-button type="primary" @click="printSomething">确 定</el-button>
-  </span>
+        <el-button type="primary" style="marginTop:10px" @click="printSomething">打印</el-button>
+        <el-button @click="printStatus = false">取 消</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -896,10 +908,11 @@ export default {
     printSomething() {
       console.log('22222')
       // 此处的style即为打印时的样式
-      const style ='table tr td,th { border-collapse: collapse;padding:15px;border:.5px #000 solid;text-align:center;}'
+      const style ='table tr td,th { border-collapse: collapse;padding:0px;border:.5px #000 solid;text-align:center;}'
       print({
         printable: 'print_area2',
         type: 'html',
+        header:"收费表",
         style: style, // 亦可使用引入的外部css;
         scanStyles: false
       })

src/views/finance/contrast/index.vue

@@ -14,6 +14,7 @@
           filterable
           remote
           clearable
+          size="small"
           style="width:200px"
           @keyup.enter.native="handleQuery"
           :remote-method="corpsRemoteMethod"
@@ -28,6 +29,7 @@
           filterable
           remote
           clearable
+          size="small"
           style="width: 200px"
           @keyup.enter.native="handleQuery"
           :remote-method="corpsRemoteMethod"
@@ -61,6 +63,7 @@
           placeholder="请输入系统编号"
           clearable
           size="small"
+          style="width:200px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -101,17 +104,17 @@
           >修改</el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['finance:contrast:remove']"
-          >删除</el-button
-        >
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['finance:contrast:remove']"-->
+<!--          >删除</el-button-->
+<!--        >-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -234,6 +237,7 @@
             v-model="queryParams.fCtrlcorpid"
             clearable
             size="small"
+            style="width:200px"
             @keyup.enter.native="handleQuery"
             :disabled="notChange"
             placeholder="请输入客户名称"
@@ -249,6 +253,7 @@
             clearable
             :disabled="notChange"
             style="width: 200px"
+            size="small"
             @keyup.enter.native="handleQuery"
             :remote-method="corpsRemoteMethod"
           >
@@ -286,6 +291,7 @@
             clearable
             size="small"
             :disabled="true"
+            style="width: 200px"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
@@ -295,7 +301,7 @@
         </el-form-item>
 
         <el-form-item label="备注" prop="fRemarks">
-          <el-input v-model="queryParams.fRemarks"  :disabled="notChange"/>
+          <el-input v-model="queryParams.fRemarks" size="small" style="width:200px" :disabled="notChange"/>
         </el-form-item>
 
         <div style="width: 100%">
@@ -359,7 +365,7 @@
         <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
         <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
         <el-button v-if="approve === true" @click="goApproval">审批</el-button>
-        <el-button type="info" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
+        <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
         <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
         <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
         <el-button v-if="cancelButton === false" @click="homePage">取消</el-button>
@@ -390,6 +396,7 @@
               filterable
               remote
               clearable
+              size="small"
               style="width: 200px"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
@@ -412,6 +419,7 @@
               remote
               clearable
               style="width: 200px"
+              size="small"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
             >
@@ -430,11 +438,12 @@
               v-model="TWareHouseFees.fMblno"
               placeholder="请输入提单号"
               style="width: 200px"
+              size="small"
             />
           </el-form-item>
           <el-form-item label="收付" prop="fDc">
             <el-col :span="8">
-              <el-select v-model="TWareHouseFees.fDc" style="width: 200px">
+              <el-select v-model="TWareHouseFees.fDc" size="small" style="width: 200px">
                 <el-option label="收" value="D" />
                 <el-option label="付" value="C" />
               </el-select>
@@ -444,6 +453,7 @@
             <el-col :span="8">
               <el-select
                 v-model="TWareHouseFees.fReconciliation"
+                size="small"
                 style="width: 200px"
               >
                 <el-option label="是" value="1" />
@@ -459,6 +469,8 @@
                 filterable
                 :disabled="browseStatus"
                 remote
+                size="small"
+                style="width:200px"
                 :remote-method="fWRemoteMethod"
                 placeholder="费用名称"
                 multiple
@@ -476,7 +488,7 @@
 
           <el-form-item label="审核日期" prop="timeExamine">
             <el-date-picker
-              style="width: 250px"
+              style="width: 240px"
               size="small"
               v-model="TWareHouseFees.timeExamine"
               type="daterange"
@@ -491,7 +503,7 @@
             <el-date-picker
               v-model="TWareHouseFees.timeReconci"
               size="small"
-              style="width: 250px"
+              style="width: 240px"
               value-format="yyyy-MM-dd"
               type="daterange"
               start-placeholder="开始日期"
@@ -624,7 +636,7 @@
         </el-table-column>
       </el-table>
       <span slot="footer" class="dialog-footer">
-        <el-button style="marginTop:10px"  @click="printSomething">打印</el-button>
+        <el-button type="primary" style="marginTop:10px"  @click="printSomething">打印</el-button>
         <el-button @click="openPrint = false">取消</el-button>
       </span>
     </el-dialog>