Browse Source

bug修改

asd26269546 1 year ago
parent
commit
176bf81788

+ 7 - 4
src/utils/axios.js

@@ -128,7 +128,7 @@ export function get(url, params = {}) {
       .then(response => {
         setTimeout(() => {
           closeToast()
-        }, 500)
+        }, 800)
         resolve(response);
       }, err => {
         reject(err)
@@ -136,7 +136,6 @@ export function get(url, params = {}) {
   })
 }
 
-
 /**
 * 封装post请求
 * @param url
@@ -160,11 +159,15 @@ export function post(url, data = {}, method = 'post',headers = {}) {
       data: data,
       headers: {...headers}
     }).then(res => {
-      closeToast()
+      setTimeout(() => {
+        closeToast()
+      }, 800)
       resolve(res);
     }).catch(err => {
       reject(err)
-      closeToast()
+      setTimeout(() => {
+        closeToast()
+      }, 800)
     })
   })
 }

+ 4 - 4
src/views/processApproval/components/SendSubscribe.vue

@@ -59,8 +59,8 @@
 								:name="$t('purchased.procurementDescription')"
 								:label="$t('purchased.procurementDescription')"
 								:placeholder="$t('purchased.pleaseFillInTheProcurementDescription')"
-								:rules="[{ required: true, message: $t('purchased.procurementDescriptionCanNotBeEmpty') }]"
-								required
+								
+								
 								rows="3"
 							/>
 						</van-cell-group>
@@ -161,9 +161,9 @@
 							</thead>
 							<tbody>
 								<tr v-for="(i,index) in formData.subscribeDetailList" :key="index">
-									<td>{{ i.name }}</td>
+									<td>{{ i.name || i.bussinessName }}</td>
 									<td>{{ i.count }}</td>
-									<td>{{ i.remark }}</td>
+									<td>{{ i.remark || i.content }}</td>
 								</tr>
 							</tbody>
 						</table>

+ 15 - 14
src/views/product-material/standard-product-library/add.vue

@@ -183,20 +183,21 @@ onMounted(() => {
         formData.data = resDetail.data
         
       });
-      // proxy.post("/fileInfo/getList", { businessIdList: [route.query.id] }).then((res) => {
-      //   if (res.data[route.query.id] && res.data[route.query.id].length > 0) {
-      //     formData.value.fileList = res.data[route.query.id];
-      //     fileList.value = res.data[route.query.id].map((item) => {
-      //       return {
-      //         ...item,
-      //         url: item.fileUrl,
-      //       };
-      //     });
-      //   } else {
-      //     formData.value.fileList = [];
-      //     fileList.value = [];
-      //   }
-      // });
+      proxy.post("/fileInfo/getList", { businessIdList: [route.query.id] }).then((res) => {
+        if (res.data[route.query.id] && res.data[route.query.id].length > 0) {
+          res.data[route.query.id] = res.data[route.query.id].map((item) => {
+            return {
+              ...item,
+              url: item.fileUrl,
+            };
+          });
+          formData.data.fileList = res.data[route.query.id];
+          console.log(formData.data)
+        } else {
+          formData.value.fileList = [];
+          fileList.value = [];
+        }
+      });
     }else {
       
     }