Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/api/basicdata/goods.js

@@ -36,10 +36,10 @@ export function updateGoods(data) {
 }
 
 // 状态修改
-export function changeGoodsStatus(fId, fstatus) {
+export function changeGoodsStatus(fId, fStatus) {
   const data = {
     fId,
-    fstatus
+    fStatus
   }
   return request({
     url: '/basicdata/goods',

src/api/warehouseBusiness/goodsTransfer.js

@@ -87,3 +87,12 @@ export function exportGoodsTransfer(query) {
     params: query
   })
 }
+
+// 撤销审批
+export function RevocationApproval(data){
+  return request({
+    url:'/warehouse/paths/revoke',
+    method:'post',
+    data:data
+  })
+}

src/views/finance/charge/index.vue

@@ -107,7 +107,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="50" align="center"/>
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" type="index" width="55" align="center"/>
       <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"/>
@@ -273,7 +273,7 @@
         <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">打印</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>

src/views/finance/contrast/index.vue

@@ -309,7 +309,7 @@
             >对账</el-button>
           <el-button type="primary" size="small" @click="confirmReconciliation" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">确认对账</el-button>
           <el-button type="success" size="small" @click="backrRconciliation" v-if="queryParams.fBillstatus === '6'">撤销对账</el-button>
-          <el-button type="info" size="small" @click="printing">打印</el-button>
+<!--          <el-button type="info" size="small" @click="exportData">导出</el-button>-->
           <el-button type="danger" size="small" :disabled="disappear" v-if="queryParams.fBillstatus === '4'" @click="backApproval">撤销审批</el-button>
         </div>
 
@@ -595,51 +595,51 @@
     </el-dialog>
 
     <!-- 打印页面 -->
-    <el-dialog
-      :visible.sync="openPrint"
-      width="80%"
-      append-to-body
-      :close-on-click-modal="false"
-      title="对账单"
-    >
-      <el-table
-        ref="table"
-        id="print_area2"
-        v-loading="loading"
-        :data="printObject"
-        @selection-change="handleSelectionChange_s">
+<!--    <el-dialog-->
+<!--      :visible.sync="openPrint"-->
+<!--      width="80%"-->
+<!--      append-to-body-->
+<!--      :close-on-click-modal="false"-->
+<!--      title="对账单"-->
+<!--    >-->
+<!--      <el-table-->
+<!--        ref="table"-->
+<!--        id="print_area2"-->
+<!--        v-loading="loading"-->
+<!--        :data="printObject"-->
+<!--        @selection-change="handleSelectionChange_s">-->
 
-        <el-table-column label="行号" align="center" type="index" width="70"/>
-        <el-table-column label="提单号" align="center" prop="fMblno" />
-        <el-table-column label="业务日期" align="center" prop="fBsdate">
-          <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">
-          <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="fAmtdr" />
-        <el-table-column label="本次金额" align="center" prop="fAmt"/>
-        <el-table-column label="业务类型" align="center" prop="fBilltype">
-          <template slot-scope="scope">
-            <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
-            <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
-            <span v-else-if="scope.row.fBilltype == 'CKDB'">调拨</span>
-            <span v-else-if="scope.row.fBilltype == 'HQZY'">货权转移</span>
-            <span v-else>{{scope.row.fBilltype}}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" style="marginTop:10px"  @click="printSomething">打印</el-button>
-        <el-button @click="openPrint = false">取消</el-button>
-      </span>
-    </el-dialog>
+<!--        <el-table-column label="行号" align="center" type="index" width="70"/>-->
+<!--        <el-table-column label="提单号" align="center" prop="fMblno" />-->
+<!--        <el-table-column label="业务日期" align="center" prop="fBsdate">-->
+<!--          <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">-->
+<!--          <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="fAmtdr" />-->
+<!--        <el-table-column label="本次金额" align="center" prop="fAmt"/>-->
+<!--        <el-table-column label="业务类型" align="center" prop="fBilltype">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>-->
+<!--            <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>-->
+<!--            <span v-else-if="scope.row.fBilltype == 'CKDB'">调拨</span>-->
+<!--            <span v-else-if="scope.row.fBilltype == 'HQZY'">货权转移</span>-->
+<!--            <span v-else>{{scope.row.fBilltype}}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
+<!--      <span slot="footer" class="dialog-footer">-->
+<!--        <el-button type="primary" style="marginTop:10px"  @click="printSomething">打印</el-button>-->
+<!--        <el-button @click="openPrint = false">取消</el-button>-->
+<!--      </span>-->
+<!--    </el-dialog>-->
   </div>
 </template>
 
@@ -1535,6 +1535,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
+
       this.$confirm('是否确认导出所有财务数据主数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1545,6 +1546,19 @@ export default {
         this.download(response.msg);
       })
     },
