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/views/Public/Docpan.vue

@@ -36,6 +36,7 @@
                         style="width: 100%"
                         placeholder="请选择"
                         @change="executeDefault('trnmod.trndoc.doccur.docsnf')"
+                        :disabled="suppress"
                     >
                         <el-option
                             v-for="item in codes.docsnf"
@@ -55,6 +56,7 @@
                         "
                         style="width: 100%"
                         placeholder="请选择"
+                        :disabled="suppress"
                     >
                         <el-option
                             v-for="item in codes.uiltxt"
@@ -100,6 +102,7 @@
                         :readonly="true"
                         style="width: 100%"
                         placeholder="请选择"
+                        :disabled="suppress"
                     >
                     </c-input>
                 </template>
@@ -112,7 +115,7 @@
                         "
                         style="width: 100%"
                         placeholder="请选择"
-                        
+                        :disabled="suppress"
                     >
                     </c-input>
                 </template>
@@ -129,6 +132,7 @@
                         "
                         style="width: 100%"
                         placeholder="请选择"
+                        :disabled="suppress"
                     >
                         <el-option
                             v-for="item in codes.swttlx"
@@ -147,9 +151,9 @@
                         type="primary"
                         size="small"
                         :disabled="
-                            scope.row
+                            (scope.row
                                 .pandsc == 'MT799' && model.didgrp && model.didgrp.rec &&
-                            model.didgrp.rec.elcflg == 'Y'
+                            model.didgrp.rec.elcflg == 'Y')||suppress
                         "
                         @click="handleDisplay(scope.row.index, scope.row, model.trnmod.trndoc.doceot[scope.row.idx])"
                         icon="el-icon-search"
@@ -546,20 +550,24 @@ export default {
             })
         },
         activateDialog() {
-            this.executeRule("trnmod.trndoc.doccur.butdel").then(res => {
+            this.executeRule(`trnmod.trndoc.doceot(${this.index + 1}).butdel`).then(res => {
                 if(res.respCode==SUCCESS){
                     //TODO
-
+                    this.updateModel(res.data)
+                    this.dialog = this.model.trnmod.trndoc.doceot[this.index]
+                    this.suppress=false;
                 }else{
                     this.$notify.error({ title: '错误', message: '服务请求失败！' });
                 }
             })
         },
         suppressDialog() {
-            this.executeRule("trnmod.trndoc.doccur.butdel").then(res => {
+            this.executeRule(`trnmod.trndoc.doceot(${this.index + 1}).butdel`).then(res => {
                 if(res.respCode==SUCCESS){
                     //TODO
-                  this.suppress=true;
+                    this.updateModel(res.data)
+                    this.dialog = this.model.trnmod.trndoc.doceot[this.index]
+                    this.suppress=true;
                 }else{
                     this.$notify.error({ title: '错误', message: '服务请求失败！' });
                 }

src/views/Public/Setpan.vue

@@ -1022,9 +1022,9 @@ export default {
         },
         detail1(index, row) {
             this.executeDefault("setfel.det").then(res => {
+                this.index = index;
                 this.dialogVisible = true;
                 this.dialog = row;
-                this.index = index;
             })
         },
         dispDefault(index) {
@@ -1037,9 +1037,9 @@ export default {
             const that = this;
             const rule = "setmod.setfeg.setfel(" + (index + 1) + ").det";
             that.executeRule(rule).then(res => {
-                that.$refs.setpanDialog.visiable = true;
-                that.$refs.setpanDialog.formData = Object.assign({}, that.model.setmod.setfeg.setfel[index]);
                 that.index = index;
+                that.$refs.setpanDialog.visiable = true;
+                that.$refs.setpanDialog.formData = that.model.setmod.setfeg.setfel[index];
                 that.dialog2 = row
             })
         },
@@ -1054,10 +1054,10 @@ export default {
             const rule = "setmod.setglg.setgll(" + (index + 1) + ").det";
             let rtnmsg = await this.executeRule(rule)
             if (rtnmsg.respCode == SUCCESS) {
+                that.index = index;
                 that.$refs.detpDialog.visiable = true;
                 this.detpDialogVisible = true;
-                that.dialog3 = Object.assign({}, that.model.setmod.setglg.setgll[index]);
-                that.index = index;
+                that.dialog3 = that.model.setmod.setglg.setgll[index];
                 that.rattyp = that.strCalCode(that.dialog3.rattyp, that.codes.ratetype);
                 that.dcbrattyp = that.strCalCode(that.dialog3.dcbrattyp, that.codes.ratetype);
                 that.scbrattyp = that.strCalCode(that.dialog3.scbrattyp, that.codes.ratetype);

src/views/Public/SetpanDialog.vue

@@ -109,7 +109,7 @@
                 <c-col :span="24">
                     <c-col :span="12">
                         <el-form-item label="优惠百分比">
-                            <c-input v-model="formData.dctrat">
+                            <c-input v-model="formData.dctrat" @keyup.enter.native="eventFunction('setmod.setfeg.setfel(1).dctrat')">
                                 <template #suffix>%</template>
                             </c-input>
                         </el-form-item>
@@ -355,7 +355,11 @@
 </template>
 
 <script>
+import commonProcess from "~/mixin/commonProcess";
+
 export default {
+    inject: ['root'],
+    mixins: [commonProcess],
     props: {
         model: Object,
         idx: Number,
@@ -363,10 +367,14 @@ export default {
     },
     data() {
         return {
-            formData: {},
             visiable: false,
         };
     },
+    computed: {
+        formData() {
+            return this.model.setmod.setfeg.setfel[this.idx]
+        }
+    },
     methods: {
         saveDialog() {
             this.model.setmod.setfeg.setfel.splice(this.idx, 1, this.formData);