ocpview-plus 1.2.6 → 1.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpview-plus",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "title": "ocpviewPlus",
   "description": "A high quality Service UI components Library with Vue.js",
   "homepage": "",

package/src/components/masterplate/billdetailform.vue

@@ -19,6 +19,7 @@
                 <DetailsBoxs  v-if="temp2.type === 'DetailsBox'" :ref="temp2.name"      :config="temp2" :dictData="dictData" @doAction="doAction"/>
                 <FormCardBox  v-if="temp2.type === 'FormCardBox'" :ref="temp2.name"     :config="temp2" :dictData="dictData"/>
                 <AppendixBoxs  v-if="temp2.type === 'AppendixBox'" :ref="temp2.name"   :config="temp2" :modulecode="modulecode" @doAction="doAction"/>
+                <AppendixBoxs2 v-if="temp2.type === 'AppendixBox2'" :ref="temp2.name"   :config="temp2" :dictData="dictData" :modulecode="modulecode" @doAction="doAction"/>
             </div>
         </div>
     </Card>
@@ -29,11 +30,12 @@ import elementResizeDetectorMaker from 'element-resize-detector'
 import EditGridCardS from './editgridcard.vue';
 import DetailsBoxs from './detailsbox.vue';
 import AppendixBoxs from './appendix.vue';
+import AppendixBoxs2 from './contractappendix.vue';
 import random from '../../utils/random_str';
 import Formcard from './formcard.vue';
 export default {
     name:'mbilldetailform',
-    components:{Formcard,EditGridCardS,DetailsBoxs,AppendixBoxs},
+    components:{AppendixBoxs2, Formcard,EditGridCardS,DetailsBoxs,AppendixBoxs},
     data () {
         return {
             curlEditObject:'',
@@ -68,7 +70,8 @@ export default {
             modulecode:'',
             billAppendixConfig:{
                 showAppendix:false,
-                appendixKey:'billno'
+                appendixKey:'billno',
+                showAppendix2:false
             },
             billapprovalUrl:'',
             showAffix:true,
@@ -78,7 +81,6 @@ export default {
     },
     created () {
         this.myConfig = Object.assign({}, this.myConfig, this.config);
-        // this.loadDynamicConfig();
         if (this.myConfig.showBtnToolbar !== undefined) {
             this.showBtnToolbar = this.myConfig.showBtnToolbar;
         }
@@ -182,6 +184,16 @@ export default {
             this.detailConfig.items.push(tmp);
             this.detailVisible.push({refname:tmp.name,visible:true});
             this.anchorData.push({id:'#'+ tmp.divId, name:tmp.title,refname:tmp.name,visible:true});
+        } else if (this.billAppendixConfig.showAppendix2) {
+            let tmp = Object.assign({}, {}, this.billAppendixConfig);
+            tmp.type = 'AppendixBox2';
+            tmp.name = 'detail_appenndix2';
+            tmp.title = '附件';
+            tmp.beforeUpload = this.beforeUpload;
+            tmp.divId = 'detail_'+ this.getRandom() + '_'+ this.detailConfig.items.length;
+            this.detailConfig.items.push(tmp);
+            this.detailVisible.push({refname:tmp.name,visible:true});
+            this.anchorData.push({id:'#'+ tmp.divId, name:tmp.title,refname:tmp.name,visible:true});
         }
 
         if (this.myConfig.showAnchorLink !== undefined) {
@@ -380,6 +392,13 @@ export default {
                     let billmoduleid = data.billmoduleid;
                     this.$refs.detail_appenndix[0].setData(billno,billmoduleid);
                 }
+            } else if (this.billAppendixConfig.showAppendix2) {
+                if (this.$refs.detail_appenndix2 && this.$refs.detail_appenndix2[0]) {
+                    let data = this.getData();
+                    let billno = data[this.billAppendixConfig.appendixKey];
+                    let billmoduleid = data.billmoduleid;
+                    this.$refs.detail_appenndix2[0].setData(billno,billmoduleid);
+                }
             }
         },
         doAction (obj) {
@@ -535,7 +554,7 @@ export default {
                                 this.$refs[el.name][0].setEffectData(temp);
                             }
                         } else {
-                            if (el.type !== 'AppendixBox') {
+                            if (el.type !== 'AppendixBox' || el.type !== 'AppendixBox2') {
                                 if (this.$refs[el.name] && this.$refs[el.name][0]) {
                                     this.$refs[el.name][0].setEffectData([]);
                                 }
@@ -593,7 +612,7 @@ export default {
                                 this.$refs[el.name][0].setData(temp);
                             }
                         } else {
-                            if (el.type !== 'AppendixBox') {
+                            if (el.type !== 'AppendixBox' || el.type !== 'AppendixBox2') {
                                 if (this.$refs[el.name] && this.$refs[el.name][0]) {
                                     this.$refs[el.name][0].setData([]);
                                 }
@@ -608,6 +627,12 @@ export default {
                     let billmoduleid = data.billmoduleid
                     this.$refs.detail_appenndix[0].setData(billno,billmoduleid);
                 }
+            } else if (this.billAppendixConfig.showAppendix2) {
+                if (this.$refs.detail_appenndix2 && this.$refs.detail_appenndix2[0]) {
+                    let billno = data[this.billAppendixConfig.appendixKey];
+                    let billmoduleid = data.billmoduleid
+                    this.$refs.detail_appenndix2[0].setData(billno,billmoduleid);
+                }
             }
             this.$nextTick(() => {
                 this.resetAnchor();
@@ -692,7 +717,7 @@ export default {
             return data;
         },
         getCommonChangeData(data, el) {
-            if (el.name === 'detail_appenndix') {
+            if (el.name === 'detail_appenndix' || el.name === 'detail_appenndix2') {
                 return;
             }
             if (this.$refs[el.name] && this.$refs[el.name][0]) {
@@ -860,7 +885,7 @@ export default {
                 if (this.detailConfig.items) {
                     this.detailConfig.items.forEach(el => {
                         if (!flag) {
-                            if (el.name !== 'detail_appenndix') {
+                            if (el.name !== 'detail_appenndix' || el.name !== 'detail_appenndix2') {
                                 if (this.$refs[el.name] && this.$refs[el.name][0]) {
                                     flag = this.$refs[el.name][0].isChange();
                                 }
@@ -1041,6 +1066,8 @@ export default {
         delAppenndix() {
             if (this.billAppendixConfig.showAppendix) {
                 this.$refs.detail_appenndix[0].dellAllfile();
+            } else if (this.billAppendixConfig.showAppendix2) {
+                this.$refs.detail_appenndix2[0].dellAllfile();
             }
         },
         updateAllfile() {
@@ -1048,6 +1075,10 @@ export default {
                 if (this.billAppendixConfig.notdelfile) {
                     this.$refs.detail_appenndix[0].updateAllfile();
                 }
+            } else if (this.billAppendixConfig.showAppendix2) {
+                if (this.billAppendixConfig.notdelfile) {
+                    this.$refs.detail_appenndix2[0].updateAllfile();
+                }
             }
         },
         getHeadData() {