+    exportData(){
+      // 在这里判断筛选DzfeeList={}
+      const DzfeeList = this.DzfeeList
+      this.$confirm('是否确认导出所有财务数据主数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function(){
+        return
+      }).then(function(){
+        this.download(response.msg);
+      })
+    },
     //清空一行
     deleteRow(index, rows) {
       this.queryParams.fAmtdr = 0

src/views/finance/payment/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="结束日期"
@@ -106,8 +109,8 @@
     <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" 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">
@@ -314,10 +320,10 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="approve === true" @click="immediateApproval">审批</el-button>
-        <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle">查看审批流</el-button>
         <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="immediateApproval">审批</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>
@@ -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="开始日期"
@@ -417,7 +427,7 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery_s">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-table v-loading="loading" :data="chargeList_s" ref="chargeList" show-summary :summary-method="getSummaries"
+        <el-table v-loading="loading" :data="chargeList_s" ref="chargeList" show-summary :summary-method="getSum"
                   @selection-change="handleSelectionChange_s"
         >
           <el-table-column type="selection" width="55" align="center"/>
@@ -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>
@@ -569,6 +581,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      totAL:0,
+      Ttime:0,
       //提单号暂存
       fMblno: '',
       // 财务数据主表格数据
@@ -591,8 +605,8 @@ export default {
       empty: [],
       //导入从表传主表
       pass: {
-        fAmtdr: '',    //应收合计
-        fAmtcr: '',    //应付合计
+        fAmtdr: 0,    //应收合计
+        fAmtcr: 0,    //应付合计
         fMblno: '',    //提单号
         fName: ''      //货权方
       },
@@ -648,6 +662,15 @@ export default {
       },
       // 表单校验
       rules: {
+        fBilltype: [
+          { required: true, message: ' ', trigger: 'change' }
+        ],
+        fBillstatus: [
+          { required: true, message: ' ', trigger: 'blur' }
+        ],
+        fDeptid: [
+          { required: true, message: ' ', trigger: 'blur' }
+        ],
         fToCorpid: [
           { required: true, message: ' ', trigger: 'blur' }
         ],
@@ -664,7 +687,6 @@ export default {
   created() {
     this.getList()
     this.register()
-
   },
   activated(){
     this.adoPt()
@@ -682,12 +704,13 @@ export default {
         if (data.code === 200){
           this.$message.success('撤销成功');
           this.open = false
+          this.getList()
         }
       })
     },
     returnData(){
-      this.open = false
       this.addOrUpdateVisib = false
+      this.open = false
       this.homepaGe()
     },
     getDataList(){
@@ -695,13 +718,13 @@ export default {
     },
     homepaGe(){
       let view = {
-        fullPath: "/finance/payment",
+        fullPath: "/finance/charge",
         hash: "",
         matched: Array(2),
         meta: Object,
-        name: "Payment",
+        name: "Charge",
         params: Object,
-        path: "/finance/payment",
+        path: "/finance/charge",
         query: Object,
         title: "付费"
       }
@@ -713,7 +736,6 @@ export default {
       })
       Global.$emit("removeCache", "closeSelectedTag", view);
     },
-
     adoPt(){
       this.approval = this.$route.query.data
       if (this.approval){
@@ -725,8 +747,8 @@ export default {
         this.cancelButton = false
         this.reset()
         this.pass = {
-          fAmtdr: '',    //应收合计
-          fAmtcr: '',    //应付合计
+          fAmtdr: 0,    //应收合计
+          fAmtcr: 0,    //应付合计
           fMblno: '',    //提单号
           fName: '',      //货权方
           fFeesName: '',   //结算单位
@@ -748,15 +770,15 @@ export default {
     homePage(){
       this.open = false
       let view = {
-        fullPath: "/finance/payment",
+        fullPath: "/finance/charge",
         hash: "",
         matched: Array(2),
         meta: Object,
-        name: "Payment",
+        name: "Charge",
         params: Object,
-        path: "/finance/payment",
+        path: "/finance/charge",
         query: Object,
-        title: "付费",
+        title: "付费"
       }
       this.$router.push({ path: '/index'})
       this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
@@ -826,8 +848,8 @@ export default {
             this.tablefilter = false
             this.reset()
             this.pass = {
-              fAmtdr: '',    //应收合计
-              fAmtcr: '',    //应付合计
+              fAmtdr: 0,    //应收合计
+              fAmtcr: 0,    //应付合计
               fMblno: '',    //提单号
               fName: '',      //货权方
               fFeesName: '',   //结算单位
@@ -852,8 +874,8 @@ export default {
           this.notChange = true
           this.reset()
           this.pass = {
-            fAmtdr: '',    //应收合计
-            fAmtcr: '',    //应付合计
+            fAmtdr: 0,    //应收合计
+            fAmtcr: 0,    //应付合计
             fMblno: '',    //提单号
             fName: '',      //货权方
             fFeesName: '',   //结算单位
@@ -886,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
       })
@@ -904,7 +927,7 @@ export default {
 
         })
     },
-    // 确认收费
+    // 确认付费
     confirmCharge() {
       console.log(this.increase_s)
       this.$refs['ruless'].validate(valid => {
@@ -930,28 +953,46 @@ export default {
       this.queryParameter = {
         fToCorpid: this.queryParams.fCorpid,
       }
+      this.chargeList_s = []
       // this.queryParameter.fToCorpid = this.queryParams.fCorpid
       this.innerVisible = true
     },
-    getSummaries(param) {
-      const { columns, data } = param
-      const sums = []
+    getSum(param){
+      const {columns,data} = param;
+      const sums = [];
       columns.forEach((column, index) => {
-        const values = data.map(item => Number(item[column.property]))
-        if (!values.every(value => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[0] = '合计'
-          sums[3] = ''
+        sums[0] = '合计'
+        sums[10] = this.totAL.toFixed(2)
+        sums[9] = this.Ttime.toFixed(2)
+      });
+      return sums;
+    },
+    // 导入多选框
+    handleSelectionChange_s(selection) {
+      this.totAL = 0
+      this.Ttime = 0
+      this.selection = selection
+      console.log(selection)
+      if(this.selection.length == 0){
+        for (let item in this.chargeList_s){
+          this.totAL += Number(this.chargeList_s[item].fAmt)
+          this.Ttime += Number(this.chargeList_s[item].fAmtdr)
         }
-      })
-      return sums
+      }else {
+        for (let index in selection){
+          this.totAL += Number(selection[index].fAmt)
+          this.Ttime += Number(selection[index].fAmtdr)
+        }
+      }
+      // this.getSummaries()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      console.log(selection)
+      this.totAL = 0
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
     },
     imgChangeI(row) {
       if (row.fAmt && Number(row.fAmt) > Number(row.fAmtdr)) {
@@ -959,20 +1000,30 @@ export default {
         this.state_s = true
       }
       console.log('数据：' + JSON.stringify(this.selection))
-      // this.$refs.chargeList.clearSelection()
+      if (this.selection.length !== 0){
+        this.totAL = 0
+        this.Ttime = 0
+        for (let item in this.selection){
+          this.totAL += Number(this.selection[item].fAmt)
+          this.Ttime += Number(this.selection[item].fAmtdr)
+        }
+      }else {
+        this.totAL = 0
+        this.Ttime = 0
+        for (let item in this.chargeList_s){
+          this.totAL += Number(this.chargeList_s[item].fAmt)
+          this.Ttime += Number(this.chargeList_s[item].fAmtdr)
+        }
+      }
     },
     //确认导入
     confirmImport() {
       this.hide = true
-      console.log(this.state_s)
       for (let item in this.selection) {
-        this.pass.fAmtcr = Number(this.pass.fAmtcr)
-        this.pass.fAmtdr = Number(this.pass.fAmtdr)
-        this.pass.fAmtcr += Number(this.selection[item].fAmt)
-        this.pass.fAmtdr += Number(this.selection[item].fAmtdr)
-        console.log(this.pass.fAmtcr)
-        console.log(this.pass.fAmtdr)
+        this.pass.fAmtcr += Number(this.selection[item].fAmt.toFixed(2))
+        this.pass.fAmtdr += Number(this.selection[item].fAmtdr.toFixed(2))
       }
+      console.log(this.pass)
       if (this.state_s == true) {
         if (this.selection.length == '0') {
           console.log('未选择')//写入提示
@@ -1002,7 +1053,6 @@ export default {
           } else {
             this.pass.fName = this.nothing[0] + '...'
           }
-
           this.increase_s = this.increase_s.concat(this.selection)
           this.queryParams.tMblno = this.pass.fMblno //提单号
           this.queryParams.fCtrlcorpid = this.pass.fName
@@ -1072,7 +1122,6 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1
       this.getList()
-      console.log(this.tableFilter)
     },
     /** 导入搜索 */
     importSearch() {
@@ -1084,14 +1133,18 @@ export default {
         this.rules = {}
         search(this.queryParameter).then(response => {
           this.chargeList_s = response.rows
-          this.$message.success('查询成功');
+          this.$message.success('查询成功1');
+          for (let item in this.chargeList_s){
+            this.totAL += Number(this.chargeList_s[item].fAmt)
+            this.Ttime += Number(this.chargeList_s[item].fAmtdr)
+          }
         })
       }else {
         this.rules = {
           fToCorpid: [
             { required: true, message: ' ', trigger: 'blur' }
           ],
-            timeExamine: [
+          timeExamine: [
             { required: true, message: ' ', trigger: 'blur' }
           ]
         }
@@ -1100,7 +1153,13 @@ export default {
             if (valid) {
               search(this.queryParameter).then(response => {
                 this.chargeList_s = response.rows
-                this.$message.success('查询成功');
+                this.$message.success('查询成功2');
+                this.totAL = 0
+                this.Ttime = 0
+                for (let item in this.chargeList_s){
+                  this.totAL += Number(this.chargeList_s[item].fAmt)
+                  this.Ttime += Number(this.chargeList_s[item].fAmtdr)
+                }
               })
             }
           })
@@ -1163,25 +1222,14 @@ export default {
         this.fWbuOptions = response.rows
       })
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.fId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    // 导入多选框
-    handleSelectionChange_s(selection) {
-      console.log(selection)
-      this.selection = selection
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.notChange = false
       this.hide = true
       this.reset()
       this.pass = {
-        fAmtdr: '',    //应收合计
-        fAmtcr: '',    //应付合计
+        fAmtdr: 0,    //应收合计
+        fAmtcr: 0,    //应付合计
         fMblno: '',    //提单号
         fName: '',      //货权方
         fFeesName: '',   //结算单位
@@ -1216,8 +1264,8 @@ export default {
       this.notChange = false
       this.reset()
       this.pass = {
-        fAmtdr: '',    //应收合计
-        fAmtcr: '',    //应付合计
+        fAmtdr: 0,    //应收合计
+        fAmtcr: 0,    //应付合计
         fMblno: '',    //提单号
         fName: '',      //货权方
         fFeesName: '',   //结算单位
@@ -1258,7 +1306,6 @@ export default {
             })
           } else {
             console.log(this.queryParams)
-            // this.chargeList.fBillstatus = '1'
             this.queryParams.fBillstatus = '1'
             let formData = new window.FormData()
             formData.append('tFee', JSON.stringify(this.queryParams))
@@ -1335,7 +1382,6 @@ export default {
         console.log(this.increase_s[item])
         this.queryParams.fAmtcr += this.increase_s[item].fAmt
         this.queryParams.fAmtdr += this.increase_s[item].fAmtdr
-
       }
       console.log(this.queryParams.fAmtdr)
       console.log(this.queryParams.fAmtcr)

src/views/warehouseBusiness/agreement/index.vue

@@ -814,18 +814,23 @@ export default {
     },
     // 仓储费状态修改
     handleStatusChange(row) {
-      let text = row.fBillstatus === '0' ? '启用' : '停用'
-      this.$confirm('确认要"' + text + '""' + row.fCorpid + '"用户吗?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return updateAgreement_s(row.fId, row.fBillstatus)
-      }).then(() => {
-        this.msgSuccess(text + '成功')
-      }).catch(function() {
-        row.fBillstatus = row.fBillstatus === '0' ? '1' : '0'
-      })
+      if(row.fBillstatus == '6'){
+        let text = row.fBillstatus === '0' ? '启用' : '停用'
+        this.$confirm('确认要"' + text + '""' + row.fCorpid + '"用户吗?', '警告', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function() {
+          return updateAgreement_s(row.fId, row.fBillstatus)
+        }).then(() => {
+          this.msgSuccess(text + '成功')
+        }).catch(function() {
+          row.fBillstatus = row.fBillstatus === '0' ? '1' : '0'
+        })
+      }else{
+        row.fStatus = 0
+        this.$message.error('审核完成时才能启用');
+      }
     },
     test_s() {
       console.log(this.agreementitemsList)

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -264,6 +264,16 @@
       <el-table-column label="件数" align="center" prop="fQty"/>
       <el-table-column label="毛重" align="center" prop="fGrossweight"/>
       <el-table-column label="净重" align="center" prop="fNetweight"/>
+      <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>
+          <span v-else-if="scope.row.fBillstatus == '3'">审批驳回</span>
+          <span v-else-if="scope.row.fBillstatus == '4'">提交审核</span>
+          <span v-else-if="scope.row.fBillstatus == '5'">审核中</span>
+          <span v-else-if="scope.row.fBillstatus == '6'">审核完成</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -275,7 +285,6 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.fBillstatus === 6"
             @click="handleUpdate(scope.row, true)"
             v-hasPermi="['warehouseBusiness:goodsTransfer:edit']"
           >查看
@@ -284,7 +293,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.fBillstatus !== 6"
+            v-if="scope.row.fBillstatus <= 3"
             @click="handleUpdate(scope.row, false)"
             v-hasPermi="['warehouseBusiness:goodsTransfer:edit']"
           >修改
@@ -302,7 +311,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.fBillstatus !== 6"
+            v-if="scope.row.fBillstatus <= 3"
             @click="handleDelete(scope.row)"
             v-hasPermi="['warehouseBusiness:goodsTransfer:remove']"
           >删除
@@ -324,6 +333,7 @@
       :close-on-click-modal="false"
       width="80%"
       append-to-body
+
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
@@ -550,8 +560,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-button type="primary" @click="saveForm">保 存</el-button>
-        <el-button type="primary" @click="submitForm">请 核</el-button>
+        <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
+        <el-button type="primary" :disabled="browseStatus" @click="submitForm">请 核</el-button>
       </el-form>
       <div class="dialogTableTitle flex a-center jlr">
         <h3>货转明细</h3>
@@ -560,17 +570,17 @@
         </el-button
         >
         <el-button
-          :disabled="dataListSelection.length <= 0"
+          :disabled="dataListSelection.length <= 0 || browseStatus"
           @click.prevent="creditClick()"
         >货转确认
         </el-button>
         <el-button
-          :disabled="dataWithdrawList.length <= 0"
+          :disabled="dataWithdrawList.length <= 0 || browseStatus"
           @click.prevent="withdrawClick"
         >撤回货转
         </el-button
         >
-        <el-button type="primary" @click="saveForm">保 存</el-button>
+        <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
       </div>
       <el-table
         :data="dataList"
@@ -825,7 +835,7 @@
         <el-button :disabled="browseStatus" @click.prevent="addRelevt()"
         >新增
         </el-button>
-        <el-button type="primary" @click="saveForm">保 存</el-button>
+        <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
       </div>
       <el-table
         :data="relevantAttachments"
@@ -919,7 +929,7 @@
         <el-button :disabled="browseStatus" @click.prevent="addCollection()"
         >新增
         </el-button>
-        <el-button type="primary" @click="saveForm">保 存</el-button>
+        <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
       </div>
       <el-table
         :data="warehouseDrList"
@@ -1145,7 +1155,7 @@
         <el-button :disabled="browseStatus" @click.prevent="addpayment()"
         >新增
         </el-button>
-        <el-button type="primary" @click="saveForm">保 存</el-button>
+        <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
       </div>
       <el-table
         :data="warehouseCrList"
@@ -1370,8 +1380,14 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
+        <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 type="primary" @click="saveForm">保 存</el-button>
+        <el-button v-if="approve === true" @click="goApproval">审批</el-button>
+        <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
         <el-button type="primary" @click="submitForm">提交审核</el-button>
+        <el-button type="danger" size="small" :disabled="disappear" v-if="form.fBillstatus === '4'" @click="backApproval">撤销审批</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       <!-- 选择库存总账数据 -->
@@ -1449,6 +1465,7 @@
 <script>
   import print from 'print-js'
   import {
+    RevocationApproval,
     addWhgenleg,
     listGoodsTransfer,
     getGoodsTransfer,
@@ -1474,13 +1491,25 @@
 
   import UploadFile from '@/components/Uploadfile'
 
+  import AddOrUpdate from '@/views/viewApproval'
+  import ApprovalComments from '@/views/startApproval'
+  import Global from '@/layout/components/global'
   export default {
     name: 'goodsTransfer',
     components: {
-      UploadFile
+      UploadFile,
+      AddOrUpdate,
+      ApprovalComments
     },
     data() {
       return {
+        disappear:false,
+        goodsTransferId:130,
+        addOrUpdateVisible: false,
+        addOrUpdateVisib:false,
+        // 审批状态
+        approve:false,
+        notChange:false,
         // 修改查看状态
         browseStatus: false,
         // 是否有明细入库
@@ -1689,6 +1718,133 @@
       })
     },
     methods: {
+      // 审批按钮
+      goApproval(){
+        this.addOrUpdateVisib = true
+        this.$nextTick(() => {
+          this.$refs.ApprovalComments.init(this.form.fId,this.goodsTransferId)
+        })
+      },
+      Jump(){
+        this.approval = this.$route.query.data
+        if(this.approval){
+          this.colseButton = false
+          this.approval = JSON.parse(this.approval)
+          this.hide = false
+          this.notChange = true
+          this.approve = true
+          this.disappear = true
+          this.cancelButton = false
+          this.reset()
+          getGoodsTransfer(fId).then((response) => {
+            this.form = response.data.warehousebills
+            this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
+            this.$set(this.form, 'fFeetunit', Number(this.form.fFeetunit))
+            this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
+            this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
+            this.fMblnoOptions = response.data.corps
+            this.KHblnoOptions = response.data.corps
+            this.fWbuOptions = response.data.feesList
+            this.warehouseOptions = response.data.warehouse
+            this.dataList = response.data.warehouseBillsItem
+            for (let list in this.dataList) {
+              if (this.dataList[list].fBillstatus && this.dataList[list].fBillstatus === 6) {
+                this.formBrowseStatus = true
+              }
+              this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))
+            }
+            this.goodsOptions = response.data.goodsList
+            if (response.data.warehousebillsfeesDr) {
+              this.warehouseDrList = response.data.warehousebillsfeesDr
+            }
+            if (response.data.warehousebillsfeesCr) {
+              this.warehouseCrList = response.data.warehousebillsfeesCr
+            }
+            if (response.data.enclosures) {
+              this.relevantAttachments = response.data.enclosures;
+            }
+            this.userOptions = response.data.sysUser
+            this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
+            this.open = true
+            this.title = '修改货存转移'
+          })
+
+        }
+      },
+
+      homepaGe(){
+        let view = {
+          fullPath: "/business/goodsTransfer",
+          hash: "",
+          matched: Array(2),
+          meta: Object,
+          name: "GoodsTransfer",
+          params: Object,
+          path: "/business/goodsTransfer",
+          query: Object,
+          title: "货转"
+        }
+        this.$router.push({ path: '/index'})
+        this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
+          if (this.isActive(view)) {
+            this.toLastView(visitedViews, view)
+          }
+        })
+        Global.$emit("removeCache", "closeSelectedTag", view);
+      },
+      homePage() {
+        this.open = false
+        let view = {
+          fullPath: "/business/goodsTransfer",
+          hash: "",
+          matched: Array(2),
+          meta: Object,
+          name: "GoodsTransfer",
+          params: Object,
+          path: "/business/goodsTransfer",
+          query: Object,
+          title: "货转"
+        }
+        this.$router.push({ path: '/index' })
+        this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
+          if (this.isActive(view)) {
+            this.toLastView(visitedViews, view)
+          }
+        })
+        Global.$emit("removeCache", "closeSelectedTag", view);
+      },
+      // 撤销审批
+      backApproval(){
+        let data = {
+          // id:this.form.fId,
+          actId:this.goodsTransferId,
+          billId:this.form.fId
+        }
+        RevocationApproval(data).then(response => {
+          this.msgSuccess("撤销审批成功")
+          this.disappear = true
+          this.open = false
+          this.getList()
+        })
+      },
+      returnData(){
+        this.addOrUpdateVisib = false
+        this.open = false
+        this.homepaGe()
+      },
+      getDataList(){
+        this.addOrUpdateVisible = false
+      },
+      // 查看审批流
+      addOrUpdateHandle(){
+        this.addOrUpdateVisible = true
+        this.addOrUpdateVisib = false
+        let id = '448'
+        let actId = '110'
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(this.form.fId,this.goodsTransferId)
+        })
+      },
       // 上传成功返回数据
       showFile(row) {
         // this.$set(this.relevantAttachments[0], 'fName', row.fileName)
@@ -1913,6 +2069,8 @@
       cancel() {
         this.reset()
         this.open = false
+        this.form = []
+        this.getList()
       },
       // 表单重置
       reset() {
@@ -1957,6 +2115,7 @@
       },
       /** 修改按钮操作 */
       handleUpdate(row, status) {
+        this.notChange = true
         this.browseStatus = status
         this.reset()
         const fId = row.fId || this.ids
@@ -1990,7 +2149,7 @@
           this.userOptions = response.data.sysUser
           this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
           this.open = true
-          this.title = '修改仓入库'
+          this.title = '修改货存转移'
         })
       },
       // 库存明细合计
@@ -2250,6 +2409,7 @@
               this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
               this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
               this.dataList = response.data.warehousebillsitems
+              this.getList()
             })
           }
         })

src/views/warehouseBusiness/outStock/index.vue

@@ -3391,7 +3391,7 @@ export default {
           } else if (!this.dataListSelection[warehouseCr].fQty) {
             this.$message.error("请维护出库件数");
             return false;
-          } else if (this.dataListSelection[warehouseCr].fIsPass == this.releaseList.dictValue !== 'T') {
+          } else if (this.dataListSelection[warehouseCr].fIsPass !== 'T') {
             this.$message.error("请放行才能出库");
             return false;
           }

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -171,7 +171,7 @@
         align="center"
         prop="fBillno"
       />
-      <el-table-column label="客户名称" align="center" prop="fCorpid"/>
+      <el-table-column label="客户名称" align="center" prop="fCorpid" show-overflow-tooltip/>
       <el-table-column
         label="计费日期"
         align="center"
@@ -210,7 +210,7 @@
         label="制单日期"
         align="center"
         prop="createTime"
-        width="180"
+        width="160"
       >
         <template slot-scope="scope">
           {{scope.row.createTime.slice(0, 10)}}
@@ -227,7 +227,6 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.fBillstatus > 3"
             @click="handleUpdate(scope.row, true)"
             v-hasPermi="['warehouseBusiness:warehousebills:edit']"
           >查看
@@ -235,6 +234,15 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-view"
+            @click="check(scope.row,1)"
+            v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+            v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
+          >审批进度</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-edit"
             v-if="scope.row.fBillstatus <= 3"
             @click="handleUpdate(scope.row, false)"
@@ -266,6 +274,7 @@
       :close-on-click-modal="false"
       width="80%"
       append-to-body
+      :show-close="Xbutton"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
@@ -360,6 +369,7 @@
                 size="large"
                 type="date"
                 disabled
+                style="width:200px"
                 value-format="timestamp"
                 placeholder="制单日期"
               >
@@ -544,6 +554,14 @@
           >
           </el-table-column>
           <el-table-column
+            prop="fInventoryDays"
+            header-align="center"
+            align="center"
+            width="140px"
+            label="库存天数"
+          >
+          </el-table-column>
+          <el-table-column
             prop="fAmt"
             header-align="center"
             align="center"
@@ -797,9 +815,12 @@
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="success" prop="取 消" @click="cancel"
-        >取 消
-        </el-button>
+        <el-button type="success" size="small" v-if="form.fBillstatus === '6'">撤销请核</el-button>
+        <el-button v-if="approve === true" @click="goApproval">审批</el-button>
+        <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle">查看审批流</el-button>
+        <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
+        <el-button v-if="cancelButton === false" @click="homePage">取 消</el-button>
+        <el-button type="danger" size="small" :disabled="disappear" v-if="queryParams.fBillstatus === '4'" @click="backApproval">撤销审批</el-button>
         <el-button type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
         <el-button
           :disabled="browseStatus"
@@ -808,6 +829,8 @@
         >请 核</el-button>
       </div>
     </el-dialog>
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
   </div>
 </template>
 
@@ -826,12 +849,28 @@
   import { listFees } from "@/api/basicdata/fees";
   import { listCorps } from "@/api/basicdata/corps";
   import moment from 'moment'
+  import AddOrUpdate from '@/views/viewApproval'
+  import ApprovalComments from '@/views/startApproval'
+  import Global from '@/layout/components/global'
+  import { getCharge } from '@/api/finance/charge'
+  import { RevocationApproval } from '@/api/finance/contrast'
 
   export default {
     name: "StorageFeeCalculation",
-    components: {},
+    components: {
+      AddOrUpdate,
+      ApprovalComments
+    },
     data() {
       return {
+        actId: 150,
+        disappear:false,
+        cancelButton:true,
+        Xbutton:true,
+        approve:false,
+        addOrUpdateVisib: false,
+        addOrUpdateVisible:false,
+        notChange:false,
         // 遮罩层
         loading: true,
         // 选中数组
@@ -945,13 +984,144 @@
         }
       };
     },
+
     created() {
       this.getList();
       this.getDicts("tax_rate").then((response) => {
         this.fTaxrate = response.data[0].dictValue
       });
     },
+    activated(){
+      this.Jump()
+    },
     methods: {
+      // 撤销审批
+      backApproval(){
+        let data = {
+          id:this.form.fId,
+          actId:150,
+          billId:this.form.fId
+        }
+        RevocationApproval(data).then(response => {
+          this.msgSuccess("撤销审批成功")
+          this.disappear = true
+          this.open = false
+          this.getList()
+        })
+      },
+      homepaGe(){
+        let view = {
+          fullPath: "/business/agreement",
+          hash: "",
+          matched: Array(2),
+          meta: Object,
+          name: "Agreement",
+          params: Object,
+          path: "/business/agreement",
+          query: Object,
+          title: "仓储费"
+        }
+        this.$router.push({ path: '/index'})
+        this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
+          if (this.isActive(view)) {
+            this.toLastView(visitedViews, view)
+          }
+        })
+        Global.$emit("removeCache", "closeSelectedTag", view);
+      },
+      Jump(){
+        this.approval = this.$route.query.data
+        if (this.approval){
+          this.Xbutton = false
+          this.approval = JSON.parse(this.approval)
+          // this.hide = false
+          this.notChange = true
+          this.approve = true
+          this.cancelButton = false
+          this.reset()
+          getStorageFeeCalculation(this.approval.billId).then(response => {
+            this.fMblnoOptions = []
+            if (response.data.corps) {
+              this.fMblnoOptions.push(response.data.corps)
+            }
+            if (response.data.warehouse) {
+              this.form = response.data.warehouse
+              this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
+              this.$set(this.form, 'fBillingDeadline', Date.parse(this.form.fBillingDeadline))
+            }
+            if (response.data.warehouseItemsList) {
+              this.dataList = response.data.warehouseItemsList
+              for (let li in this.dataList) {
+                this.$set(this.dataList[li], 'fBsdate', Date.parse(this.dataList[li].fBsdate))
+                this.$set(this.dataList[li], 'fChargedate', Date.parse(this.dataList[li].fChargedate))
+                this.$set(this.dataList[li], 'fBillingDeadline', Date.parse(this.dataList[li].fBillingDeadline))
+                this.$set(this.dataList[li], 'fStorageFeeDeadline', Date.parse(this.dataList[li].fStorageFeeDeadline))
+              }
+              console.log(this.dataList)
+            }
+            if (response.data.warehouseFeesList) {
+              this.warehouseDrList = response.data.warehouseFeesList
+            }
+            if (response.data.goodsList) {
+              this.goodsOptions = response.data.goodsList
+            }
+            if (response.data.feesList) {
+              this.fWbuOptions = response.data.feesList
+            }
+            this.userOptions = response.data.sysUser;
+            this.open = true;
+            this.title = "编辑仓储费计算";
+          });
+
+        }
+      },
+      // 审批按钮
+      goApproval(){
+        this.addOrUpdateVisib = true
+        this.$nextTick(() => {
+          this.$refs.ApprovalComments.init(this.form.fId,this.actId)
+        })
+      },
+      homePage(){
+        this.open = false
+        let view = {
+          fullPath: "/business/agreement",
+          hash: "",
+          matched: Array(2),
+          meta: Object,
+          name: "Agreement",
+          params: Object,
+          path: "/business/agreement",
+          query: Object,
+          title: "仓储费"
+        }
+        this.$router.push({ path: '/index'})
+        this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
+          if (this.isActive(view)) {
+            this.toLastView(visitedViews, view)
+          }
+        })
+        Global.$emit("removeCache", "closeSelectedTag", view);
+      },
+      // 查看审批流
+      addOrUpdateHandle(){
+        this.addOrUpdateVisible = true
+        this.addOrUpdateVisib = false
+        let id = '448'
+        let actId = '110'
+        console.log(this.form.fId)
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(this.form.fId,this.actId)
+        })
+      },
+      returnData(){
+        this.addOrUpdateVisib = false
+        this.open = false
+        this.homepaGe()
+      },
+      getDataList(){
+        this.addOrUpdateVisible = false
+      },
       queryUser() {
         queryUserVal().then((response) => {
           if (response.user !== null) {
@@ -1144,6 +1314,7 @@
       },
       /** 修改按钮操作 */
       handleUpdate(row, status) {
+        this.notChange = true
         this.browseStatus = status;
         this.reset();
         let data = row || this.ids;