修改出版測試問題

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

@@ -8,11 +8,10 @@ export function listGun(query) {
     params: query
   })
 }
-export function selectGun(query) {
+export function selectGun() {
   return request({
     url: '/station/gun/selectGun',
-    method: 'get',
-    params: query
+    method: 'get'
   })
 }
 

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

@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
     <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" />
       <el-table-column label="油站名称" align="center" prop="stationName" />
       <el-table-column label="油站地址" align="center" prop="stationAddress" />

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

@@ -13,7 +13,8 @@
       </el-form-item>
 
       <el-form-item label="设备序列号" prop="deviceSerialNum">
-        <el-input
+        <el-input.
+
           v-model="queryParams.deviceSerialNum"
           placeholder="请输入设备序列号"
           clearable
@@ -74,7 +75,7 @@
 
     <!-- 添加或修改油站设备管理对话框 -->
     <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 ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="设备编号" prop="deviceNo">
           <el-input v-model="form.deviceNo" placeholder="请输入设备编号" />
         </el-form-item>
@@ -88,7 +89,7 @@
           <el-input v-model="form.stationName" placeholder="请输入油站名称" />
         </el-form-item>
         <el-form-item label="设备类型" >
-          <el-select v-model="form.deviceType" multiple placeholder="请选择">
+          <el-select v-model="form.deviceType"  placeholder="请选择" clearable size="small">
             <el-option
               v-for="dict in deviceTypeOptions"
               :key="dict.dictValue"
@@ -101,13 +102,14 @@
           <el-input v-model="form.deviceSerialNum" placeholder="请输入设备序列号" />
         </el-form-item>
         <el-form-item label="绑定油枪号" prop="gunNo">
-          <el-checkbox-group v-model="form.gunNo">
+          <el-checkbox-group v-model="gunNoList">
             <el-checkbox
               v-for = "item in checkList"
-              :key="item.oilGunNo"
-              :label="item.oilGunId"
+              :key="item.oilGunId"
+              :label="item.oilGunNo"
               :value="item.oilGunNo"
               >
+              {{item.oilGunNo+"号枪/"+item.oilName}}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
@@ -157,6 +159,7 @@ export default {
       manageList: [],
       //油枪复选
       checkList: [],
+      gunNoList:[],
       //设备状态
       deviceStatusOptions:[],
       //设备类型
@@ -179,7 +182,6 @@ export default {
         deviceStatus: null,
         deviceFactory: null
       },
-
       // 表单参数
       form: {},
       // 表单校验
@@ -197,12 +199,8 @@ 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 => {
+    selectGun().then(response => {
       this.checkList = response.rows;
     });
   },
@@ -236,6 +234,7 @@ export default {
         deviceFactory: null
       };
       this.resetForm("form");
+      this.gunNoList.length=0;
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -265,6 +264,9 @@ export default {
       const deviceId = row.deviceId || this.ids
       getManage(deviceId).then(response => {
         this.form = response.data;
+        if(this.form.gunNo!=null &&this.form.gunNo!="" ){
+          this.gunNoList=this.form.gunNo.split(",");
+        }
         this.open = true;
         this.title = "修改油站设备管理";
       });

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

@@ -1,24 +1,7 @@
-<template>
+<template slot="header" slot-scope="scope">
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="姓名" prop="personnelName">
-        <el-input
-          v-model="queryParams.personnelName"
-          placeholder="请输入姓名"
-          clearable
-          size="small"
-          @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="stationId" >
         <el-select
           v-model="queryParams.stationId"
@@ -34,97 +17,33 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="二维码" prop="qrCode">
-        <el-input
-          v-model="queryParams.qrCode"
-          placeholder="请输入二维码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="personnelPhone">
-        <el-input
-          v-model="queryParams.personnelPhone"
-          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:personnel: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:personnel: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:personnel: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:personnel:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="personnelList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="油站员工主键id" v-if="false" align="center" prop="personnelId" />
-      <el-table-column label="姓名" align="center" prop="personnelName" />
+      <el-table-column label="员工姓名" align="center" prop="personnelName" />
       <el-table-column label="负责枪号" align="center" prop="gunNo" />
       <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="qrCode" />
-      <el-table-column label="手机号" align="center" prop="personnelPhone" />
       <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-plus"
+          >微信绑定</el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['station:personnel:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['station:personnel:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -144,7 +63,17 @@
           <el-input v-model="form.personnelName" placeholder="请输入员工姓名" />
         </el-form-item>
         <el-form-item label="负责枪号" prop="gunNo">
-          <el-input v-model="form.gunNo" placeholder="请输入员工负责枪号" />
+<!--          <el-input v-model="form.gunNo" placeholder="请输入员工负责枪号" />-->
+          <el-checkbox-group v-model="gunNoList">
+            <el-checkbox
+              v-for = "item in checkList"
+              :key=item.oilGunId
+              :label="item.oilGunNo"
+              :value="item.oilGunNo"
+            >
+              {{item.oilGunNo+"号枪/"+item.oilName}}
+            </el-checkbox>
+          </el-checkbox-group>
         </el-form-item>
         <el-form-item label="油站名称" prop="stationId" >
           <el-select
@@ -162,9 +91,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="二维码" prop="qrCode">
+<!--        <el-form-item label="二维码" prop="qrCode">
           <el-input v-model="form.qrCode" placeholder="请输入二维码" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="手机号" prop="personnelPhone">
           <el-input v-model="form.personnelPhone" placeholder="请输入员工手机号" />
         </el-form-item>
@@ -179,7 +108,7 @@
 
 <script>
 import { listPersonnel, getPersonnel, delPersonnel, addPersonnel, updatePersonnel, exportPersonnel } from "@/api/station/personnel";
-import {stationinfo} from "@/api/station/gun";
+import {stationinfo,selectGun} from "@/api/station/gun";
 
 export default {
   name: "Personnel",
@@ -200,6 +129,8 @@ export default {
       // 油站员工信息表格数据
       personnelList: [],
       stationOptions:[],
+      checkList:[],
+      gunNoList:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -227,6 +158,10 @@ export default {
     stationinfo().then(response => {
       this.stationOptions = response.rows;
     });
+    //获取油枪
+    selectGun().then(response => {
+      this.checkList = response.rows;
+    });
   },
   methods: {
     /** 查询油站员工信息列表 */
@@ -262,6 +197,7 @@ export default {
         personnelPhone: null
       };
       this.resetForm("form");
+      this.gunNoList.length=0;
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -291,6 +227,10 @@ export default {
       const personnelId = row.personnelId || this.ids
       getPersonnel(personnelId).then(response => {
         this.form = response.data;
+      //  this.gunNoList=this.form.gunNo.split(",").map(Number);
+        if(this.form.gunNo!=null &&this.form.gunNo!="" ){
+          this.gunNoList=this.form.gunNo.split(",");
+        }
         this.open = true;
         this.title = "修改油站员工信息";
       });
@@ -299,6 +239,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.gunNoList !=null && this.gunNoList.length>0){
+            this.form.gunNo=this.gunNoList.toString();
+          }
           if (this.form.personnelId != null) {
             updatePersonnel(this.form).then(response => {
               this.msgSuccess("修改成功");

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

@@ -7,7 +7,8 @@
         <el-button icon="el-icon-edit" size="mini"  @click="handleAddAdjust"  v-hasPermi="['station:adjust:add']">调价</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="priceList" >
+    <el-table v-loading="loading" :data="priceList"  ref = "multipleTable"  @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
       <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" />
@@ -130,6 +131,9 @@
         <el-form-item label="油站id" v-show="false" prop="stationId" >
           <el-input v-model="form1.stationId" placeholder="请输入油站id" />
         </el-form-item>
+        <el-form-item label="油站id" v-show="false" prop="stationId" >
+          <el-input v-model="form1.oilPriceId" placeholder="请输入油站id" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFormAdjust">确 定</el-button>
@@ -265,10 +269,28 @@ export default {
         }
       });
     },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.oilPriceId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
     handleAddAdjust() {
-      this.resetAdjust();
-      this.open1= true;
-      this.titleAdjust = "添加油品调价信息";
+      if(this.ids.length==1){
+       let sss = this.$refs.multipleTable.selection;
+       console.log("sss",sss);
+        this.resetAdjust();
+        this.form1.stationId=sss[0].stationId;
+        this.form1.stationName=sss[0].stationName;
+        this.form1.oilName=sss[0].oilName;
+        this.form1.oilPriceId=sss[0].oilPriceId;
+        this.open1= true;
+        this.titleAdjust = "添加油品调价信息";
+      }else if(this.ids.length==0){
+        this.msgSuccess("请选择要调价的油品");
+      }else{
+        this.msgSuccess("只能选择一条油品进行调价");
+      }
     },
     // 表单重置
     resetAdjust() {

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

@@ -19,7 +19,7 @@
       <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-refresh" size="mini" @click="handleAdd">添加班结</el-button>
+        <el-button icon="el-icon-plus" size="mini" @click="handleAdd">添加班结</el-button>
       </el-form-item>
     </el-form>
     <!--按员工汇总-->
@@ -53,6 +53,7 @@
 
 <script>
 import { stationinfo,listStructure,listPersonnelStructure,listOilStructure, getStructure, delStructure, addStructure, updateStructure, exportStructure } from "@/api/station/structure";
+
 export default {
   name: "Structure",
   data() {
@@ -240,6 +241,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.getList();
+      this.getList2();
     },
     /** 重置按钮操作 */
     resetQuery() {