centaline-data-driven 1.4.8 → 1.4.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.8",
+  "version": "1.4.10",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1583031531402825728"} ,
+        apiParam: {actionType: 1,chanceID: "1590537844491948032"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/commissionmanage/apply'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,21 @@
     data() {
       return {
         apiParam:{
-          
+          actionType
+: 
+"1",
+originalTraId
+: 
+"1590164845049495554",
+pageOnly
+: 
+"true",
+pageStyle
+: 
+"2",
+pageTitle
+: 
+"成交报告",
         },
         topHeight:10,
       }

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -53,6 +53,16 @@
     },
     methods: {
       load(data) {
+        if(data.options && data.code1){
+          var checked = data.code1 === '' ? [] : [].concat(JSON.parse(data.code1));
+          checked.forEach((n) => {
+            let ic=data.options.findIndex((op) => { return op.code === n.code });
+            if(ic===-1){
+              n.flagDeleted=true;
+            }
+          });
+          data.code1 = JSON.stringify(checked);
+        }
         this.model = data;
       },
       clearClickHandle: function (event) {

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -62,7 +62,7 @@
               </el-dropdown>
             </span>
           </div>
-          <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress" :width="96" :height="96" class="file-cirle"></el-progress>
+          <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress.toFixed(2)" :width="96" :height="96" class="file-cirle"></el-progress>
         </div>
       </el-upload>
     </template>
@@ -128,7 +128,7 @@
               </el-dropdown>
             </span>
           </div>
-          <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress" :width="96" :height="96" class="file-cirle"></el-progress>
+          <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress.toFixed(2)" :width="96" :height="96" class="file-cirle"></el-progress>
         </div>
       </el-upload>
     </template>
@@ -329,7 +329,7 @@
             return false;
           }
         }
-        if (this.model.min && this.model.required) {
+        if (this.model.min) {
           if (this.model.getfileListLength() < this.model.min) {
             //change时需要判断有没有上传图片如果没有图片则不提示
             if (eventName == "change" && this.model.getfileListLength() > 0) {
@@ -425,28 +425,9 @@
         let url = this.model.action; //上传文件接口
         let uid = this.uploadguid();
         try {
-          let awaitfile = {
-            "url": "",
-            "source": "",
-            "mediaUrl": "",
-            "fileName": "",
-            "flagDefault": "",
-            "mediaTypeID": "",
-            "flagDeleted": "",
-            "actionType": "",
-            "rightDel": "",
-            "rightEdit": "",
-            "rightDownload": "",
-            "mediaLabelID": "",
-            "mediaLabelName": "",
-            "fileExtension": "",
-            "progressFlag": true,
-            "loadProgress": 0,
-            "uid": uid,
-          }
-          this.model.fileList.push(awaitfile);
-
           file.uid = uid;
+
+          this.model.addfileItem(file);
           const res = await uploadByPieces(this.model.action, { file }, this.uploadpro, options);
           return res;
 
@@ -461,19 +442,24 @@
         return (this.S4() + this.S4() + '-' + this.S4() + '-' + this.S4() + '-' + this.S4() + '-' + this.S4() + this.S4() + this.S4());
       },
       uploadpro(uploadOptions, res, xhr) {
-
+        const { file, onProgress, onSuccess, onError } = uploadOptions;
         if (xhr.status >= 400) {
           this.$message.error(res);
+          file.source = { "actionType": 2 };
+          this.model.deleteFile(file, false);
+          this.selfValidExcute("remove");
         }
         else if (xhr.status == 0) {
           this.$message.error(res);
+          file.source= { "actionType": 2 } ;
+          this.model.deleteFile(file, false);
+          this.selfValidExcute("remove");
         }
         else if (xhr.status == 200) {
           if (res.rtnCode != 200 && res.rtnMsg != "") {
             this.$message.error(res.rtnMsg);
             return;
           }
-          const { file, onProgress, onSuccess, onError } = uploadOptions;
           const Progress = Math.min(100, Math.floor(1E4 * parseInt(res.content.nextOffSet) / parseInt(file.size)) / 100);
           this.model.setByPieces(res, Progress, file);