ibizdev提交

app_Web/src/locale/lanres/ps/ps_en_US.ts

@@ -10,6 +10,7 @@ export default {
 	},
 	main_form: {
 		details: {
+			button1: "下单", 
 			group1: "采购单基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -22,10 +23,12 @@ export default {
 			srfsourcekey: "", 
 			psname: "采购单名称", 
 			bz: "备注", 
+			imstate: "重要事项状态", 
 			ngrid: "NGRID", 
 			psid: "采购单标识", 
 		},
 		uiactions: {
+			xd: "下单",
 		},
 	},
 	main_grid: {

app_Web/src/locale/lanres/ps/ps_zh_CN.ts

@@ -9,6 +9,7 @@ export default {
 	},
 	main_form: {
 		details: {
+			button1: '下单', 
 			group1: '采购单基本信息', 
 			formpage1: '基本信息', 
 			srfupdatedate: '更新时间', 
@@ -21,10 +22,12 @@ export default {
 			srfsourcekey: '', 
 			psname: '采购单名称', 
 			bz: '备注', 
+			imstate: '重要事项状态', 
 			ngrid: 'NGRID', 
 			psid: '采购单标识', 
 		},
 		uiactions: {
+			xd: '下单',
 		},
 	},
 	main_grid: {

app_Web/src/widgets/ps/main-form/main-form-base.vue

@@ -20,6 +20,14 @@
 </div>
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.button1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+        <i-button type="primary" @click="button1_click($event)"
+         style="">
+           
+        <span >{{$t('ps.main_form.details.button1')}}</span>
+    </i-button>
+
 </i-col>
     
     </row>
@@ -41,6 +49,7 @@ import { UIActionTool,Util } from '@/utils';
 import PSService from '@/service/ps/ps-service';
 import MainService from './main-form-service';
 
+import PSUIService from '@/uiservice/ps/ps-ui-service';
 import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 
@@ -130,6 +139,32 @@ export default class MainBase extends Vue implements ControlInterface {
     protected appEntityService: PSService = new PSService({ $store: this.$store });
     
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    protected form_button1_click(params: any = {}, tag?: any, $event?: any) {
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        
+        let contextJO:any = {};
+        xData = this;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        // 界面行为
+        const curUIService:PSUIService  = new PSUIService();
+        curUIService.PS_XD(datas,contextJO, paramJO,  $event, xData,this,"PS");
+    }
+
 
     /**
      * 关闭视图
@@ -328,6 +363,7 @@ export default class MainBase extends Vue implements ControlInterface {
         srfsourcekey: null,
         psname: null,
         bz: null,
+        imstate: null,
         ngrid: null,
         psid: null,
         ps:null,
@@ -424,6 +460,12 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '备注 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '备注 值不能为空', trigger: 'blur' },
         ],
+        imstate: [
+            { type: 'string', message: '重要事项状态 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '重要事项状态 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '重要事项状态 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '重要事项状态 值不能为空', trigger: 'blur' },
+        ],
         ngrid: [
             { type: 'string', message: 'NGRID 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: 'NGRID 值必须为字符串类型', trigger: 'blur' },
@@ -445,6 +487,9 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof Main
      */
     protected detailsModel: any = {
+        button1: new FormButtonModel({ caption: '下单', detailType: 'BUTTON', name: 'button1', visible: false, isShowCaption: true, form: this, uiaction: { type: 'DEUIACTION', 
+ tag: 'XD', actiontarget: 'SINGLEKEY' } })
+, 
         group1: new FormGroupPanelModel({ caption: '采购单基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '', langbase: 'ps.main_form', extractMode: 'ITEM', details: [] } })
 , 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
@@ -468,6 +513,8 @@ export default class MainBase extends Vue implements ControlInterface {
         psname: new FormItemModel({ caption: '采购单名称', detailType: 'FORMITEM', name: 'psname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         bz: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'bz', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        imstate: new FormItemModel({ caption: '重要事项状态', detailType: 'FORMITEM', name: 'imstate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         ngrid: new FormItemModel({ caption: 'NGRID', detailType: 'FORMITEM', name: 'ngrid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
@@ -595,6 +642,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'bz', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 imstate 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof Main
+     */
+    @Watch('data.imstate')
+    onImstateChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'imstate', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 ngrid 值
      *
@@ -655,6 +714,16 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     private formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
                 
+        if (Object.is(name, '') || Object.is(name, 'imstate')) {
+            let ret = false;
+            const _imstate = this.data.imstate;
+            if (this.$verify.testCond(_imstate, 'EQ', '30')) {
+                ret = true;
+            }
+            this.detailsModel.button1.setVisible(ret);
+        }
+
+
 
 
 
@@ -856,6 +925,16 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
+	/**
+	 * 表单 下单 事件
+	 *
+	 * @memberof @memberof Main
+	 */
+    protected button1_click($event: any): void {
+        this.form_button1_click(null, null, $event);
+
+    }
+
 
     /**
      * 分组界面行为事件

app_Web/src/widgets/ps/main-form/main-form-model.ts

@@ -59,6 +59,11 @@ export default class MainModel {
         prop: 'bz',
         dataType: 'LONGTEXT_1000',
       },
+      {
+        name: 'imstate',
+        prop: 'imstate',
+        dataType: 'TEXT',
+      },
       {
         name: 'ngrid',
         prop: 'ngrid',

config.xml

@@ -40,14 +40,14 @@
       mvn install
       cd ..
       mvn install
-      cd ps-boot
-      mvn clean package
+      cd ps-app/ps-app-web
+      mvn clean package -Pprod
       echo 'echo "$para1"' > apppasswd.sh
       chmod -R 777 *
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/ps.jar root@172.16.102.61:/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5/ps.jar >>/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5/ps_apips 服务-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/ps-app-web.jar root@172.16.102.61:/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6/ps-app-web.jar >>/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6/ps_appps 应用-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
       </command>
     </hudson.tasks.Shell>
   </builders>