Merge branch 'develop-yangchen' into 'develop'

新增按钮：工会_大额请款单_批量填充

See merge request GFP/RBC/rbc-frontend!194

develop/@gms/gms-plugin-billexpand/src/control/DEQKD_batchEditorModal.vue

+<style scoped lang="less">
+.scrollable {
+  /*height: 700px;*/
+  overflow-x: hidden;
+}
+
+::-webkit-scrollbar {
+  width: 7px;
+}
+
+::-webkit-scrollbar-thumb {
+  opacity: 0.5;
+  border-radius: 3.5px;
+  background-color: #888888;
+}
+
+.from-second-title {
+  height: 16px;
+  line-height: 16px;
+  margin-left: 24px;
+  /*margin: 15px 0;*/
+  margin-bottom: 15px;
+  padding-left: 4px;
+  border-left: 2px solid #3477cb;
+}
+
+.title {
+  font-family: Microsoft YaHei;
+  margin-left: 4px;
+  font-size: 14px;
+  color: #222222;
+  letter-spacing: 0;
+  text-align: left;
+}
+</style>
+<template>
+  <div class="modal_content">
+    <Modal
+      v-model="modal_visible"
+      title="批量填充"
+      @on-cancel="cancel"
+      :mask-closable="false"
+    >
+      <Form ref='form' :model="cashOutDetail" :label-width="120" :rules="ruleValidate">
+        <FormItem label="请款金额下限" prop="QKJEXX">
+          <Input
+            number
+            v-model="cashOutDetail.QKJEXX"
+            placeholder="请输入请款金额下限"
+          ></Input>
+        </FormItem>
+        <FormItem label="是否请款" prop="SFQK">
+          <i-switch v-model="cashOutDetail.SFQK" size="large">
+            <template #open>
+              <span>是</span>
+            </template>
+            <template #close>
+              <span>否</span>
+            </template>
+          </i-switch>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button @click="cancel">取消</Button>
+        <Button type="primary" :loading="loading" @click="handleSubmit">确定</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      modal_visible: false,
+      loading: false,
+      cashOutDetail: {
+        SFQK: true,
+        QKJEXX: 300000,
+      },
+      ruleValidate: {
+        QKJEXX: [
+          {
+            required: true,
+            type: "number",
+            message: "请输入数值类型的请款金额下限",
+            trigger: "blur",
+          },
+        ],
+        SFQK: [
+          {
+            required: true,
+            type: "boolean",
+            message: "是否请款为必填项",
+            trigger: "change",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    cancel() {
+      this.modal_visible = false;
+      this.$emit('close')
+    },
+    handleSubmit() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          const param ={
+            idList: this.idList,
+            cashOutDetail: this.cashOutDetail,
+            billDefine: this.billDefine
+          }
+          GMS.$http.post('/rbcquery/batchUpdateCashOut',param).then(res=>{
+            GMS.vbus.$emit('custom-query-refresh');
+            GMS.vbus.$emit('tab-count-refresh');
+            this.loading = false
+            this.modal_visible = false;
+            setTimeout(() => {
+              if(this.context && this.context.callback){
+                  this.context.callback(true);
+              }
+              GMS.$hideContainer.$Message.success('批量填充设置成功');
+              this.$emit('close')
+            }, 500);
+          },error=>{
+            this.loading = false
+            GMS.$hideContainer.$Message.error('批量填充设置失败')
+          })
+        } else {
+          GMS.$hideContainer.$Message.error('参数输入不合规')
+        }
+      });
+    },
+  },
+  watch: {},
+};
+</script>

develop/@gms/gms-plugin-billexpand/src/emcon.js

@@ -1360,6 +1360,17 @@ export default {
 			},
 			"description": "",
 			"title": "自定义删除"
+		},
+		{
+			"value": "DEQKD_batchEditorAction",
+			"discard": false,
+			"path": "工会",
+			"extends": {
+				"paramDes": [
+				]
+			},
+			"description": "",
+			"title": "批量填充"
 		}
 	],
 	billAction: [

develop/@gms/gms-plugin-billexpand/src/mcon.js

@@ -72,6 +72,7 @@ import refreshTransactionStatus from "./query-actions/payments/refreshTransactio
 import throughQuery from "./query-actions/throughQuery";
 import queryDeleteBill from "./query-actions/queryDeleteBill";
 import openNewPageDetail from "./query-actions/openNewPageDetail";
+import DEQKD_batchEditorAction from "./query-actions/DEQKD_batchEditorAction";
 import GH_cfBalance from "./query-actions/labourUnion/gh_cfBalance.js"
 import GH_cfProject from "./query-actions/labourUnion/gh_cfProject.js"
 //control
@@ -215,8 +216,16 @@ export default {
         lincaoAddView,
         lincaoReadView,
         openNewPageDetail,
+<<<<<<< HEAD
+        GH_agreeAction,
+        GH_rejectAction,
+        GH_submitAction,
+        GH_retrieveAction,
+        DEQKD_batchEditorAction
+=======
         GH_cfBalance,
         GH_cfProject
+>>>>>>> origin/develop
     },
     billAction: {
         printMultiAction,

develop/@gms/gms-plugin-billexpand/src/query-actions/DEQKD_batchEditorAction.js

+import batchEditorControlModal from '../control/DEQKD_batchEditorModal.vue'
+export default {
+  execute(context, param) {
+    const tableSelection = context.selects || []
+    // 未选择table行->请选择填充的行
+    if (tableSelection.length === 0) {
+      GMS.$hideContainer.$Message['info']({
+        content: '请先选择将要填充的行',
+      });
+      return
+    }
+    const idList = tableSelection.map(d=>d.id) 
+    const billDefine = tableSelection[0].billDefine
+    let component = null;
+      let name = GMS.$hideContainer.addComponent(batchEditorControlModal, {}, function (c) {
+        component = c;
+        c.context = context
+        c.modal_visible = true;
+        c.idList = idList
+        c.billDefine = billDefine
+        c.$nextTick(()=>{
+          component.$on('close', function () {
+            GMS.$hideContainer.remove(name);
+          })
+        })
+      });
+
+  },
+};
\ No newline at end of file