Browse Source

修复代码Bug

YangZhiJie 1 year ago
parent
commit
aa2f3bc5bb

+ 1 - 1
src/api/workflow/WorkflowResource.js

@@ -58,7 +58,7 @@ export default {
         url: Common.getApiUrl2(requestUrl),
         type: 'post',
         contentType: 'application/json',
-				dataType: 'json',
+        dataType: 'json',
 				
         data: JSON.stringify(previousUserSelectCalculateRequest),
 				

+ 2 - 2
src/client/MenuWidget.vue

@@ -256,8 +256,8 @@ export default {
     search: function (inputText) {
       //判断一个节点及其子节点是否含有搜索的内容
       function filterNode(node) {
-        var name = node.name == null ? "" : node.name;
-        var nameEng = node.nameEng == null ? "" : node.nameEng;
+        var name = node.name == null ? '' : node.name;
+        var nameEng = node.nameEng == null ? '' : node.nameEng;
         if (name.indexOf(inputText) != -1 || 
           name.toLowerCase().indexOf(inputText.toLowerCase()) != -1 ||
           nameEng.indexOf(inputText) != -1 ||

+ 2 - 2
src/customer/DataImportPanel.vue

@@ -775,9 +775,9 @@ export default {
           _self.loading = false;
           
           if(data != null && data.processResult != null && data.processResult.success == true){
-            Notify.success(_self.$t("lang.DataImportPanel.describe9"), data.processResult.result, false);
+            Notify.success(_self.$t('lang.DataImportPanel.describe9'), data.processResult.result, false);
           } else {
-            Notify.error(_self.$t("lang.DataImportPanel.describe12"), data.processResult.result, false);
+            Notify.error(_self.$t('lang.DataImportPanel.describe12'), data.processResult.result, false);
           }
 
           if (_self.dataTemplateNo != null && _self.taskId != null) {

+ 0 - 1
src/sheetWindow/SearchFieldService.js

@@ -1,4 +1,3 @@
-import { response } from 'express';
 import InfoWindowResource from '../api/dic/InfoWindowResource.js';
 
 /**

+ 9 - 5
src/window/tabFormView/TabFormEdit.vue

@@ -257,15 +257,19 @@
 
     
 
-    <Modal v-model:show="verifyResultModal" @ok="saveTabData(verifyResultCommand, false)"
-      @cancel="verifyResultModal = false">
+    <Modal
+      v-model:show="verifyResultModal" @ok="saveTabData(verifyResultCommand, false)"
+      @cancel="verifyResultModal = false"
+    >
       <template #header>{{ $t("lang.tabFormEdit.verifyResult") }}</template>
       <div v-if="verifyResults != null">
-        <template v-for="verifyResult in verifyResults">
-          <div v-if="verifyResult && verifyResult.code != 0" class="alert "
+        <template v-for="(verifyResult, index) in verifyResults">
+          <div
+            v-if="verifyResult && verifyResult.code != 0" :key="index"
+            class="alert "
             :class="{ 'alert-warning': verifyResult.verifyType == 'Optional', 'alert-danger': verifyResult.verifyType == 'Mandatory' }"
             style="white-space: pre-wrap"
-            >
+          >
             {{ verifyResult.message }}
           </div>
         </template>

+ 1 - 1
src/window/tabFormView/TabFormView.vue

@@ -1780,7 +1780,7 @@ export default {
             _self.finishTask();
             _self.refresh();
           }else{
-            Notify.error("Error", data.errorMessage, 0);
+            Notify.error('Error', data.errorMessage, 0);
           }
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {

+ 7 - 7
src/window/tabGridView/TabGridEdit.vue

@@ -254,11 +254,13 @@
     <Modal v-model:show="verifyResultModal" @ok="saveTabData(verifyModelData, verifyIndex, false)" @cancel="verifyResultModal=false">
       <template #header>{{ $t("lang.tabFormEdit.verifyResult") }}</template>
       <div v-if="verifyResults != null">
-
-        <template v-for="verifyResult in verifyResults">
-          <div v-if="verifyResult && verifyResult.code != 0" class="alert "
+        <template v-for="(verifyResult,index) in verifyResults">
+          <div
+            v-if="verifyResult && verifyResult.code != 0"
+            :key="index" class="alert "
             :class="{ 'alert-warning': verifyResult.verifyType == 'Optional', 'alert-danger': verifyResult.verifyType == 'Mandatory' }"
-            style="white-space: pre-wrap">
+            style="white-space: pre-wrap"
+          >
             {{ verifyResult.message }}
           </div>
         </template>
@@ -266,8 +268,6 @@
         <p class="bg-danger" style="font-size: medium; padding: 2rem;">
           {{ $t("lang.tabFormEdit.submitConfirm") }}
         </p>
-
-
       </div>
     </Modal>
 
@@ -381,7 +381,7 @@ export default {
       verifyResultModal: false, // 校验结果模态框
       verifyResults: null,    // 校验结果
       verifyModelData: null,  // 校验的数据
-      verifyIndex: null       // 校验的编号
+      verifyIndex: null,       // 校验的编号
 
     };
   },

+ 9 - 5
src/window1/tabFormEdit/TabFormEdit.vue

@@ -257,15 +257,19 @@
 
     
 
-    <Modal v-model:show="verifyResultModal" @ok="saveTabData(verifyResultCommand, false)"
-      @cancel="verifyResultModal = false">
+    <Modal
+      v-model:show="verifyResultModal" @ok="saveTabData(verifyResultCommand, false)"
+      @cancel="verifyResultModal = false"
+    >
       <template #header>{{ $t("lang.tabFormEdit.verifyResult") }}</template>
       <div v-if="verifyResults != null">
-        <template v-for="verifyResult in verifyResults">
-          <div v-if="verifyResult && verifyResult.code != 0" class="alert "
+        <template v-for="(verifyResult,index) in verifyResults">
+          <div
+            v-if="verifyResult && verifyResult.code != 0" :key="index"
+            class="alert "
             :class="{ 'alert-warning': verifyResult.verifyType == 'Optional', 'alert-danger': verifyResult.verifyType == 'Mandatory' }"
             style="white-space: pre-wrap"
-            >
+          >
             {{ verifyResult.message }}
           </div>
         </template>

+ 9 - 5
src/window1/tabFormEdit/TabFormEditModal.vue

@@ -318,14 +318,18 @@
 
       
 
-      <a-modal v-model:open="verifyResultModal" :title="$t('lang.tabFormEdit.verifyResult')" @ok="saveTabData(verifyResultCommand, false)"
-        @cancel="verifyResultModal = false">
+      <a-modal
+        v-model:open="verifyResultModal" :title="$t('lang.tabFormEdit.verifyResult')" @ok="saveTabData(verifyResultCommand, false)"
+        @cancel="verifyResultModal = false"
+      >
         <div v-if="verifyResults != null">
-          <template v-for="verifyResult in verifyResults">
-            <div v-if="verifyResult && verifyResult.code != 0" class="alert "
+          <template v-for="(verifyResult,index) in verifyResults">
+            <div
+              v-if="verifyResult && verifyResult.code != 0" :key="index"
+              class="alert "
               :class="{ 'alert-warning': verifyResult.verifyType == 'Optional', 'alert-danger': verifyResult.verifyType == 'Mandatory' }"
               style="white-space: pre-wrap"
-              >
+            >
               {{ verifyResult.message }}
             </div>
           </template>

+ 1 - 1
src/window1/tabFormView/TabFormView.vue

@@ -1780,7 +1780,7 @@ export default {
             _self.finishTask();
             _self.refresh();
           }else{
-            Notify.error("Error", data.errorMessage, 0);
+            Notify.error('Error', data.errorMessage, 0);
           }
           
         },

+ 1 - 1
src/window1/tabFormView/TabFormViewModal.vue

@@ -1803,7 +1803,7 @@ export default {
             _self.finishTask();
             _self.refresh();
           }else{
-            Notify.error("Error", data.errorMessage, 0);
+            Notify.error('Error', data.errorMessage, 0);
           }
           
         },

+ 6 - 2
src/window1/tabGridView/NewTabButton.vue

@@ -163,6 +163,10 @@ import ProcessReportResource from '../../api/dic/ProcessReportResource.js';
 
 import { Spin as ASpin, Empty as AEmpty, message } from 'ant-design-vue';
 import { CssUtil } from 'pc-component-v3';
+
+import { useI18n} from 'vue-i18n';
+const { t } = useI18n();
+
 import {
   PlusSquareTwoTone,
   DeleteTwoTone,
@@ -615,7 +619,7 @@ const execute = async function (tabButton) {
             switchFormRoute(tabButton);
           }
         }else{
-          Notify.error(_self.$t('lang.Notify.error'), successData.errorMessage, true);
+          Notify.error(t('lang.Notify.error'), successData.errorMessage, true);
         }
 
         
@@ -649,7 +653,7 @@ const execute = async function (tabButton) {
     HtmlWindowResource.uniqueByNo(tabButton.htmlWindowNo).then(
       response => {
         if (response.errorCode != 0) {
-          Notify.error(_self.$t('lang.Notify.dataDictionaryError'), response.errorMessage, true);
+          Notify.error(t('lang.Notify.dataDictionaryError'), response.errorMessage, true);
           return;
         }
 

+ 7 - 7
src/window1/tabGridView/TabGridEdit.vue

@@ -122,11 +122,13 @@
   <Modal v-model:show="verifyResultModal" @ok="saveTabData(verifyModelData, verifyIndex, false)" @cancel="verifyResultModal=false">
     <template #header>{{ $t("lang.tabFormEdit.verifyResult") }}</template>
     <div v-if="verifyResults != null">
-
-      <template v-for="verifyResult in verifyResults">
-        <div v-if="verifyResult && verifyResult.code != 0" class="alert "
+      <template v-for="(verifyResult,index) in verifyResults">
+        <div
+          v-if="verifyResult && verifyResult.code != 0"
+          :key="index" class="alert "
           :class="{ 'alert-warning': verifyResult.verifyType == 'Optional', 'alert-danger': verifyResult.verifyType == 'Mandatory' }"
-          style="white-space: pre-wrap">
+          style="white-space: pre-wrap"
+        >
           {{ verifyResult.message }}
         </div>
       </template>
@@ -134,8 +136,6 @@
       <p class="bg-danger" style="font-size: medium; padding: 2rem;">
         {{ $t("lang.tabFormEdit.submitConfirm") }}
       </p>
-
-
     </div>
   </Modal>
 
@@ -291,7 +291,7 @@ export default {
       verifyResultModal: false, // 校验结果模态框
       verifyResults: null,    // 校验结果
       verifyModelData: null,  // 校验的数据
-      verifyIndex: null       // 校验的编号
+      verifyIndex: null,       // 校验的编号
 
     };
   },

+ 5 - 6
src/workflow/ApproveComment.vue

@@ -43,7 +43,6 @@
       </div>
 
       <div>
-        
         <h2>
           {{ (currentTaskInfo == null || currentTaskInfo.description == null) ? '' : currentTaskInfo.description }}
         </h2>
@@ -78,17 +77,17 @@
           <!-- 表单属性 -->
 
           <ApproveForm
-            ref="approveForm" :process-instance-id="processInstanceId" :workflow="workFlow"
-            :task-id="taskInfoId" @value-changed="approveFormValueChanged"
-            v-if="currentTaskInfo.category != 'MandatoryTask'"
+            v-if="currentTaskInfo.category != 'MandatoryTask'" ref="approveForm" :process-instance-id="processInstanceId"
+            :workflow="workFlow" :task-id="taskInfoId"
+            @value-changed="approveFormValueChanged"
           />
 
-          <div class="form-group" v-if="currentTaskInfo.category != 'MandatoryTask'">
+          <div v-if="currentTaskInfo.category != 'MandatoryTask'" class="form-group">
             <label class="control-label">{{ $t("lang.approveComment.opinion") }}</label>
             <textarea v-model="comment" class="form-control" rows="3" />
           </div>
 
-          <ApproveTaskAttachmentEdit :task-id="taskInfoId" v-if="currentTaskInfo.category != 'MandatoryTask'" />
+          <ApproveTaskAttachmentEdit v-if="currentTaskInfo.category != 'MandatoryTask'" :task-id="taskInfoId" />
         </div>
 
 

+ 1 - 1
src/workflow/ApprovedWorkflow.vue

@@ -36,7 +36,7 @@
           v-if="record.category != 'CurdWindow'"
           style="white-space: pre-line"
         >{{ record.description }}</span>
-        <span v-else style="white-space: pre-line">{{ record.description }} <br> {{ record.content }}</span>
+        <span v-else style="white-space: pre-line">{{ record.description }} <br /> {{ record.content }}</span>
       </template>
       <template v-if="column.key === 'documentStatus'">
         <a-tag v-if="record.documentStatus === '已完成'" color="success">

+ 1 - 1
src/workflow/MyApplyWorkflow.vue

@@ -24,7 +24,7 @@
   >
     <template #bodyCell="{ column, record }">
       <template v-if="column.key === 'description'">
-        <span style="white-space: pre-line">{{ record.description }} <br>{{ record.content }}</span>
+        <span style="white-space: pre-line">{{ record.description }} <br />{{ record.content }}</span>
       </template>
       <template v-if="column.key === 'documentStatus'">
         <a-tag v-if="record.documentStatus === '已完成'" color="success">

+ 1 - 1
src/workflow/NeedApproveWorkflow.vue

@@ -36,7 +36,7 @@
           v-if="record.category != 'CurdWindow'"
           style="white-space: pre-line"
         >{{ record.description }}</span>
-        <span v-else style="white-space: pre-line">{{ record.description }} <br> {{ record.content }}</span>
+        <span v-else style="white-space: pre-line">{{ record.description }} <br /> {{ record.content }}</span>
       </template>
       <template v-if="column.key === 'operation'">
         <a-button type="link" @click="selectTaskInfo(record)">

+ 1 - 1
src/workflow/NotApproveWorkflow.vue

@@ -24,7 +24,7 @@
   >
     <template #bodyCell="{ column, record }">
       <template v-if="column.key === 'description'">
-        <span style="white-space: pre-line">{{ record.description }} <br> {{ record.content }}</span>
+        <span style="white-space: pre-line">{{ record.description }} <br /> {{ record.content }}</span>
       </template>
       <template v-if="column.key === 'documentStatus'">
         <a-tag v-if="record.documentStatus === '已完成'" color="success">