浏览代码

财务月度汇总页面调试

liuqiwen 10 小时之前
父节点
当前提交
d7cb6b3a63

+ 36 - 92
jd-logistics-ui-v3/src/views/logistics/adjustmentRecord/index.vue

@@ -19,62 +19,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="费用明细id" prop="waybillCostDetailId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.waybillCostDetailId"-->
-<!--          placeholder="请输入费用明细id"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="原金额" prop="originalAmount">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.originalAmount"-->
-<!--          placeholder="请输入原金额"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="调整后金额" prop="adjustedAmount">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.adjustedAmount"-->
-<!--          placeholder="请输入调整后金额"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="调整金额" prop="adjustmentAmount">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.adjustmentAmount"-->
-<!--          placeholder="请输入调整金额"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="调账原因" prop="adjustmentReason">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.adjustmentReason"-->
-<!--          placeholder="请输入调账原因"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="部门ID" prop="deptId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.deptId"-->
-<!--          placeholder="请输入部门ID"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="用户ID" prop="userId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.userId"-->
-<!--          placeholder="请输入用户ID"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -82,35 +26,35 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['system:adjustmentRecord:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:adjustmentRecord:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:adjustmentRecord:remove']"
-        >删除</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="Plus"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:adjustmentRecord:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="Edit"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['system:adjustmentRecord:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="Delete"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['system:adjustmentRecord:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -124,7 +68,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="adjustmentRecordList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column type="selection" width="55" align="center" />-->
 <!--      <el-table-column label="调账流水id" align="center" prop="financialAdjustId" />-->
       <el-table-column label="运单号" align="center" prop="waybillNo" width="160" />
 <!--      <el-table-column label="费用明细id" align="center" prop="waybillCostDetailId" />-->
@@ -142,12 +86,12 @@
       <el-table-column label="操作人" align="center" prop="userName" />
 <!--      <el-table-column label="部门ID" align="center" prop="deptId" />-->
 <!--      <el-table-column label="用户ID" align="center" prop="userId" />-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:adjustmentRecord:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:adjustmentRecord:remove']">删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">-->
+<!--        <template #default="scope">-->
+<!--          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:adjustmentRecord:edit']">修改</el-button>-->
+<!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:adjustmentRecord:remove']">删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     
     <pagination

+ 11 - 4
jd-logistics-ui-v3/src/views/logistics/monthSummary/index.vue

@@ -103,10 +103,10 @@
       </el-table-column>
       <el-table-column label="供应商" align="center" prop="deptName" />
 <!--      <el-table-column label="用户id" align="center" prop="userId" />-->
-      <el-table-column label="百旺开票单据编号" align="center" prop="bwDjbh" />
-      <el-table-column label="电子发票pdf地址" align="center" prop="bwDzfpPdfUrl" />
-      <el-table-column label="电子发票ofd地址" align="center" prop="bwDzfpOfdUrl" />
-      <el-table-column label="电子发票xml地址" align="center" prop="bwDzfpXmlUrl" />
+<!--      <el-table-column label="百旺开票单据编号" align="center" prop="bwDjbh" />-->
+<!--      <el-table-column label="电子发票pdf地址" align="center" prop="bwDzfpPdfUrl" />-->
+<!--      <el-table-column label="电子发票ofd地址" align="center" prop="bwDzfpOfdUrl" />-->
+<!--      <el-table-column label="电子发票xml地址" align="center" prop="bwDzfpXmlUrl" />-->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="140">
         <template #default="scope">
@@ -114,7 +114,14 @@
               type="text"
               @click="detailClick(scope.row)"
               v-hasPermi="['system:costDetails:list']"
+              v-if="scope.row.status == 1"
           >调账</el-button>
+          <el-button
+              type="text"
+              @click="detailClick(scope.row)"
+              v-hasPermi="['system:costDetails:list']"
+              v-if="scope.row.status == 2"
+          >查看</el-button>
           <el-button link type="primary" @click="handleDuizhang(scope.row)" :disabled="scope.row.status != 1">对账</el-button>
           <el-button link type="primary" @click="handleKaipiao(scope.row)" :disabled="scope.row.status != 2">开票</el-button>
 <!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:monthSummary:remove']">删除</el-button>-->