Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/views/expend/expendMx.vue

@@ -93,6 +93,19 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="是否带量">
+              <el-select style="width: 200px" size="mini" clearable v-model="params.isWhether" placeholder="请选择">
+                <el-option
+                  v-for="item in options1"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
             <el-form-item label-width="80px">
               <el-button type="primary" size="mini" icon="el-icon-search" @click="searchList">搜索</el-button>
               <el-button size="mini" plain icon="el-icon-refresh" @click="resetList">重置</el-button>
@@ -151,7 +164,7 @@
 <script>
 import { mxList, pullMx, huizongMX, exportMx } from '@/api/expend/expendMx.js'
 export default {
-  dicts: ['sys_status', 'sys_number_yes_no'],
+  dicts: ['sys_status', 'sys_number_yes_no', 'carry_or_not'],
   components: {
     Add: () => import("./expendMxDetail.vue"),
     ElSuperUxTable: () => import("@/components/super-ux-table/index.vue"),
@@ -167,6 +180,7 @@ export default {
       size: "mini",
       loading: false,
       options: [{value: '0', label: '是'}, {value: '2', label: '否'}],
+      options1: [{value: '0', label: '否'}, {value: '1', label: '是'}],
       params: {
         code: '',
         custCode: '',
@@ -174,6 +188,8 @@ export default {
         startDate: '',
         endDate: '',
         settleNo: '',
+        isSum: '',
+        isWhether: ''
       },
       pageInfo: {
         pageNum: 1,
@@ -199,6 +215,10 @@ export default {
           is: 'el-dict-tag',
           dictName: "sys_number_yes_no",
         } },
+        { item: { key: "isWhether", title: "是否带量" }, attr: {
+          is: 'el-dict-tag',
+          dictName: "carry_or_not",
+        } },
         { item: { key: "settleNo", title: "结算单号"}, attr: {} },
         { item: { key: "startDate", title: "结算开始日期" }, attr: {} },
         { item: { key: "endDate", title: "结算截止日期" }, attr: {} },

src/views/expend/expendMxDetail.vue

@@ -106,6 +106,19 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="是否带量" prop="isWhether">
+              <el-select style="width: 200px" size="mini" :disabled="sonDisable" clearable v-model="basicForm.isWhether" placeholder="请选择">
+                <el-option
+                  v-for="item in options1"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
             <el-form-item label="备注" prop="remark">
               <el-input style="width: 200px" clearable :disabled="sonDisable" size="mini" v-model="basicForm.remark">
               </el-input>
@@ -125,11 +138,28 @@
       <div class="btn_grooup">
         <span>明细信息</span>
         <div>
-          <!-- <el-button type="primary" size="mini" @click="addLine" v-if="!sonDisable">增行</el-button> -->
+          <el-button type="primary" size="mini" @click="editLine" v-if="!sonDisable">批量修改</el-button>
           <!-- <el-button type="primary" size="mini" @click="delLines" v-if="!sonDisable">删行</el-button> -->
         </div>
       </div>
 
+      <el-dialog title="批量修改" @close="clearInfo" :visible.sync="dialogFormVisible">
+        <el-form :model="dialogForm" label-width="auto">
+          <el-form-item label="明细信息">
+            <el-select size="mini" v-model="dialogForm.region">
+              <el-option label="服务费率" value="ratio"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="修改值">
+            <el-input-number clearable size="mini" :min="1" v-model="dialogForm.info"></el-input-number>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button size="mini" @click="dialogFormVisible = false">取 消</el-button>
+          <el-button size="mini" type="primary" @click="confirm">确 定</el-button>
+        </div>
+      </el-dialog>      
+
       <ux-grid
         :data="basicForm.itemList"
         border
@@ -197,12 +227,19 @@ export default {
         endDate: '',
         totalAmount: '',
         isSum: '',
+        isWhether: '',
         remark: '',
         itemList: []
       },
       options: [{value: '0', label: '是'}, {value: '2', label: '否'}],
+      options1: [{value: '0', label: '否'}, {value: '1', label: '是'}],
       basicRules: {},
       ids:[],
+      dialogFormVisible:false,
+      dialogForm:{
+        region: 'ratio',
+        info: ''
+      }
     }
   },
   created() {
@@ -255,6 +292,7 @@ export default {
           this.sonPageStu = 'check'
           this.sonDisable = true
           this.getDetails(this.row)
+          this.ids = []
         }
       })
     },
@@ -263,12 +301,35 @@ export default {
       this.$emit('refresh')
     },
     handleSelectionChange(selection) {
-      this.ids = selection.map(item =>{
-        return item.id
-      })
+      // this.ids = selection.map(item =>{
+      //   return item.id
+      // })
+      this.ids = selection
+      // console.log('选中数组1', selection)
       console.log('选中数组', this.ids)
     },
-    addLine() {},
+    editLine() {
+      if(this.ids.length <= 0) {
+        this.$modal.notifyWarning("请至少选择一条数据进行操作!");
+      } else {
+        this.dialogFormVisible = true
+      }
+    },
+    confirm() {
+      console.log(this.ids)
+      console.log('修改值',this.dialogForm)
+      this.ids.forEach(item => {
+        item[this.dialogForm.region] = this.dialogForm.info
+        item.serviceFee = ((item.ratio*0.01) * item.amount).toFixed(2)
+      })
+      this.dialogFormVisible = false
+    },
+    clearInfo() {
+      this.dialogForm = {
+        region: 'ratio',
+        info: ''
+      }
+    },
     delLines() {},
     toOA() {
       this.$modal.loading("正在提交，请稍后...");