根据原型图修改页面

Yijia-SaaS/yijia-ui/src/api/dataSource/saleReport.js

@@ -38,5 +38,11 @@ export function listDayReport(query) {
     method: 'get',
     params: query
   })
+}export function getDetails(query) {
+  return request({
+    url: '/station/order/list',
+    method: 'get',
+    params: query
+  })
 }
 

Yijia-SaaS/yijia-ui/src/api/station/gun.js

@@ -8,6 +8,14 @@ export function listGun(query) {
     params: query
   })
 }
+export function selectGun(query) {
+  return request({
+    url: '/station/gun/selectGun',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询油站信息列表
 export function stationinfo() {
   return request({

Yijia-SaaS/yijia-ui/src/views/customer/manage/index.vue

@@ -1,15 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员号" prop="memberId">
-        <el-input
-          v-model="queryParams.memberId"
-          placeholder="请输入会员号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label="客户姓名" prop="customerName">
         <el-input
           v-model="queryParams.customerName"
@@ -19,41 +11,37 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="推荐人" prop="commendMan">
+      <el-form-item label="联系电话" prop="phoneNumber">
         <el-input
-          v-model="queryParams.commendMan"
-          placeholder="请输入推荐人"
+          v-model="queryParams.phoneNumber"
+          placeholder="请输入"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="会员等级" prop="memberGrade">
+      <el-form-item label="车牌号" prop="carNumber">
         <el-input
-          v-model="queryParams.memberGrade"
-          placeholder="请输入会员等级"
+          v-model="queryParams.carNumber"
+          placeholder="请输入车牌号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="手机号" prop="phoneNumber">
+      <el-form-item label="会员等级" prop="memberGrade">
         <el-input
-          v-model="queryParams.phoneNumber"
-          placeholder="请输入手机号"
+          v-model="queryParams.memberGrade"
+          placeholder="请输入会员等级"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="车牌号" prop="carNumber">
-        <el-input
-          v-model="queryParams.carNumber"
-          placeholder="请输入车牌号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="专车类型" prop="specialCarType">
+        <el-select v-model="queryParams.specialCarType" placeholder="请选择专车类型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
       </el-form-item>
       <el-form-item label="油品" prop="oils">
         <el-select
@@ -69,45 +57,21 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="余额" prop="balance">
-        <el-input
-          v-model="queryParams.balance"
-          placeholder="请输入余额"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="积分" prop="integral">
+      <el-form-item label="推荐人" prop="commendMan">
         <el-input
-          v-model="queryParams.integral"
-          placeholder="请输入积分"
+          v-model="queryParams.commendMan"
+          placeholder="请输入推荐人"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="专车类型" prop="specialCarType">
-        <el-select v-model="queryParams.specialCarType" placeholder="请选择专车类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="注册时间" prop="regtime">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.regtime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择注册时间">
-        </el-date-picker>
-      </el-form-item>
-
       <el-form-item label="油站名称" prop="stationId">
         <el-select
           v-model="queryParams.stationId"
           placeholder="请选择油站"
           clearable
           size="small"
-
         >
           <el-option
             v-for="item in stationOptions"
@@ -124,50 +88,8 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['station:manage:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['station:manage:edit']"
-        >修改</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="['station:manage:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['station:manage:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
     <el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="油站名称" align="center" prop="id" v-if="false" />
       <el-table-column label="会员id" align="center" prop="memberId" />
       <el-table-column label="客户姓名" align="center" prop="customerName" />
@@ -194,14 +116,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['station:manage:edit']"
-          >修改</el-button>
+          >编辑</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['station:manage:remove']"
-          >删除</el-button>
+            icon="el-icon-search
+
+"
+            @click=""
+            v-hasPermi="['station:manage:list']"
+          >查询</el-button>
         </template>
       </el-table-column>
     </el-table>

Yijia-SaaS/yijia-ui/src/views/customer/setting/index.vue

@@ -9,6 +9,7 @@
       <el-table-column label="id" align="center" prop="id" v-if="false"/>
       <el-table-column label="等级名称" align="center" prop="grade" />
       <el-table-column label="优惠方式" align="center" prop="discountWay" />
+      <el-table-column label="会员条件" align="center" prop="memberCondit" />
       <el-table-column label="汽油优惠/L" align="center" prop="gasoilDiscountLitre" />
       <el-table-column label="柴油优惠/L" align="center" prop="dieseloilDiscountLitre" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -39,6 +40,9 @@
         <el-form-item label="优惠方式" prop="discountWay">
           <el-input v-model="form.discountWay" placeholder="请输入优惠方式" />
         </el-form-item>
+        <el-form-item label="会员条件" prop="discountWay">
+          <el-input v-model="form.memberCondit" placeholder="请输入优惠方式" />
+        </el-form-item>
         <el-form-item label="汽油优惠/L" prop="gasoilDiscountLitre">
           <el-input v-model="form.gasoilDiscountLitre" placeholder="请输入汽油优惠/L" />
         </el-form-item>
@@ -55,7 +59,7 @@
       </div>
     </el-dialog>
     <!--成长规则-->
-    <p style="margin-left: 5px; margin-top: 25px; margin-bottom: 5px;">
+<!--    <p style="margin-left: 5px; margin-top: 25px; margin-bottom: 5px;">
       <span class="textlineHeader">成长规则</span>
       <el-button icon="el-icon-plus" size="mini" @click="handleAddGrouthRules" class="settingButton">添加成长规则</el-button>
     </p>
@@ -82,7 +86,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <!--添加或修改成长规则-->
+    &lt;!&ndash;添加或修改成长规则&ndash;&gt;
     <el-dialog :title="title" :visible.sync="openGrouthRule" width="500px" append-to-body>
       <el-form ref="formGrouthRule" :model="formGrouthRule" :rules="grouthRules" label-width="100px">
         <el-form-item label="成长规则名称" prop="grouthValueName">
@@ -101,46 +105,7 @@
       </div>
     </el-dialog>
 
-<!--    <el-form ref="ruleForm" :model="ruleForm" inline="true" label-width="110px">-->
-<!--      <el-row>-->
-<!--        <el-col :span="6">-->
-<!--          <el-form-item label="汽油消费"  prop="gasoilConsume">-->
-<!--            <el-input size="small" v-model="ruleForm.gasoilConsume" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--        <el-col :span="6">-->
-<!--          <el-form-item label="获得成长值"  prop="gasoilGrowthValue">-->
-<!--            <el-input size="small" v-model="ruleForm.gasoilGrowthValue" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--      <el-row>-->
-<!--        <el-col :span="6">-->
-<!--          <el-form-item label="柴油消费"  prop="dieseloilConsume">-->
-<!--            <el-input size="small" v-model="ruleForm.dieseloilConsume" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--        <el-col :span="6">-->
-<!--          <el-form-item label="获得成长值"  prop="dieseloilGrowthValue">-->
-<!--            <el-input size="small" v-model="ruleForm.dieseloilGrowthValue" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--      <el-row>-->
-<!--        <el-col :span="6">-->
-<!--          <el-form-item label="会员充值"  prop="memberRecharge">-->
-<!--            <el-input size="small" v-model="ruleForm.memberRecharge" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--        <el-col :span="6">-->
-<!--          <el-form-item label="获得成长值"  prop="payPrintNum">-->
-<!--            <el-input size="small" v-model="ruleForm.memberGrowthValue" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--    </el-form>-->
-
-    <!--动态等级-->
+    &lt;!&ndash;动态等级&ndash;&gt;
     <p style="margin-left: 5px; margin-top: 25px; margin-bottom: 5px;"><span class="textlineHeader">动态等级</span>
       <el-button class="settingButton" icon="el-icon-plus" size="mini" @click="handleAddDT" v-hasPermi="['customer:setting:add']" >添加动态等级</el-button>
     </p>
@@ -176,7 +141,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <!-- 添加或修改动态客户优惠等级设置对话框 -->
+    &lt;!&ndash; 添加或修改动态客户优惠等级设置对话框 &ndash;&gt;
     <el-dialog :title="title" :visible.sync="opendt" width="500px" append-to-body>
       <el-form ref="dtform" :model="dtform" :rules="dtrules" label-width="110px">
         <el-form-item label="等级" prop="grade">
@@ -210,7 +175,7 @@
         <el-button type="primary" @click="submitFormDT">确 定</el-button>
         <el-button @click="cancelDT">取 消</el-button>
       </div>
-    </el-dialog>
+    </el-dialog>-->
   </div>
 </template>
 
@@ -297,8 +262,8 @@ export default {
   },
   created() {
     this.getList();
-    this.getRuleList();
-    this.getList2();
+    //this.getRuleList();
+   // this.getList2();
   },
   methods: {
     /** 查询客户优惠等级设置列表 */

Yijia-SaaS/yijia-ui/src/views/dataSource/dayReport.vue

@@ -7,6 +7,14 @@
           <el-button  size="mini" @click="yesDataSource">昨天</el-button>
           <el-button  size="mini" @click="workDataSource">本周</el-button>
           <el-button  size="mini" @click="monthDataSource">本月</el-button>
+          <el-date-picker
+            v-model="dateRangeCreatedDate"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+          <el-button  size="mini" @click="queryDataSource">查询</el-button>
         </el-form-item>
       </el-form>
       <span  style="color:#ff9955;font-size:25px;" >|</span><span style="font-size:20px;">数据概览</span>
@@ -54,49 +62,60 @@
         </el-col>
       </el-row>
     </div>
-    <div style="width:100%; height: 181px;background: #FFFFFF;">
+    <div style="width:100%; height: 81px;background: #FFFFFF;">
       <span  style="color:#ff9955;font-size:25px;" >|</span><span style="font-size:20px;">销售情况</span>
-
     </div>
     <div style="width:100%; height: 181px;">
       <span  style="color:#ff9955;font-size:25px;" >|</span><span style="font-size:20px;">详情：</span>
       <el-table v-loading="loading" :data="dayReportList">
-        <el-table-column label="日期" align="center" prop="oilGunNo" />
-        <el-table-column label="销额" align="center" prop="oilName" />
-        <el-table-column label="销量（L）" align="center" prop="stationId" v-if="false" />
-        <el-table-column label="汽油" align="center" prop="stationName" />
-        <el-table-column label="柴油" align="center" prop="stationName" />
-        <el-table-column label="订单数" align="center" prop="stationName" />
-        <el-table-column label="营销费" align="center" prop="stationName" />
-        <el-table-column label="应收" align="center" prop="stationName" />
-        <el-table-column label="到账" align="center" prop="stationName" />
+        <el-table-column label="日期" align="center" prop="payDate" >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.payDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="销额" align="center" prop="amt" />
+        <el-table-column label="销量（L）" align="center" prop="orderLiters" v-if="false" />
+        <el-table-column label="汽油" align="center" prop="qyAmt" />
+        <el-table-column label="柴油" align="center" prop="cyAmt" />
+        <el-table-column label="订单数" align="center" prop="orderNo" />
+        <el-table-column label="营销费" align="center" prop="" />
+        <el-table-column label="应收" align="center" prop="menberAmt" />
+        <el-table-column label="到账" align="center" prop="" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['station:gun:edit']"
-            >下载</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['station:gun:remove']"
+              @click="handleLook(scope.row)"
+              v-hasPermi="['station:gun:list']"
             >详情</el-button>
           </template>
         </el-table-column>
       </el-table>
-
     </div>
+    <el-dialog :title="title" :visible.sync="open"  append-to-body>
+      <el-table v-loading="loading" :data="dayReportDetailsList" >
+        <el-table-column label="油品" align="center" prop="oilName" />
+        <el-table-column label="油枪号" align="center" prop="oilGun" />
+        <el-table-column label="销量（L）" align="center" prop="orderLiters"/>
+        <el-table-column label="销额（元）" align="center" prop="amt" />
+        <el-table-column label="优惠" align="center" prop="" v-if="false" />
+        <el-table-column label="优惠卷" align="center" prop="" />
+        <el-table-column label="实收" align="center" prop="" />
+        <el-table-column label="会员支付" align="center" prop="menberAmt" />
+        <el-table-column label="微信支付" align="center" prop="wxAmt" />
+        <el-table-column label="支付宝支付" align="center" prop="zfbAmt" />
+        <el-table-column label="会员充值" align="center" prop="" v-if="false"/>
+        <el-table-column label="积分消费" align="center" prop="" v-if="false"/>
 
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-  import { listSum,listOilType,listDayReport } from "@/api/dataSource/saleReport";
+  import { listSum,listOilType,listDayReport,getDetails } from "@/api/dataSource/saleReport";
 export default {
   name: "source",
   data() {
@@ -115,6 +134,8 @@ export default {
       total: 0,
       // 优惠劵管理表格数据
       couponList: [],
+      dayReportDetailsList: [],
+      dateRangeCreatedDate:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -125,7 +146,8 @@ export default {
         stationNo: null,
         stationName: null,
         beginTime:null,
-        endTime:null
+        endTime:null,
+        payDate:null
       },
       //日报数据
       dayReportList: [],
@@ -148,105 +170,114 @@ export default {
     /** 查询优惠劵管理列表 */
     getList() {
       listSum(this.queryParams).then(response => {
-        if(response.data==="undefined"){
-        }else{
+        if (response.data === "undefined") {
+        } else {
           this.form.zongAmt = response.data.amt;
+          this.form.zongliters = response.data.orderLiters;
         }
       });
       listOilType(this.queryParams).then(response => {
-        if(response.rows==="undefined"){
-        }else{
-          for(let i in response.rows){
-            if(response.rows[i].oilType==="1"){
-              this.form.qyamt=response.rows[i].amt;
-            }else if(response.rows[i].oilType==="2"){
-              this.form.cyamt=response.rows[i].amt;
+        if (response.rows === "undefined") {
+        } else {
+          for (let i in response.rows) {
+            if (response.rows[i].oilType === "1") {
+              this.form.qyamt = response.rows[i].amt;
+            } else if (response.rows[i].oilType === "2") {
+              this.form.cyamt = response.rows[i].amt;
             }
           }
         }
       });
       listDayReport(this.queryParams).then(response => {
-        if(response.rows==="undefined"){
-        }else{
-          this.dayReportList = response.rows;
-        }
+        this.dayReportList = response.rows;
+        this.total = response.total;
+        this.loading = false;
       });
     },
     //本日的数据
-    dayDataSource(){
+    dayDataSource() {
       this.reset();
-      this.queryParams.beginTime=this.getNowFormatDate(new Date());
-      this.queryParams.endTime =this.getEndFormatDate(new Date());
+      this.queryParams.beginTime = this.getNowFormatDate(new Date());
+      this.queryParams.endTime = this.getEndFormatDate(new Date());
       this.getList();
     },
     //昨天的数据
-    yesDataSource(){
+    yesDataSource() {
       this.reset();
-      this.queryParams.beginTime=this.getFormatDate(new Date());
-      this.queryParams.endTime =this.getNowFormatDate(new Date());
+      this.queryParams.beginTime = this.getFormatDate(new Date());
+      this.queryParams.endTime = this.getNowFormatDate(new Date());
       this.getList();
     },
     //本周的数据
-    workDataSource(){
+    workDataSource() {
       this.reset();
-      this.queryParams.beginTime=this.getDates();
-      this.queryParams.endTime =this.getEndFormatDate(new Date());
+      this.queryParams.beginTime = this.getDates();
+      this.queryParams.endTime = this.getEndFormatDate(new Date());
       this.getList();
     },
 
     //本月数据
-    monthDataSource(){
+    monthDataSource() {
       this.reset();
-      this.queryParams.beginTime=this.getMonthDate();
-      this.queryParams.endTime =this.getEndFormatDate(new Date());
+      this.queryParams.beginTime = this.getMonthDate();
+      this.queryParams.endTime = this.getEndFormatDate(new Date());
+      this.getList();
+    },
+
+    //按照指定日期
+    queryDataSource() {
+      this.reset();
+      this.queryParams.beginTime = this.dateRangeCreatedDate[0];
+      this.queryParams.endTime = this.dateRangeCreatedDate[1];
+
       this.getList();
     },
     //今天
-    getNowFormatDate(date){
-      let seperator1="-";
-      let month=date.getMonth()+1;
-      let strDate=date.getDate();
-      if (month>=1&&month<=9){
-        month="0"+month;
+    getNowFormatDate(date) {
+      let seperator1 = "-";
+      let month = date.getMonth() + 1;
+      let strDate = date.getDate();
+      if (month >= 1 && month <= 9) {
+        month = "0" + month;
       }
-      if (strDate>=0&&strDate<=9){
-        strDate="0"+strDate;
+      if (strDate >= 0 && strDate <= 9) {
+        strDate = "0" + strDate;
       }
-      let currentdate=date.getFullYear()+seperator1+month+seperator1+strDate;
+      let currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate;
       return currentdate;
     },
     //明天
-    getEndFormatDate(myDate){
+    getEndFormatDate(myDate) {
       let date = myDate.getDate();
-      date = date +1;
+      date = date + 1;
       myDate.setDate(date);
-      let seperator1="-";
-      let month=myDate.getMonth()+1;
-      let strDate=myDate.getDate();
-      if (month>=1&&month<=9){
-        month="0"+month;
+      let seperator1 = "-";
+      let month = myDate.getMonth() + 1;
+      let strDate = myDate.getDate();
+      if (month >= 1 && month <= 9) {
+        month = "0" + month;
       }
-      if (strDate>=0&&strDate<=9){
-        strDate="0"+strDate;
+      if (strDate >= 0 && strDate <= 9) {
+        strDate = "0" + strDate;
       }
-      let currentdate=myDate.getFullYear()+seperator1+month+seperator1+strDate;
+      let currentdate = myDate.getFullYear() + seperator1 + month + seperator1 + strDate;
       return currentdate;
     },
     //昨天
-    getFormatDate(myDate){
+    getFormatDate(myDate) {
       let date = myDate.getDate();
       date = date - 1;
       myDate.setDate(date);
-      let seperator1="-";
-      let month=myDate.getMonth()+1;
-      let strDate=myDate.getDate();
-      if (month>=1&&month<=9){
-        month="0"+month;
+      let seperator1 = "-";
+      let month = myDate.getMonth() + 1;
+      let strDate = myDate.getDate();
+      if (month >= 1 && month <= 9) {
+        month = "0" + month;
       }
-      if (strDate>=0&&strDate<=9){
-        strDate="0"+strDate;
+      if (strDate >= 0 && strDate <= 9) {
+        strDate = "0" + strDate;
       }
-      let currentdate=myDate.getFullYear()+seperator1+month+seperator1+strDate;
+      let currentdate = myDate.getFullYear() + seperator1 + month + seperator1 + strDate;
       return currentdate;
     },
     getDates() {
@@ -254,24 +285,24 @@ export default {
       var timesStamp = new_Date.getTime();
       var currenDay = new_Date.getDay();
       var dates = new Date(timesStamp + 24 * 60 * 60 * 1000 * (0 - (currenDay + 6) % 7)).toLocaleDateString().replace(/[年月]/g, '-').replace(/[日上下午]/g, '');
-      let s=dates.replace(/-/g,"/");
-      var dt =new Date(s);
-      var m = dt.getMonth()+1;
+      let s = dates.replace(/-/g, "/");
+      var dt = new Date(s);
+      var m = dt.getMonth() + 1;
       var d = dt.getDate();
-      m = m<10?"0"+m:m;
-      d = d<10?"0"+d:d;
-      dates= dt.getFullYear() +"-"+ m+"-" + d
+      m = m < 10 ? "0" + m : m;
+      d = d < 10 ? "0" + d : d;
+      dates = dt.getFullYear() + "-" + m + "-" + d
       return dates;
     },
     //本月第一天
-    getMonthDate(){
-      let date=new Date();
-      let seperator1="-";
-      let month=date.getMonth()+1;
-      if (month>=1&&month<=9){
-        month="0"+month;
+    getMonthDate() {
+      let date = new Date();
+      let seperator1 = "-";
+      let month = date.getMonth() + 1;
+      if (month >= 1 && month <= 9) {
+        month = "0" + month;
       }
-      let currentdate=date.getFullYear()+seperator1+month+seperator1+"01";
+      let currentdate = date.getFullYear() + seperator1 + month + seperator1 + "01";
       return currentdate;
     },
     // 表单重置
@@ -282,14 +313,23 @@ export default {
         stationName: null
       };
       this.form = {
-          zongAmt:0,
-          zongliters:0,
-          qyamt:0,
-          cyamt:0
+        zongAmt: 0,
+        zongliters: 0,
+        qyamt: 0,
+        cyamt: 0
       };
-    }
-  },
+    },
 
+    /** 修改按钮操作 */
+    handleLook(row) {
+      const payDate = row.payDate;
+      getDetails(payDate).then(response => {
+        this.dayReportDetailsList = response.rows;
+        this.open = true;
+        this.title = "";
+      });
+    }
+  }
 
 };
 </script>
@@ -303,22 +343,6 @@ export default {
     flex-direction:column;
 
   }
-  .xiaoliang{
-    background-image: url('../../assets/image/bj-1.png');
-    background-size: 100% 100%;
-  }
-  .xiaoe{
-    background-image: url('../../assets/image/bj-02.png');
-    background-size: 100% 100%;
-  }
-  .qiyou{
-    background-image: url('../../assets/image/bj-3.png');
-    background-size: 100% 100%;
-  }
-  .chaiyou{
-    background-image: url('../../assets/image/bj-4.png');
-    background-size: 100% 100%;
-  }
   .flex-qy{
     display:flex;
     align-items:center;

Yijia-SaaS/yijia-ui/src/views/dataSource/saleReport.vue

@@ -8,6 +8,14 @@
           <el-button  size="mini" @click="yesDataSource">昨天</el-button>
           <el-button  size="mini" @click="workDataSource">本周</el-button>
           <el-button  size="mini" @click="monthDataSource">本月</el-button>
+          <el-date-picker
+            v-model="dateRangeCreatedDate"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+          <el-button  size="mini" @click="queryDataSource">查询</el-button>
         </el-form-item>
       </el-form>
       <el-row :gutter="10" class="panel-group">
@@ -208,6 +216,7 @@ export default {
       total: 0,
       // 优惠劵管理表格数据
       couponList: [],
+      dateRangeCreatedDate:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -257,7 +266,6 @@ export default {
 
       });
       listOilType(this.queryParams).then(response => {
-        console.log("分类汇总数据：",response);
         if(response.rows==="undefined"){
         }else{
           for(let i in response.rows){
@@ -272,10 +280,7 @@ export default {
         }
       });
       listViewData(this.queryParams).then(response => {
-        console.log("response2:",response);
-        console.log("response3:",response.data);
-        if(response.data==="undefined"){
-
+        if(response.data=="undefined"){
         }else{
           this.form.wxAmt = response.data.wxAmt;
           this.form.zfbAmt = response.data.zfbAmt;
@@ -309,7 +314,6 @@ export default {
       this.queryParams.endTime =this.getEndFormatDate(new Date());
       this.getList();
     },
-
     //本月数据
     monthDataSource(){
       this.reset();
@@ -317,6 +321,13 @@ export default {
       this.queryParams.endTime =this.getEndFormatDate(new Date());
       this.getList();
     },
+    //按照指定日期
+    queryDataSource(){
+      this.reset();
+      this.queryParams.beginTime =this.dateRangeCreatedDate[0];
+      this.queryParams.endTime = this.dateRangeCreatedDate[1];
+      this.getList();
+    },
     //今天
     getNowFormatDate(date){
       let seperator1="-";

Yijia-SaaS/yijia-ui/src/views/station/adjust/index.vue

@@ -1,164 +1,15 @@
-<template>
+ <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="油品名称" prop="oilName">
-        <el-input
-          v-model="queryParams.oilName"
-          placeholder="请输入油品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调整价格" prop="oilAdjustPrice">
-        <el-input
-          v-model="queryParams.oilAdjustPrice"
-          placeholder="请输入油品调整价格"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="生效状态" prop="takeEffectStatus">
-        <el-select v-model="queryParams.takeEffectStatus" placeholder="请选择生效状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="生效时间" prop="takeEffectDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.takeEffectDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择生效时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="调价时间" prop="adjustDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.adjustDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择调价时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="油站id" v-show="false" prop="stationId">
-        <el-input
-          v-model="queryParams.stationId"
-          placeholder="请输入油站id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油站名称" prop="stationId" >
-        <el-select
-          v-model="queryParams.stationId"
-          placeholder="请选择油站"
-          clearable
-          size="small"
-          @change="onInstitutionChang"
-        >
-          <el-option
-            v-for="item in stationOptions"
-            :key="item.stationId"
-            :label="item.stationName"
-            :value="item.stationId"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="操作员" prop="operator">
-        <el-input
-          v-model="queryParams.operator"
-          placeholder="请输入操作员"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['station:adjust:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['station:adjust:edit']"
-        >修改</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="['station:adjust:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['station:adjust:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="adjustList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="调价自增主键id" v-if="getHiddenColumns" align="center" prop="adjustPriceId" />
+    <el-table v-loading="loading" :data="adjustList">
+      <el-table-column label="调价自增主键id" v-if="false" align="center" prop="adjustPriceId" />
       <el-table-column label="油品名称" align="center" prop="oilName" />
       <el-table-column label="调整价格" align="center" prop="oilAdjustPrice" />
-      <el-table-column label="生效状态" align="center" prop="takeEffectStatus" />
-      <el-table-column label="生效时间" align="center" prop="takeEffectDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.takeEffectDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="调价时间" align="center" prop="adjustDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.adjustDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="油站id" v-show="false" align="center" prop="stationId" />
+      <el-table-column label="生效状态" align="center" prop="takeEffectStatus"  :formatter="statusFormat" />
+      <el-table-column label="生效时间" align="center" prop="takeEffectDate" width="180"/>
+      <el-table-column label="调价时间" align="center" prop="adjustDate" width="180"/>
+      <el-table-column label="油站id" v-if="false" align="center" prop="stationId" />
       <el-table-column label="油站名称" align="center" prop="stationName" />
       <el-table-column label="操作员" align="center" prop="operator" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['station:adjust:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['station:adjust:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
     </el-table>
 
     <pagination
@@ -169,70 +20,12 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改油品调价信息对话框 -->
-    <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="oilName">
-          <el-input v-model="form.oilName" placeholder="请输入油品名称" />
-        </el-form-item>
-        <el-form-item label="调整价格" prop="oilAdjustPrice">
-          <el-input v-model="form.oilAdjustPrice" placeholder="请输入油品调整价格" />
-        </el-form-item>
-        <el-form-item label="生效状态">
-          <el-radio-group v-model="form.takeEffectStatus">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="生效时间" prop="takeEffectDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.takeEffectDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择生效时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="调价时间" prop="adjustDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.adjustDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择调价时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="油站id" v-show="false" prop="stationId">
-          <el-input v-model="form.stationId" placeholder="请输入油站id" />
-        </el-form-item>
 
-        <el-form-item label="油站名称" prop="stationId" >
-          <el-select
-            v-model="form.stationId"
-            placeholder="请选择油站"
-            clearable
-            size="small"
-            @change="onInstitutionChang"
-          >
-            <el-option
-              v-for="item in stationOptions"
-              :key="item.stationId"
-              :label="item.stationName"
-              :value="item.stationId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="操作员" prop="operator">
-          <el-input v-model="form.operator" placeholder="请输入操作员" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listAdjust, getAdjust, delAdjust, addAdjust, updateAdjust, exportAdjust } from "@/api/station/adjust";
+import { listAdjust } from "@/api/station/adjust";
 import {stationinfo} from "@/api/station/gun";
 
 export default {
@@ -253,6 +46,8 @@ export default {
       total: 0,
       // 油品调价信息表格数据
       adjustList: [],
+      oilNameOptions: [],
+      takeEffectStatusOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -283,6 +78,10 @@ export default {
     stationinfo().then(response => {
       this.stationOptions = response.rows;
     });
+    this.getDicts("take_effect_status").then(response => {
+      this.takeEffectStatusOptions = response.data;
+    });
+
   },
   methods: {
     /** 查询油品调价信息列表 */
@@ -294,111 +93,9 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        adjustPriceId: null,
-        oilName: null,
-        oilAdjustPrice: null,
-        takeEffectStatus: "0",
-        takeEffectDate: null,
-        adjustDate: null,
-        stationId: null,
-        stationName: null,
-        operator: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.adjustPriceId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加油品调价信息";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const adjustPriceId = row.adjustPriceId || this.ids
-      getAdjust(adjustPriceId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改油品调价信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.adjustPriceId != null) {
-            updateAdjust(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addAdjust(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    onInstitutionChang(e){
-      let obj = {};
-      obj = this.stationOptions.find((item)=>{//这里的userList就是上面遍历的数据源
-        return item.stationId === e;//筛选出匹配数据
-      })
-      this.form.stationName=obj.stationName;
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const adjustPriceIds = row.adjustPriceId || this.ids;
-      this.$confirm('是否确认删除油品调价信息编号为"' + adjustPriceIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delAdjust(adjustPriceIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有油品调价信息数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportAdjust(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+    // 菜单状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.takeEffectStatusOptions, row.takeEffectStatus);
     }
   }
 };

Yijia-SaaS/yijia-ui/src/views/station/gun/index.vue

@@ -1,24 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="油枪号" prop="oilGunNo">
-        <el-input
-          v-model="queryParams.oilGunNo"
-          placeholder="请输入油枪号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油品名称" prop="oilName">
-        <el-input
-          v-model="queryParams.oilName"
-          placeholder="请输入油品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="油站名称" prop="stationId">
           <el-select
             v-model="queryParams.stationId"
@@ -34,81 +16,19 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="操作时间" prop="date">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.date"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择操作时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="油枪状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择油枪状态"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="item in statusOptions"
-            :key="item.dictValue"
-            :label="item.dictLabel"
-            :value="item.dictValue"
-          ></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['station:gun:add']">新增</el-button>
+        <el-button icon="el-icon-delete" size="mini" @click="handleDelete" :disabled="multiple" v-hasPermi="['station:gun:remove']">删除</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['station:gun:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['station:gun:edit']"
-        >修改</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="['station:gun:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['station:gun:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="gunList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="油枪主键自增id" v-if="false" align="center" prop="oilGunId" />
       <el-table-column label="油枪号" align="center" prop="oilGunNo" />
       <el-table-column label="油品名称" align="center" prop="oilName" />
+      <el-table-column label="单价" align="center" prop="oilPrice" />
       <el-table-column label="油站id" align="center" prop="stationId" v-if="false" />
       <el-table-column label="油站名称" align="center" prop="stationName" />
       <el-table-column label="操作时间" align="center" prop="date" width="180">
@@ -154,6 +74,9 @@
         <el-form-item label="油品名称" prop="oilName">
           <el-input v-model="form.oilName" placeholder="请输入油品名称" />
         </el-form-item>
+        <el-form-item label="单价" prop="oilPrice">
+          <el-input v-model="form.oilPrice" placeholder="请输入单价" />
+        </el-form-item>
         <el-form-item label="油站名称" prop="stationId" >
             <el-select
               v-model="form.stationId"
@@ -173,14 +96,6 @@
         <el-form-item v-show="false" label="油站名称" prop="stationName">
           <el-input v-model="form.stationName"  placeholder="请输入油站名称" />
         </el-form-item>
-        <el-form-item label="操作时间" prop="date">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.date"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择操作时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="油枪状态">
           <el-radio-group v-model="form.status">
             <el-radio

Yijia-SaaS/yijia-ui/src/views/station/info/index.vue

@@ -1,135 +1,5 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="油站名称" prop="stationName">
-        <el-input
-          v-model="queryParams.stationName"
-          placeholder="请输入油站名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油站地址" prop="stationAddress">
-        <el-input
-          v-model="queryParams.stationAddress"
-          placeholder="请输入油站地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油枪数量" prop="oilGunNum">
-        <el-input
-          v-model="queryParams.oilGunNum"
-          placeholder="请输入油枪数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系人" prop="contacts">
-        <el-input
-          v-model="queryParams.contacts"
-          placeholder="请输入联系人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="电话" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="请输入电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="集团名称" prop="stationGroupName">
-        <el-input
-          v-model="queryParams.stationGroupName"
-          placeholder="请输入集团名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油站经度" prop="stationLongitude">
-        <el-input
-          v-model="queryParams.stationLongitude"
-          placeholder="请输入油站经度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油站纬度" prop="stationLatitude">
-        <el-input
-          v-model="queryParams.stationLatitude"
-          placeholder="请输入油站纬度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="商户编码" prop="mno">
-        <el-input
-          v-model="queryParams.mno"
-          placeholder="请输入商户编码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['station:info:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['station:info:edit']"
-        >修改</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="['station:info:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['station:info:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column v-if="false" label="自增主键id" align="center"  prop="stationId" />
@@ -153,13 +23,6 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['station:info:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['station:info:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -202,20 +65,20 @@
         <el-form-item label="电话" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入电话" />
         </el-form-item>
-        <el-form-item v-show="false" label="集团id" prop="stationGroupId" >
+        <el-form-item v-show="false" label="集团id" :disabled="true" prop="stationGroupId" >
           <el-input v-model="form.stationGroupId" placeholder="请输入所属集团id" />
         </el-form-item>
         <el-form-item label="集团名称" prop="stationGroupName">
-          <el-input v-model="form.stationGroupName" placeholder="请输入所属集团名称" />
+          <el-input v-model="form.stationGroupName" :disabled="true" placeholder="请输入所属集团名称" />
         </el-form-item>
         <el-form-item label="油站经度" prop="stationLongitude">
-          <el-input v-model="form.stationLongitude" placeholder="请输入油站经度" />
+          <el-input v-model="form.stationLongitude" :disabled="true" placeholder="请输入油站经度" />
         </el-form-item>
         <el-form-item label="油站纬度" prop="stationLatitude">
-          <el-input v-model="form.stationLatitude" placeholder="请输入油站纬度" />
+          <el-input v-model="form.stationLatitude"  :disabled="true" placeholder="请输入油站纬度" />
         </el-form-item>
         <el-form-item label="商户编码" prop="mno">
-          <el-input v-model="form.mno" placeholder="请输入商户编码" />
+          <el-input v-model="form.mno" :disabled="true"  placeholder="请输入商户编码" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

Yijia-SaaS/yijia-ui/src/views/station/manage/index.vue

@@ -1,42 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
-      <el-form-item label="设备编号" prop="deviceNo">
-        <el-input
-          v-model="queryParams.deviceNo"
-          placeholder="请输入设备编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备名称" prop="deviceName">
-        <el-input
-          v-model="queryParams.deviceName"
-          placeholder="请输入设备名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备名称" prop="stationId">
-        <el-input
-          v-model="queryParams.stationId"
-          placeholder="请输入设备名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油站名称" prop="stationName">
-        <el-input
-          v-model="queryParams.stationName"
-          placeholder="请输入油站名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="设备类型" prop="deviceType">
         <el-select v-model="queryParams.deviceType" multiple placeholder="请选择">
           <el-option
@@ -47,16 +11,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="设备状态" prop="deviceStatus">
-        <el-select v-model="queryParams.deviceStatus" multiple placeholder="请选择">
-          <el-option
-            v-for="dict in deviceStatusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          ></el-option>
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="设备序列号" prop="deviceSerialNum">
         <el-input
           v-model="queryParams.deviceSerialNum"
@@ -66,85 +21,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="绑定油枪号" prop="gunNo">
-        <el-input
-          v-model="queryParams.gunNo"
-          placeholder="请输入绑定油枪号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 
-      <el-form-item label="设备厂家" prop="deviceFactory">
-        <el-input
-          v-model="queryParams.deviceFactory"
-          placeholder="请输入设备厂家"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['station:manage:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['station:manage:edit']"
-        >修改</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="['station:manage:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['station:manage:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键自增id" v-if="false" align="center" prop="deviceId" />
-      <el-table-column label="设备编号" align="center" prop="deviceNo" />
-      <el-table-column label="设备名称" align="center" prop="deviceName" />
-      <el-table-column label="设备名称" align="center" prop="stationId" />
       <el-table-column label="油站名称" align="center" prop="stationName" />
-      <el-table-column label="设备类型" align="center" prop="deviceType" />
       <el-table-column label="设备序列号" align="center" prop="deviceSerialNum" />
+      <el-table-column label="设备厂家" align="center" prop="deviceFactory" />
+      <el-table-column label="油站名称id" v-if="false" align="center" prop="stationId" />
       <el-table-column label="绑定油枪号" align="center" prop="gunNo" />
       <el-table-column label="设备状态" align="center" prop="deviceStatus" />
-      <el-table-column label="设备厂家" align="center" prop="deviceFactory" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -153,6 +45,13 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['station:manage:edit']"
+          >停用</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['station:manage:edit']"
           >修改</el-button>
           <el-button
             size="mini"
@@ -182,7 +81,7 @@
         <el-form-item label="设备名称" prop="deviceName">
           <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
         </el-form-item>
-        <el-form-item label="设备名称" prop="stationId">
+        <el-form-item label="设备名称" v-show="false" prop="stationId">
           <el-input v-model="form.stationId" placeholder="请输入设备名称" />
         </el-form-item>
         <el-form-item label="油站名称" prop="stationName">
@@ -202,7 +101,15 @@
           <el-input v-model="form.deviceSerialNum" placeholder="请输入设备序列号" />
         </el-form-item>
         <el-form-item label="绑定油枪号" prop="gunNo">
-          <el-input v-model="form.gunNo" placeholder="请输入绑定油枪号" />
+          <el-checkbox-group v-model="form.gunNo">
+            <el-checkbox
+              v-for = "item in checkList"
+              :key="item.oilGunNo"
+              :label="item.oilGunId"
+              :value="item.oilGunNo"
+              >
+            </el-checkbox>
+          </el-checkbox-group>
         </el-form-item>
         <el-form-item label="设备状态" prop="deviceStatus">
           <el-select v-model="form.deviceStatus" multiple placeholder="请选择">
@@ -228,6 +135,7 @@
 
 <script>
 import { listManage, getManage, delManage, addManage, updateManage, exportManage } from "@/api/station/manage";
+import{selectGun} from "@/api/station/gun";
 
 export default {
   name: "Manage",
@@ -247,6 +155,8 @@ export default {
       total: 0,
       // 油站设备管理表格数据
       manageList: [],
+      //油枪复选
+      checkList: [],
       //设备状态
       deviceStatusOptions:[],
       //设备类型
@@ -269,6 +179,7 @@ export default {
         deviceStatus: null,
         deviceFactory: null
       },
+
       // 表单参数
       form: {},
       // 表单校验
@@ -286,7 +197,14 @@ export default {
     this.getDicts("device_type").then(response => {
       this.deviceTypeOptions = response.data;
     });
-
+    query:{
+      stationId: null
+    };
+    query.stationId=this.$store.state.user.stationId;
+    //获取油枪
+    selectGun(query).then(response => {
+      this.checkList = response.rows;
+    });
   },
   methods: {
     /** 查询油站设备管理列表 */

Yijia-SaaS/yijia-ui/src/views/station/order/index.vue

@@ -1,7 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="订单号" prop="orderNo">
+
+      <el-form-item label="客户姓名" prop="consumer">
+        <el-input
+          v-model="queryParams.consumer"
+          placeholder="请输入客户姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="orderNo">
         <el-input
           v-model="queryParams.orderNo"
           placeholder="请输入订单号"
@@ -10,10 +20,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="加油枪号" prop="oilGun">
+      <el-form-item label="车牌号" prop="orderNo">
         <el-input
-          v-model="queryParams.oilGun"
-          placeholder="请输入加油枪号"
+          v-model="queryParams.orderNo"
+          placeholder="请输入订单号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -28,11 +38,19 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-      <el-form-item label="消费者" prop="consumer">
+      <el-form-item label="加油员" prop="oilPersonnel">
         <el-input
-          v-model="queryParams.consumer"
-          placeholder="请输入消费者"
+          v-model="queryParams.oilPersonnel"
+          placeholder="请输入加油员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="油枪" prop="oilGun">
+        <el-input
+          v-model="queryParams.oilGun"
+          placeholder="请输入油枪"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -53,68 +71,6 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="支付状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-          <el-option
-            v-for="dict in payStatusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="加油升数" prop="orderLiters">
-        <el-input
-          v-model="queryParams.orderLiters"
-          placeholder="请输入加油升数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="支付类型" prop="payType">
-        <el-select v-model="queryParams.payType" placeholder="请选择支付类型" clearable size="small">
-          <el-option
-            v-for="dict in payTypeOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="支付方式" prop="payWay">
-        <el-select v-model="queryParams.payWay" placeholder="请选择支付类型" clearable size="small">
-          <el-option
-            v-for="dict in payWayOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="加油员" prop="oilPersonnel">
-        <el-input
-          v-model="queryParams.oilPersonnel"
-          placeholder="请输入加油员"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单类型" prop="orderType">
-        <el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="油站名称" prop="stationName">
-        <el-input
-          v-model="queryParams.stationName"
-          placeholder="请输入油站名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="创建时间" prop="createdDate">
         <el-date-picker style="width: 350px"
                         v-model="dateRangeCreatedDate" size="mini" value-format="yyyy-MM-dd HH:mm:ss"
@@ -127,100 +83,38 @@
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-download" size="mini" @click="handleExport"  v-hasPermi="['station:order:export']">导出</el-button>
       </el-form-item>
     </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="primary"-->
-      <!--          icon="el-icon-plus"-->
-      <!--          size="mini"-->
-      <!--          @click="handleAdd"-->
-      <!--          v-hasPermi="['station:order:add']"-->
-      <!--        >新增</el-button>-->
-      <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="success"-->
-      <!--          icon="el-icon-edit"-->
-      <!--          size="mini"-->
-      <!--          :disabled="single"-->
-      <!--          @click="handleUpdate"-->
-      <!--          v-hasPermi="['station:order:edit']"-->
-      <!--        >修改</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="['station:order:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['station:order:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column v-if="false" label="订单id" align="center" prop="orderId" />
       <el-table-column label="订单号"  width="200" align="center" prop="orderNo" />
-      <el-table-column label="消费者" width="120" align="center" prop="consumer" />
-      <el-table-column label="加油枪号" align="center" prop="oilGun" />
       <el-table-column label="油品名称" align="center" prop="oilName" />
       <el-table-column label="油品价格" align="center" prop="oilPirce" />
-      <el-table-column label="油站名称" width="120" align="center" prop="stationName" />
-      <el-table-column v-if="false" label="用户id(消费者)" align="center" prop="consumerId" />
-      <el-table-column label="金额" align="center" prop="amt" />
       <el-table-column label="加油升数" align="center" prop="orderLiters" />
+      <el-table-column label="金额" align="center" prop="amt" />
+      <el-table-column label="消费者" width="120" align="center" prop="consumer" />
+      <el-table-column label="加油员" width="120" align="center" prop="oilPersonnel" />
+      <el-table-column label="加油枪号" align="center" prop="oilGun" />
+      <el-table-column label="支付类型" align="center" prop="payType" :formatter="payTypeFotmat"/>
+      <el-table-column label="油站名称" width="120" align="center" v-if="false" prop="stationName" />
+      <el-table-column v-if="false" label="用户id(消费者)" align="center" prop="consumerId" />
       <el-table-column v-if="false" label="油站id" align="center" prop="stationId" />
       <el-table-column label="状态" align="center" prop="status" :formatter="statusFotmat"/>
-      <el-table-column label="支付类型" align="center" prop="payType" :formatter="payTypeFotmat"/>
+
       <el-table-column label="支付方式" align="center" prop="payWay" :formatter="payWayFotmat"/>
-      <el-table-column label="订单类型" align="center" prop="orderType" />
-      <el-table-column label="加油员" width="120" align="center" prop="oilPersonnel" />
-      <el-table-column label="创建时间" align="center" prop="createdDate" width="150">
+      <el-table-column label="支付时间" align="center" prop="payDate" width="150">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.payDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <!--      <el-table-column label="支付时间" align="center" prop="payDate" width="150">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <span>{{ parseTime(scope.row.payDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
-      <el-table-column label="订单类型" align="center" prop="orderType" v-if="false" />
-      <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
+      <el-table-column label="创建时间" align="center" prop="createdDate" width="150">
         <template slot-scope="scope">
-          <!--          <el-button-->
-          <!--            size="mini"-->
-          <!--            type="text"-->
-          <!--            icon="el-icon-edit"-->
-          <!--            @click="handleUpdate(scope.row)"-->
-          <!--            v-hasPermi="['station:order:edit']"-->
-          <!--          >修改</el-button>-->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['station:order:remove']"
-          >删除</el-button>
+          <span>{{ parseTime(scope.row.createdDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="订单类型" align="center" prop="orderType" v-if="false" />
     </el-table>
-
     <pagination
       v-show="total>0"
       :total="total"
@@ -228,128 +122,17 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改订单支付对话框 -->
-    <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="orderNo">
-          <el-input v-model="form.orderNo" placeholder="请输入订单号" />
-        </el-form-item>
-        <el-form-item label="加油枪号" prop="oilGun">
-          <el-input v-model="form.oilGun" placeholder="请输入加油枪号" />
-        </el-form-item>
-        <el-form-item label="油品名称" prop="oilName">
-          <el-input v-model="form.oilName" placeholder="请输入油品名称" />
-        </el-form-item>
-        <el-form-item label="用户id(消费者)" prop="consumerId">
-          <el-input v-model="form.consumerId" placeholder="请输入用户id(消费者)" />
-        </el-form-item>
-        <el-form-item label="消费者" prop="consumer">
-          <el-input v-model="form.consumer" placeholder="请输入消费者" />
-        </el-form-item>
-        <el-form-item label="金额" prop="amt">
-          <el-input v-model="form.amt" placeholder="请输入金额" />
-        </el-form-item>
-        <el-form-item label="油站名称" prop="stationId" >
-          <el-select
-            v-model="form.stationId"
-            placeholder="请选择油站"
-            clearable
-            size="small"
-            @change="onInstitutionChang"
-          >
-            <el-option
-              v-for="item in stationOptions"
-              :key="item.stationId"
-              :label="item.stationName"
-              :value="item.stationId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item v-show="false" label="油站名称" prop="stationName">
-          <el-input v-model="form.stationName"  placeholder="请输入油站名称" />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-          <el-select v-model="form.status" placeholder="请选择支付类型：随行付：sxf">
-            <el-option
-              v-for="dict in payStatusOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="加油升数" prop="orderLiters">
-          <el-input v-model="form.orderLiters" placeholder="请输入加油升数" />
-        </el-form-item>
-        <el-form-item label="支付类型" prop="payType">
-          <el-select v-model="form.payType" placeholder="请选择支付类型：随行付：sxf">
-            <el-option
-              v-for="dict in payTypeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-
-        </el-form-item>
-        <el-form-item label="支付方式" prop="payWay">
-          <el-select v-model="form.payWay" multiple placeholder="请选择">
-            <el-option
-              v-for="dict in payWayOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-
-        </el-form-item>
-        <el-form-item label="支付时间" prop="payDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.payDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择支付时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="加油员" prop="oilPersonnel">
-          <el-input v-model="form.oilPersonnel" placeholder="请输入加油员" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.createdDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="订单类型" prop="orderType">
-          <el-select v-model="form.orderType" placeholder="请选择订单类型">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
-
 <script>
-  import { listOrder, getOrder, delOrder, addOrder, updateOrder, exportOrder } from "@/api/station/order";
+  import { listOrder, exportOrder } from "@/api/station/order";
   import {stationinfo} from "@/api/station/gun";
 
   export default {
     name: "Order",
     data() {
       return {
-
-        //创建订单时间间隔
+         //创建订单时间间隔
         dateRangeCreatedDate:[],
         // 遮罩层
         loading: true,
@@ -507,62 +290,7 @@
         this.resetForm("queryForm");
         this.handleQuery();
       },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.orderId)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加订单支付";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const orderId = row.orderId || this.ids
-        getOrder(orderId).then(response => {
-          this.form = response.data;
-          this.open = true;
-          this.title = "修改订单支付";
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.orderId != null) {
-              updateOrder(this.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              addOrder(this.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const orderIds = row.orderId || this.ids;
-        this.$confirm('是否确认删除订单支付编号为"' + orderIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delOrder(orderIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-      },
+
       /** 导出按钮操作 */
       handleExport() {
         const queryParams = this.queryParams;

Yijia-SaaS/yijia-ui/src/views/station/price/index.vue

@@ -1,121 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="油品名称" prop="oilName">
-        <el-input
-          v-model="queryParams.oilName"
-          placeholder="请输入油品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油品价格" prop="oilPrice">
-        <el-input
-          v-model="queryParams.oilPrice"
-          placeholder="请输入油品价格"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 
-      <el-form-item label="油站名称" prop="stationId">
-        <el-select
-          v-model="queryParams.stationId"
-          placeholder="请选择油站"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="item in stationOptions"
-            :key="item.stationId"
-            :label="item.stationName"
-            :value="item.stationId"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="操作时间" prop="date">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.date"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择操作时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="cyan" icon="el-icon-plus" size="mini" @click="handleAdd">添加油品</el-button>
+        <el-button icon="el-icon-edit" size="mini"  @click="handleAddAdjust"  v-hasPermi="['station:adjust:add']">调价</el-button>
       </el-form-item>
     </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['station:price:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['station:price:edit']"
-        >修改</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="['station:price:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['station:price:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="priceList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="priceList" >
       <el-table-column label="油品价格id" v-if="false" align="center" prop="oilPriceId" />
       <el-table-column label="油品名称" align="center" prop="oilName" />
       <el-table-column label="油品价格" align="center" prop="oilPrice" />
       <el-table-column label="油站id" v-if="false" align="center" prop="stationId" />
       <el-table-column label="油站名称" align="center" prop="stationNanme" />
-      <el-table-column label="操作时间" align="center" prop="date" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="操作时间" align="center" prop="date" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['station:price:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['station:price:remove']"
@@ -136,7 +39,14 @@
     <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="oilName">
-          <el-input v-model="form.oilName" placeholder="请输入油品名称" />
+          <el-select v-model="form.oilName" placeholder="油品名称" clearable size="small">
+            <el-option
+              v-for="dict in oilNameOptions"
+              :key="dict.dictLabel"
+              :label="dict.dictLabel"
+              :value="dict.dictLabel"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="油品价格" prop="oilPrice">
           <el-input v-model="form.oilPrice" placeholder="请输入油品价格" />
@@ -157,13 +67,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="操作时间" prop="date">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.date"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择操作时间">
-          </el-date-picker>
+        <el-form-item label="油站名称" v-show="false" prop="stationNanme">
+          <el-input v-model="form.stationNanme" placeholder="请输入油站名称" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -171,13 +76,73 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 添加或修改油品调价信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open1" width="500px" append-to-body>
+      <el-form ref="form1" :model="form1"  label-width="80px">
+        <el-form-item label="油品名称" prop="oilName">
+<!--          <el-input v-model="form1.oilName" placeholder="请输入油品名称" />-->
+          <el-select v-model="form1.oilName" placeholder="油品名称" clearable size="small">
+            <el-option
+              v-for="dict in oilNameOptions"
+              :key="dict.dictLabel"
+              :label="dict.dictLabel"
+              :value="dict.dictLabel"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="调整价格" prop="oilAdjustPrice">
+          <el-input v-model="form1.oilAdjustPrice" placeholder="请输入油品调整价格" />
+        </el-form-item>
+        <el-form-item label="生效状态">
+          <el-radio-group v-model="form1.takeEffectStatus">
+            <el-radio v-for="dict in takeEffectStatusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="生效时间" prop="takeEffectDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form1.takeEffectDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择生效时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="油站名称"  prop="stationId">
+          <el-select
+            v-model="form1.stationId"
+            placeholder="请选择油站"
+            clearable
+            size="small"
+            @change="onInstitutionChang1"
+          >
+            <el-option
+              v-for="item in stationOptions"
+              :key="item.stationId"
+              :label="item.stationName"
+              :value="item.stationId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="油站id" v-show="false" prop="stationId" >
+          <el-input v-model="form1.stationId" placeholder="请输入油站id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormAdjust">确 定</el-button>
+        <el-button @click="cancelAdjust">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listPrice, getPrice, delPrice, addPrice, updatePrice, exportPrice } from "@/api/station/price";
+import { listPrice, delPrice, addPrice, updatePrice, exportPrice } from "@/api/station/price";
 import {stationinfo} from "@/api/station/gun";
-
+import {  addAdjust, updateAdjust } from "@/api/station/adjust";
 export default {
   name: "Price",
   data() {
@@ -196,10 +161,14 @@ export default {
       total: 0,
       // 油品价格表格数据
       priceList: [],
+      takeEffectStatusOptions: [],
+      oilNameOptions: [],
       // 弹出层标题
       title: "",
+      titleAdjust: "",
       // 是否显示弹出层
       open: false,
+      open1: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -213,6 +182,7 @@ export default {
       stationOptions:[],
       // 表单参数
       form: {},
+      form1: {},
       // 表单校验
       rules: {
       }
@@ -223,6 +193,12 @@ export default {
     stationinfo().then(response => {
       this.stationOptions = response.rows;
     });
+    this.getDicts("take_effect_status").then(response => {
+      this.takeEffectStatusOptions = response.data;
+    });
+    this.getDicts("oil_name").then(response => {
+      this.oilNameOptions = response.data;
+    });
   },
   methods: {
     /** 查询油品价格列表 */
@@ -261,28 +237,14 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.oilPriceId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
+
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
       this.title = "添加油品价格";
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const oilPriceId = row.oilPriceId || this.ids
-      getPrice(oilPriceId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改油品价格";
-      });
-    },
+
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -303,6 +265,50 @@ export default {
         }
       });
     },
+    handleAddAdjust() {
+      this.resetAdjust();
+      this.open1= true;
+      this.titleAdjust = "添加油品调价信息";
+    },
+    // 表单重置
+    resetAdjust() {
+      this.form1 = {
+        adjustPriceId: null,
+        oilName: null,
+        oilAdjustPrice: null,
+        takeEffectStatus: null,
+        takeEffectDate: null,
+        adjustDate: null,
+        stationId: null,
+        stationName: null,
+        operator: null
+      };
+      this.resetForm("form1");
+    },
+    // 取消按钮
+    cancelAdjust() {
+      this.open1 = false;
+      this.resetAdjust();
+    },
+    submitFormAdjust() {
+      this.$refs["form1"].validate(valid => {
+        if (valid) {
+          if (this.form1.adjustPriceId != null) {
+            updateAdjust(this.form1).then(response => {
+              this.msgSuccess("修改成功");
+              this.open1 = false;
+              this.getList();
+            });
+          } else {
+            addAdjust(this.form1).then(response => {
+              this.msgSuccess("新增成功");
+              this.open1 = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const oilPriceIds = row.oilPriceId || this.ids;
@@ -322,7 +328,14 @@ export default {
       obj = this.stationOptions.find((item)=>{//这里的userList就是上面遍历的数据源
         return item.stationId === e;//筛选出匹配数据
       })
-      this.form.stationName=obj.stationName;
+      this.form.stationNanme=obj.stationName;
+    },
+    onInstitutionChang1(e){
+      let obj = {};
+      obj = this.stationOptions.find((item)=>{//这里的userList就是上面遍历的数据源
+        return item.stationId === e;//筛选出匹配数据
+      })
+      this.form1.stationName=obj.stationName;
     },
     /** 导出按钮操作 */
     handleExport() {

Yijia-SaaS/yijia-ui/src/views/station/summary/index.vue

@@ -10,20 +10,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="班次开始时间" prop="startDate">
+      <el-form-item label="开始时间" prop="startDate">
         <el-date-picker clearable size="small" style="width: 200px"
           v-model="queryParams.startDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择班次开始时间">
+          placeholder="选择开始时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="班次结束时间" prop="endDate">
+      <el-form-item label="结束时间" prop="endDate">
         <el-date-picker clearable size="small" style="width: 200px"
           v-model="queryParams.endDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择班次结束时间">
+          placeholder="选择结束时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="油站名称" prop="stationName">
@@ -35,24 +35,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单数" prop="orderNum">
-        <el-input
-          v-model="queryParams.orderNum"
-          placeholder="请输入订单数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="小票数量" prop="printNum">
-        <el-input
-          v-model="queryParams.printNum"
-          placeholder="请输入小票数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="班结人" prop="classesMan">
         <el-input
           v-model="queryParams.classesMan"
@@ -91,24 +73,6 @@
       <el-table-column label="支付宝销售金额" align="center" prop="zfbAmt" />
       <el-table-column label="电子卡销售金额" align="center" prop="dzkAmt" />
       <el-table-column label="班结人" align="center" prop="classesMan" />
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['station:summary:edit']"-->
-<!--          >修改</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['station:summary:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
     </el-table>
 
     <pagination