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

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

@@ -11,13 +11,12 @@ export default {
     })
   },
   billDeleted(bill, param) {
-    GMS.$http.post(
-      '/rbc/bill/action/deleteExpenceAccount', {
-      billDefine: bill.getBillDefine(),
-      billId: bill.getMasterData().getValue('id'),
-      subTableNames: param.subTableNames? param.subTableNames: 'BXMXZB'
-    }
-    ).then((data) => {
+    let postData = {
+      data: bill.getBuillData()
+    };
+    let id = bill.getMasterData().getValue('id');
+    let url = `/rbc/bill/action/executed/${bill.getBillDefine()}/bill.Basic.delete?currentDataId=${id}`;
+    GMS.$http.post(url,JSON.stringify(postData)).then((data) => {
       if (data.status == 200 && data.data.code == 0) {
         GMS.$hideContainer.$Modal.remove(); 
         GMS.$hideContainer.$Message.success('删除成功');

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

@@ -6,10 +6,7 @@ export default {
     if (param.name.split('_action_gams')) {
       actionName = param.name.split('_action_gams')[1];
     }
-    let flag =
-    GMS.queryObject && GMS.queryObject.isReadOnly
-      ? true
-      : compareData(GMS.oldBillData, bill.getBuillData());
+    let flag = compareData(GMS.oldBillData, bill.getBuillData());
     if (flag) {
       this.getOtherPage(actionName);
     } else {
@@ -17,9 +14,7 @@ export default {
         title: "信息提示",
         content: "信息发生变化，确认切换？",
         onOk: () => {
-            if (Object.keys(param.param).length > 0) {
           this.getOtherPage(actionName);
-            }
         },
         onCancel: () => {
           GMS.$hideContainer.$Message["info"]({
@@ -56,7 +51,7 @@ export default {
         } else if (action == "last") {
           GMS.queryObject.index = data.data.count - 1;
         }
-        let state = GMS.queryObject.isReadOnly?'readOnly':'';
+        let state = 'readOnly';
         if (
           window.osConfig.appOpenMode &&
           window.osConfig.appOpenMode == "apploader"

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

@@ -91,8 +91,8 @@ export default {
       data: buidData,
       detailData: detailData,
     };
-    //executed/bill.CCSPD/bill.Basic.save?transmission=total
-    let url = `/rbc/bill/action/rbcbillsave/${param.define}/bill.Basic.save?transmission=total`;
+    let url = `/rbc/bill/action/executed/${param.define}/bill.Basic.save?transmission=total`;
+   // let url = `/rbc/bill/action/rbcbillsave/${param.define}/bill.Basic.save?transmission=total`;
     GMS.$http
       .post(url, JSON.stringify(postData), {
         headers: {

develop/@gms/gms-plugin-billexpand/src/components-control/typesBill.vue

@@ -70,8 +70,13 @@ export default {
     loadFinishFun(bill) {
       console.log('billState', bill.getMasterData().getValue('billState'))
       const workflowState = bill.getMasterData().getValue('billState')
-			if ([90,92].includes(workflowState)) {
-				this.state = 'readOnly'
+      let readArr = this.templateName.endsWith('_A')?[92]:[90,92];//如果是审批界面话，90能编辑
+			if (this.state != 'readOnly' && readArr.includes(workflowState)) {
+				this.state = 'readOnly';
+        this.init = false;
+        this.$nextTick(() => {
+          this.init = true;
+        });
 			}
       let that = this;
       setTimeout(() => {

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

 <template>
   <div>
-    <Modal v-model="modalShow" title="打印" @on-ok="printAsync">
+    <Modal v-model="modalShow" title="打印">
       <span>打印模板</span>
       <Select v-model="printTemplate" clearable>
         <Option
@@ -10,6 +10,10 @@
           >{{ item.title }}</Option
         >
       </Select>
+      <div slot="footer">
+				<Button @click="modalShow = false">取消</Button>
+				<Button @click="printAsync" type="primary">确定</Button>
+			</div>
     </Modal>
   </div>
 </template>
@@ -41,6 +45,10 @@ export default {
   },
   methods: {
     printAsync() {
+      if(!this.printTemplate){
+        GMS.$hideContainer.$Message.info('请选择打印模板');
+        return;
+      }
       //打印接口
       return new Promise((resolve, reject) => {
         // let url=`/gms/bill/print/${this.billDefineName}/${this.billId}/${this.printTemplate}`;
@@ -61,6 +69,7 @@ export default {
             let href = window.URL.createObjectURL(blob); //创建下载的链接
             downloadElement.href = href;
             window.open(href)  
+            this.modalShow = false;
             // let routeData = GMS.routerManager.getRouter().resolve({
             //   path: "/showPrint",
             //   query: { src: href },

develop/@rbc/runner-bill-form/package.json

 {
   "name": "@rbc/runner-bill-form",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "scripts": {
     "build": "vue-cli-service build",
     "build-dev": "vue-cli-service build --mode development",

develop/@rbc/runner-bill-form/src/views/bill-form-runner.vue

@@ -97,7 +97,8 @@ export default {
     loadFinishFun(bill) {
       this.curBill = bill;
       const billState = bill.getMasterData().getValue('billState')
-      if (this.state != 'readOnly' && [90,92].includes(billState)) {
+      let readArr = this.templateName.endsWith('_A')?[92]:[90,92];//如果是审批界面话，90能编辑
+			if (this.state != 'readOnly' && readArr.includes(billState)) {
         this.state = 'readOnly' ;
         this.init = false;
         this.$nextTick(() => {

develop/@rbc/welcome-page/src/views/about.vue

@@ -6,7 +6,7 @@
 export default {
   data() {
     return {
-      version: '',
+      version: '财务信息化网上报销子系统版本：机密 V1.0.1',
     }
   },
   mounted() {
@@ -16,7 +16,7 @@ export default {
     let times = new Date().getTime()
     appStoreServer.get(`${window.NROS_PREFIX || '/'}version.json?times=`+times).then((res) => {
       console.log(res)
-      this.version = res && res.data && res.data.rbcVersion
+      this.version = res && res.data && res.data.rbcVersion || this.version
     })
   }
 }