Parcourir la source

3.0.19. 修复控件v-model的bug。

杨志杰 il y a 3 ans
Parent
commit
71ce14a9c0

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.18",
+  "version": "3.0.19",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

+ 1 - 1
src/client/DateExcelReport.vue

@@ -66,7 +66,7 @@ export default {
     excelReport: function () {
       let _self = this;
       if (_self.startDate != null && _self.endDate != null) {
-        let previewExcelUrl = '/plugin/x-spreadsheet/index.html?processReportNo=' + _self.processReportNo + '&startDate=' + _self.startDate + '&endDate=' + _self.endDate;
+        let previewExcelUrl = '/static/x-spreadsheet/index.html?processReportNo=' + _self.processReportNo + '&startDate=' + _self.startDate + '&endDate=' + _self.endDate;
         _self.previewExcelUrl = previewExcelUrl;
         window.open(_self.previewExcelUrl);
       }

+ 3 - 3
src/client/DelegationReport.vue

@@ -70,14 +70,14 @@ export default {
       if (_self.startDate != null && _self.endDate != null) {
         let startDate = _self.startDate + ' 00:00:00';
         let endDate = _self.endDate + ' 23:59:59';
-        let previewExcelUrl = 'plugin/x-spreadsheet/index.html?processReportNo=' + processReportNo + '&startDate=' + startDate + '&endDate=' + endDate;
+        let previewExcelUrl = '/static/x-spreadsheet/index.html?processReportNo=' + processReportNo + '&startDate=' + startDate + '&endDate=' + endDate;
         window.open(previewExcelUrl);
       }
 
       if(_self.taskCompleteStartDate != null && _self.taskCompleteEndDate != null){
         let taskCompleteStartDate = _self.taskCompleteStartDate + ' 00:00:00';
         let taskCompleteEndDate = _self.taskCompleteEndDate + ' 23:59:59';
-        let previewExcelUrl = 'plugin/x-spreadsheet/index.html?processReportNo=' 
+        let previewExcelUrl = '/static/x-spreadsheet/index.html?processReportNo=' 
           + processReportNo + '&taskCompleteStartDate=' 
           + taskCompleteStartDate + '&taskCompleteEndDate=' 
           + taskCompleteEndDate;
@@ -89,7 +89,7 @@ export default {
         let endDate = _self.endDate + ' 23:59:59';
         let taskCompleteStartDate = _self.taskCompleteStartDate + ' 00:00:00';
         let taskCompleteEndDate = _self.taskCompleteEndDate + ' 23:59:59';
-        let previewExcelUrl = 'plugin/x-spreadsheet/index.html?processReportNo=' 
+        let previewExcelUrl = '/static/x-spreadsheet/index.html?processReportNo=' 
           + processReportNo + '&startDate=' 
           + startDate + '&endDate=' + endDate + '&taskCompleteStartDate=' 
           + taskCompleteStartDate + '&taskCompleteEndDate=' + taskCompleteEndDate;

+ 1 - 1
src/client/ExcelReport.vue

@@ -71,7 +71,7 @@ export default {
           processReportNo = '20221228_094705';
         }
       }
-      let previewExcelUrl = '/static/plugin/x-spreadsheet/index.html?processReportNo=' + processReportNo;
+      let previewExcelUrl = '/static/x-spreadsheet/index.html?processReportNo=' + processReportNo;
       _self.previewExcelUrl = previewExcelUrl;
       window.open(_self.previewExcelUrl);
     },

+ 2 - 2
src/customer/BarCodeEdit.vue

@@ -62,7 +62,7 @@
           >
             <iframe
               id="mIframe0"
-              src="../../..plugin/ZPL-Label-Designer-master/label_designer.html"
+              src="/static/ZPL-Label-Designer-master/label_designer.html"
               width="100%"
               height="100%"
             />
@@ -74,7 +74,7 @@
           >
             <iframe
               id="mIframe1"
-              src="../../..plugin/ZPL-Label-Designer-master/label_designer.html"
+              src="/static/ZPL-Label-Designer-master/label_designer.html"
               width="100%"
               height="100%"
             />

+ 4 - 0
src/widget/RedGreenSelect.vue

@@ -7,6 +7,10 @@
 
 <script>
 export default {
+  model: {
+    prop: 'modelValue',
+    event: 'input',
+  },
   
 
   props: {

+ 6 - 10
src/window/filter/AndOr.vue

@@ -1,23 +1,19 @@
 <template>
   <div
     class="svg-logo"
-    @click="$emit('input', !value)"
+    @click="$emit('update:modelValue', !modelValue)"
   >
-    <embed
-      v-if="value"
+    <img
+      v-if="modelValue"
       src="/static/assets/client-base-v4/image/svg/or.svg"
       class="svg-logo"
-      style="pointer-events: none;"
       title="或"
-      type="image/svg+xml"
     />
-    <embed
+    <img
       v-else
       src="/static/assets/client-base-v4/image/svg/and.svg"
       class="svg-logo"
-      style="pointer-events: none;"
       title="且"
-      type="image/svg+xml"
     />
   </div>
 </template>
@@ -26,13 +22,13 @@
 
 export default {
   props: {
-    value: {
+    modelValue: {
       type:Boolean,
       default: null,
     },
   },
 
-  emits: ['input'],
+  emits: ['update:modelValue'],
 };
 </script>
 

+ 6 - 10
src/window/filter/CaseSensitive.vue

@@ -1,23 +1,19 @@
 <template>
   <div
     class="svg-logo"
-    @click="$emit('input', !value)"
+    @click="$emit('update:modelValue', !modelValue)"
   >
-    <embed
-      v-if="!value"
+    <img
+      v-if="!modelValue"
       src="/static/assets/client-base-v4/image/svg/case-not-sensitive.svg"
       class="svg-logo"
-      style="pointer-events: none;"
       title="大小写不敏感"
-      type="image/svg+xml"
     />
-    <embed
+    <img
       v-else
       src="/static/assets/client-base-v4/image/svg/case-sensitive.svg"
       class="svg-logo"
-      style="pointer-events: none;"
       title="大小写敏感"
-      type="image/svg+xml"
     />
   </div>
 </template>
@@ -26,13 +22,13 @@
 
 export default {
   props: {
-    value: {
+    modelValue: {
       type:Boolean,
       default: null,
     },
   },
 
-  emits: ['input'],
+  emits: ['update:modelValue'],
 };
 </script>
 

+ 5 - 5
src/workflow/ApproveComment.vue

@@ -808,7 +808,7 @@ export default {
         if(isAutoFlow == 'false'){
           let totalAmountUSD = _self.modelData.data.totalAmountUSD.displayValue[0];
           if(totalAmountUSD < 5000){
-            let url = 'plugin/x-spreadsheet/index.html?processReportNo=20221110_200758&recordId=' + _self.recordId;
+            let url = '/static/x-spreadsheet/index.html?processReportNo=20221110_200758&recordId=' + _self.recordId;
             window.open(url);
             // window.layer.open({
             //   title: '查看ADA审批人报告',
@@ -820,7 +820,7 @@ export default {
             // });
           }
           if(totalAmountUSD > 5000){
-            let url = 'plugin/x-spreadsheet/index.html?processReportNo=20221117_022208&recordId=' + _self.recordId;
+            let url = '/static/x-spreadsheet/index.html?processReportNo=20221117_022208&recordId=' + _self.recordId;
             window.open(url);
             // window.layer.open({
             //   title: '查看ADA审批人报告',
@@ -833,7 +833,7 @@ export default {
           }
           
         }else{
-          let url = 'plugin/x-spreadsheet/index.html?processReportNo=20221117_013808&recordId=' + _self.recordId;
+          let url = '/static/x-spreadsheet/index.html?processReportNo=20221117_013808&recordId=' + _self.recordId;
           window.open(url);
           // window.layer.open({
           //   title: '查看Auto_ADA审批人报告',
@@ -848,7 +848,7 @@ export default {
       if(_self.windowNo == '20220703_174047'){
         let totalAmountUSD = _self.modelData.data.totalAmountUSD.displayValue[0];
         if(totalAmountUSD < 5000){
-          let url = 'plugin/x-spreadsheet/index.html?processReportNo=20221110_204424&recordId=' + _self.recordId;
+          let url = '/static/x-spreadsheet/index.html?processReportNo=20221110_204424&recordId=' + _self.recordId;
           window.open(url);
           // window.layer.open({
           //   title: '查看ATA审批人报告',
@@ -860,7 +860,7 @@ export default {
           // });
         }
         if(totalAmountUSD > 5000){
-          let url = 'plugin/x-spreadsheet/index.html?processReportNo=20221117_025516&recordId=' + _self.recordId;
+          let url = '/static/x-spreadsheet/index.html?processReportNo=20221117_025516&recordId=' + _self.recordId;
           window.open(url);
           // window.layer.open({
           //   title: '查看ATA审批人报告',

+ 1 - 1
src/workflow/ReportApprove.vue

@@ -297,7 +297,7 @@ export default {
 
   methods: {
     openReport: function(){
-      window.open('plugin/x-spreadsheet/index.html?processReportNo=' + this.processReportNo + '&recordId=' + this.recordId);
+      window.open('/static/x-spreadsheet/index.html?processReportNo=' + this.processReportNo + '&recordId=' + this.recordId);
     },
     /**
      * 初始化界面的参数