Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng

develop/@gms/gms-plugin-billexpand/src/actions/submitAction.js

@@ -5,6 +5,73 @@ import errorMessageUtil from "./util/errorMessageUtil";
 import { getUUID } from "../query-actions/util/lib";
 export default {
   execute: function (bill, param) {
+    if (param && param.param && param.param.budgetcontrol) {
+      let res = this.getBudgetControl(bill, true, param);
+      res.then((data) => {
+        if (data.code == 0) {
+          let result = this.getBudgetControl(bill, false, param);
+          result.then((data1) => {
+            if (data1.code == 0) {
+              this.submitExecute(bill, param);
+            } else if (data1.code == 1) {
+              GAMS.Common.messagePrompt(data1.msg);
+            }
+          });
+        } else if (data.code == 1) {
+          setTimeout(() => {
+            GAMS.Common.messagePrompt(data.msg);
+          }, 500);
+        } else if (data.code == 2) {
+          setTimeout(() => {
+            this.getModal(bill, param, data);
+          }, 500);
+        }
+      });
+    } else {
+      this.submitExecute(bill, param);
+    }
+  },
+  getModal(bill, param, data) {
+    GMS.$hideContainer.$Modal.confirm({
+      title: "信息提示",
+      content: data.msg,
+      onOk: () => {
+        let result = this.getBudgetControl(bill, false, param);
+        result.then((data1) => {
+          if (data1.code == 0) {
+            this.submitExecute(bill, param);
+          } else if (data1.code == 1) {
+            GAMS.Common.messagePrompt(data1.msg);
+          }
+        });
+      },
+      onCancel: () => {
+        GMS.$hideContainer.$Message["error"]({
+          content: "已取消",
+        });
+      },
+    });
+  },
+  getBudgetControl(bill, check, param) {
+    let postData = {
+      data: bill.getBuillData(),
+    };
+    let url = `/v1/budget/control/${param.define}/${check}`;
+    return new Promise((resolve, reject) => {
+      GMS.$http
+        .post(url, postData, {
+          headers: {
+            post: {
+              "Content-Type": "application/json",
+            },
+          },
+        })
+        .then((res) => {
+          resolve(res.data);
+        });
+    });
+  },
+  submitExecute(bill, param){
     let postData = {
       updatebillState: "2",
       actions: "workflow.submitToFlow"
@@ -14,39 +81,12 @@ export default {
       bill.executeServerAction(postData, function (code, data) {
         bill.setControlsSate(param["_control_name_"], 'enable', true)
         if (code === 200) {
-          const id = data.content.billData.id
+          const id = data.content.billData.id;
+          if(GMS.queryObject){
+            GMS.queryObject.index = GMS.queryObject.index*1 - 1;//上张下张用
+          }
           GMS.$hideContainer.$Message.success('提交成功');
           GMS.vbus.$emit("workflow-state-change", 90)
-          // if (
-          //   window.osConfig.appOpenMode &&
-          //   window.osConfig.appOpenMode == "apploader"
-          // ) {
-          //   GMS.$hideContainer.$portalAPI.emit('nros-tag-close')
-          //   GMS.$hideContainer.$portalAPI.emit(
-          //     "open-new-page", //打开一个新的页签
-          //     getUUID(),
-          //     "runner-bill-form",
-          //     {
-          //       templateName: param.param.viewName,
-          //       id,
-          //       state:'readOnly'
-          //     },
-          //     {
-          //       openWay: "FUNCTAB",
-          //       title: "单据详情",
-          //     }
-          //   );
-          // }
-          // else {
-          //   Bridge.vm.modal_visible = false
-          //   GMS.$hideContainer.addComponent(typesBill, {}, function (c) {
-          //     c.templateName = param.param.viewName;
-          //     c.billId = id;
-          //     c.init = true;
-          //     c.modal_visible = true;
-          //     c.isReadOnly = true
-          //   })
-          // }
         } else if (code === 201) {
           GMS.$hideContainer.$Spin.hide()
           data.message && GMS.$hideContainer.$Message.error({

develop/@gms/gms-plugin-billexpand/src/control/approval-user-control/approval-user-control.vue

@@ -286,7 +286,7 @@ export default {
       if (this.currentEditSuggestion.id) {
         await this.update()
       }
-      else if (this.currentEditSuggestion.spyj) {
+      else if (this.currentEditSuggestion.spyj && this.currentEditSuggestion.spyj.trim()) {
         await this.add()
       }
       this.currentEditSuggestion = {}

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.less

+
+.rbc-basedata-popover {
+  padding: 0px;
+}
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.vue

 <template>
   <div class="rbc-basedata">
-    <el-popover ref="popover" trigger="manual" v-model="dataListShow" :visible-arrow="false" :width="searchPopperMinWidth">
+    <el-popover ref="popover" popper-class="rbc-basedata-popover" trigger="manual" v-model="dataListShow" :visible-arrow="false" :width="searchPopperMinWidth">
       <div class="select-box" slot="reference">
         <Input ref="searchInput" v-model="selectValue" :disabled="disabled" :readonly="readonly || multiple" :class="{'multiple-input': multiple && !readonly}" placeholder="" @on-change="handleChange" @on-focus="handleFocus" @on-blur="handleBlur" @keydown.down.native="handleSelectNext" @keydown.up.native="handleSelectPrev" @keydown.enter.native="handleSelected">
           <Icon type="ios-close-circle" :class="{'clear-icon': true, 'hidden-icon': disabled || readonly || !selectValue }" slot="suffix" @click="clearList" />
@@ -24,6 +24,7 @@
 import EditModal from './edit-modal.vue'
 import baseDataMixin from './baseDataMixin'
 import indexMixin from './indexMixin'
+import './index.less'
 import { addResizeListener } from 'element-ui/src/utils/resize-event'
 
 export default {
@@ -423,7 +424,7 @@ export default {
     position: static;
     z-index: 999;
     margin: 0;
-    padding: 6px 0;
+    padding: 18px 12px;
     box-sizing: border-box;
     background-color: #fff;
     list-style: none;

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

@@ -53,13 +53,13 @@ export default {
       })
         .then(
           function (data, textStatus, response) {
-            this.loading = false;
             if(data.code == 0){
              this.$Message.info("保存成功");
              this.draftModal = false;
             }else{
                data.msg && this.$Message.error(data.msg);
             }
+            this.loading = false;
           }.bind(this)
         )
         .catch((XMLHttpRequest, textStatus, errorThrown) => {

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

@@ -1670,12 +1670,12 @@ export default {
 			"path": "资产/通用",
 			"extends": {
 				"param": [
-					// {
-					// 	"ref": "bill",
-					// 	"type": "metaData",
-					// 	"title": "成功跳转页面",
-					// 	"key": "viewName"
-					// }
+					{
+						"budgetcontrol": false,
+						"type": "Boolean",
+						"title": "启用预算控制",
+						"key": "budgetcontrol"
+					}
 				]
 			},
 			"description": "",

develop/@rbc/workflow-job-view/src/components/custom-query/query-tabs.vue

@@ -16,7 +16,7 @@
                 :cardInfo='cardInfo'
                 :tableData="tableData"
                 :table='table'
-                :totalCount='totalCount'
+                :totalCount='pagerConfig.total'
                 :tableSelection="tableSelection"
                 :extraActionObject="extraActionObject"
                 :queryBus="queryBus"