Merge branch 'master' of http://106.52.242.177:3000/askqvn/crm-app

pages/wareHouse/components/add.vue

@@ -166,9 +166,9 @@
                             <u--textarea v-model="formData.recycleBottomDesc" clearable count autoHeight maxlength="250"
                                 height="100" confirmType="done"></u--textarea>
                             <view class="imgs_scroll">
-                                <ImgsRowScroll v-if="formData.recycleBottomPicList.length > 0" :isShowDeleteIcon="true"
+                                <ImgsRowScroll v-if="formData.recycleBottomFileList.length > 0" :isShowDeleteIcon="true"
                                     @deleteImgInfo="getDeleteRecycleBottomPicInfo" imgMode="aspectFill"
-                                    :totalWidth="400" :images="formData.recycleBottomPicList" :previewEnabled="true"
+                                    :totalWidth="400" :images="formData.recycleBottomFileList" :previewEnabled="true"
                                     :imageWidth="150" :imageHeight="150"></ImgsRowScroll>
                                 <u-upload @afterRead="afterReadRecycleBottom" name="1" multiple :maxCount="1"
                                     accept="image"></u-upload>
@@ -300,7 +300,7 @@ export default {
                 recyclePerson: '',
                 recyclePersonId: '',
                 recycleBottomDesc: '',
-                recycleBottomPicList: [],//回收留底图
+                recycleBottomFileList: [],//回收留底图
                 recycleTime: this.$dayjs().format('YYYY-MM-DD'),
                 indentifyCode: '',
                 targetAudience: '',
@@ -528,7 +528,7 @@ export default {
                 recyclePerson: '',
                 recyclePersonId: '',
                 recycleBottomDesc: '',
-                recycleBottomPicList: [],//回收留底图
+                recycleBottomFileList: [],//回收留底图
                 recycleTime: this.$dayjs().format('YYYY-MM-DD'),
                 indentifyCode: '',
                 targetAudience: '',
@@ -674,13 +674,13 @@ export default {
         },
         // 获取删除回收留底图信息
         getDeleteRecycleBottomPicInfo(info) {
-            this.formData.recycleBottomPicList = info.newImages
+            this.formData.recycleBottomFileList = info.newImages
         },
         // 新增回收留底图
         async afterReadRecycleBottom(event) {
             event.file.forEach(item => {
                 uni.$u.api.uploadFile(item.url).then((res) => {
-                    this.formData.recycleBottomPicList.push(res.data.url);
+                    this.formData.recycleBottomFileList.push(res.data.url);
                     uni.$u.toast("文件上传成功");
                 }).catch(() => {
                     uni.$u.toast("上传文件失败");

pages/wareHouse/components/searchFilter.vue

@@ -65,7 +65,7 @@ export default {
                 recyclePersonId: '',
                 identifyingPerson:'',
                 identifyingPersonId: '',
-                productAttribute: '',
+                productAttribute: [],
             },
             recycleTimeDefault: new Date().getTime(),
             recycleTimeShow: false,