ocpview-plus 1.3.8 → 1.3.10

package/package.json

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

package/src/components/masterplate/billdetailform.vue

@@ -32,7 +32,7 @@ import EditGridCardS from './editgridcard.vue';
 import DetailsBoxs from './detailsbox.vue';
 import AppendixBoxs from './appendix.vue';
 import AppendixBoxs2 from './contractappendix.vue';
-import FormCardBox2 from '../form/FormCardBox2.vue';
+import FormCardBox2 from '../form/formcardbox2.vue';
 import random from '../../utils/random_str';
 import Formcard from './formcard.vue';
 export default {

package/src/components/masterplate/contractappendix.vue

@@ -199,11 +199,11 @@ export default {
         if (this.myConfig.fileSize !== undefined) {
             this.fileSize = Number(this.myConfig.fileSize) * 1024;
         }
-        if (this.myConfig.notdelfile) {
-            this.myConfig.items[0].visible = true;
-        } else {
-            this.myConfig.items[0].visible = false;
-        }
+        // if (this.myConfig.notdelfile) {
+        //     this.myConfig.items[0].visible = true;
+        // } else {
+        //     this.myConfig.items[0].visible = false;
+        // }
 
         if (this.myConfig.uploadfile.indexOf('?') != -1) {
             this.uploadfile = this.myConfig.uploadfile + '&token=' + this.getToken();

package/src/components/picturebox/filebox.vue

@@ -10,10 +10,10 @@
     >
     <template #prepend>
         <p  v-if="!filename" @click.stop="uploadClick" style="cursor:pointer;width:30px">
-            <Icon custom="iconfont icon-custom-shangchuanlogo"  :color="iconColor"/>                         
+            <Icon custom="iconfont icon-custom-shangchuanlogo"  :color="iconColor"/>
         </p>
          <p v-else @click.stop="uploadClick" style="cursor:pointer;width:30px">
-            <Icon type="md-checkmark-circle" size="18" :color="iconColor2"/>                     
+            <Icon type="md-checkmark-circle" size="18" :color="iconColor2"/>
         </p>
     </template>
     </Input>
@@ -22,20 +22,20 @@
               <Col v-if="showPreview" style="cursor:pointer">
                  <p  @click.stop="searchFile">
                     预览
-                 </p>    
+                 </p>
               </Col>
               <Col style="cursor:pointer" v-if="showDownBtn" >
                 <p  @click.stop="downFile">
                     下载
-                 </p>   
+                 </p>
               </Col>
                <Col style="cursor:pointer"  v-if="!myConfig.readOnly && showDelBtn">
                 <p  @click.stop="delFile">
                     删除
-                 </p>   
+                 </p>
               </Col>
 
-          </Row>    
+          </Row>
      </div>
      <div ref="photo" v-show="false">
         <li><img  :src="imgUrl" :data-original="`${imgUrl}`" style="width: 100%; height: 100%;" /></li>
@@ -68,6 +68,7 @@
                     notdelfile:'N',
                     downfile:'',
                     delfile:'',
+                    pdffile:'/mss-sysconf-boot/downloadPdf?filekey=',
                     scenetype:'1',
                     proName:{
                         'billmoduleid':'billmoduleid',
@@ -104,14 +105,14 @@
                     return '#e3e5e8';
                 } else {
                     return '#f3b352'
-                }    
+                }
             },
             iconColor2 () {
                 if (this.myConfig.readOnly) {
                     return '#e3e5e8';
                 } else {
                     return '#739943'
-                }    
+                }
             }
         } ,
         props:{
@@ -137,7 +138,7 @@
                 if (this.myConfig.headers !== undefined) {
                     this.headers = Object.assign({},this.headers,this.myConfig.headers);
                 }
-            
+
                 if (!this.myConfig.downfile) {
                     this.myConfig.downfile =  this.OmdUrl.downfile;
                 }
@@ -147,9 +148,12 @@
                 if (!this.myConfig.uploadfile) {
                     this.myConfig.uploadfile =  this.OmdUrl.uploadfile;
                 }
+                if (!this.myConfig.pdffile) {
+                    this.myConfig.pdffile = this.OmdUrl.pdffile;
+                }
                 let usercode = this.getUserCode();
                 let username = this.getUserName();
-                
+
                 let userInfo = '&usercode=' + usercode + '&username=' + username + '&ent_id=' + this.getEnt_id();
                 let notdelfile = this.myConfig.notdelfile;
                 if  (this.myConfig.notdelfile !== undefined) {
@@ -304,7 +308,7 @@
                 if (obj.readOnly === false) {
                     if (this.config.readOnly !== true) {
                         this.setPro(obj);
-                    } 
+                    }
                 } else {
                     this.setPro(obj);
                 }
@@ -341,7 +345,7 @@
             isHeadersOk() {
                 let flag = true;
                 for (let pro in this.headers) {
-                    if (!this.headers[pro]) {                          
+                    if (!this.headers[pro]) {
                         flag = false;
                         break;
                     }
@@ -359,7 +363,7 @@
                 } else {
                     this.$refs.myControl.blur();
                 }
-            } 
+            }
         }
     };
-</script>
+</script>