Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/model/Infled/Event.js

@@ -272,30 +272,31 @@ export default {
     async handleReset(formName) {
         this.$refs[formName].resetFields();
     },
-    // async handleSearch() {
-    //     this.stmData.data = [];
-    //     let opndatfrom = this.model.infcon.opndatfrom;
-    //     if(!opndatfrom || opndatfrom == ''){
-    //         this.$notify.error({ title: '错误', message: '查询开始日期必输！' });
-    //         return;
-    //     }
-    //     let opndatto = this.model.infcon.opndatto;
-    //     if(!opndatto || opndatto == ''){
-    //         this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
-    //         return;
-    //     }
-
-    //     let rtnmsg = await this.executeRule("infbut.searow")
-    //     if(rtnmsg.respCode == SUCCESS)
-    //     {
-    //         this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
-
-    //     }
-    //     else
-    //     {
-    //     this.$notify.error({title: '错误',message: '服务请求失败！'});
-    //     }
-    // },
+    async handleSearch() {
+
+        this.stmData.data = [];
+        let opndatfrom = this.model.infcon.opndatfrom;
+        if(!opndatfrom || opndatfrom == ''){
+            this.$notify.error({ title: '错误', message: '查询开始日期必输！' });
+            return;
+        }
+        let opndatto = this.model.infcon.opndatto;
+        if(!opndatto || opndatto == ''){
+            this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
+            return;
+        }
+        
+        let rtnmsg = await this.executeRule("infbut.searow")
+        if(rtnmsg.respCode == SUCCESS)
+        {
+            this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
+
+        }
+        else
+        {
+        this.$notify.error({title: '错误',message: '服务请求失败！'});
+        }
+    },
 
 
 }
\ No newline at end of file

src/views/Business/Letrsv/Detp.vue

@@ -7,7 +7,7 @@
         <c-col :span="24">
           <el-form-item label="Available with" prop="ledgrp.rec.avbwth">
             <c-select
-              v-model="avbFlag"
+              v-model="model.ledgrp.rec.avbwth"
               style="width: 100%"
               placeholder="Please select Available with"
               :code="codes.avbwth"