Browse Source

去除关闭代码

seimin 1 year ago
parent
commit
82ca991803
2 changed files with 53 additions and 6 deletions
  1. 2 2
      src/views/processing.vue
  2. 51 4
      src/views/summaryOrder.vue

+ 2 - 2
src/views/processing.vue

@@ -172,10 +172,10 @@
172 172
                         : "请选择故障现象"
173 173
                     }}</cube-button>
174 174
                   </cube-form-item>
175
-                  <cube-form-item
175
+                  <!--<cube-form-item
176 176
                     :field="fields[2]"
177 177
                     v-if="order == 1"
178
-                  ></cube-form-item>
178
+                  ></cube-form-item>-->
179 179
                   <cube-form-item
180 180
                     :field="fields[20]"
181 181
                     v-if="order == 1"

+ 51 - 4
src/views/summaryOrder.vue

@@ -42,6 +42,9 @@
42 42
             <div class="handlerInfo">
43 43
                 <cube-form :model="model" @validate="validateHandler">
44 44
                   <cube-form-group>
45
+                    <cube-form-item :field="fields[1]" class="btn_plcaeholde" v-if="isShowDes">
46
+                      <cube-button @click="showCategoryPicker()">{{ selectedCategoryTxt ? selectedCategoryTxt : "请选择故障现象" }}</cube-button>
47
+                    </cube-form-item>
45 48
                     <cube-form-item :field="fields[3]" class="incidentTitle" v-if="isShowDes">
46 49
                       <div class="titleRefer">
47 50
                         <textarea class="titleTxtArea fl" placeholder="请输入处理方案" v-model="incidentTitle" @input="inpTitle()"></textarea>
@@ -49,10 +52,23 @@
49 52
                       </div>
50 53
                     </cube-form-item>
51 54
                     <cube-form-item :field="fields[0]"></cube-form-item>
52
-                    <cube-form-item :field="fields[1]" class="btn_plcaeholde" v-if="isShowDes">
53
-                      <cube-button @click="showCategoryPicker()">{{ selectedCategoryTxt ? selectedCategoryTxt : "请选择故障现象" }}</cube-button>
54
-                    </cube-form-item>
55
-                    <cube-form-item :field="fields[2]" v-if="isShowDes"></cube-form-item>
55
+
56
+                    <div class="label formLabel">
57
+                      处理图片
58
+                      <span>(最多可上传3张JPG或PNG,每张不能超过10M)</span>
59
+                    </div>
60
+                    <div class="uplod">
61
+                      <cube-upload
62
+                        ref="upload"
63
+                        :max="3"
64
+                        :action="action"
65
+                        :simultaneous-uploads="3"
66
+                        @files-added="filesAdded"
67
+                        @file-submitted="fileSubmitted"
68
+                      />
69
+                    </div>
70
+
71
+                    <!-- <cube-form-item :field="fields[2]" v-if="isShowDes"></cube-form-item> -->
56 72
 
57 73
 
58 74
                     <cube-form-item :field="fields[10]">
@@ -206,6 +222,11 @@ const solution = {
206 222
 export default {
207 223
   data() {
208 224
     return {
225
+      action: {
226
+        target:
227
+          this.$host + "/service/common/common/uploadAttachment/incident/",
228
+        data: {}
229
+      },
209 230
       incidentTitle: "", //处理方案
210 231
       evt: null,
211 232
       isShowDrawer: false,
@@ -565,6 +586,28 @@ export default {
565 586
     };
566 587
   },
567 588
   methods: {
589
+    filesAdded(files) {
590
+      let hasIgnore = false;
591
+      const maxSize = 1000 * 1024 * 1024; // 1M
592
+      for (let k in files) {
593
+        const file = files[k];
594
+        if (file.size > maxSize) {
595
+          file.ignore = true;
596
+          hasIgnore = true;
597
+        }
598
+      }
599
+      hasIgnore &&
600
+        this.$createToast({
601
+          type: "warn",
602
+          time: 1000,
603
+          txt: "不能上传超过100M的文件"
604
+        }).show();
605
+      // 暂停上传
606
+      this.$refs.upload.pause();
607
+    },
608
+    fileSubmitted(files) {
609
+      this.action.data = { fileName: files.name };
610
+    },
568 611
     // 输入处理方案
569 612
     inpTitle() {
570 613
       this.model.handleDescription = this.incidentTitle;
@@ -1122,6 +1165,9 @@ export default {
1122 1165
           )
1123 1166
           .then((res) => {
1124 1167
             if (res.data) {
1168
+              setTimeout(() => {
1169
+                this.$refs.upload.start();
1170
+              }, 100);
1125 1171
               this.dialog = this
1126 1172
                 .$createDialog({
1127 1173
                   type: "alert",
@@ -1151,6 +1197,7 @@ export default {
1151 1197
   mounted() {
1152 1198
     console.log(this.$route);
1153 1199
     console.log(this.modelData, this.model, 999);
1200
+    this.action.target += this.$route.params.processInstanceId;
1154 1201
 
1155 1202
     this.changeHandleTypes();
1156 1203
     this.getInfo();