Merge branch 'hotfix/Hotfix-zh-309' into develop

# Conflicts:
#	src/views/supply/sales/components/sales_detail.vue

src/components/Common/file-upload.vue

@@ -3,14 +3,16 @@
     <el-upload
       :action="oss_url"
       :data="dataObj"
-      :multiple="false"
+      :multiple="multiple"
       :show-file-list="isShowFileList"
       :file-list="fileList"
       :before-upload="beforeUpload"
       :on-remove="handleRemove"
       :on-success="handleUploadSuccess"
     >
-      <el-button size="small" type="primary">{{ fileList.length == 0 ? '点击上传' : '重新上传' }}</el-button>
+      <el-button size="small" type="primary">{{
+        multiple ? '点击上传' : fileList.length == 0 ? '点击上传' : '重新上传'
+      }}</el-button>
     </el-upload>
   </div>
 </template>
@@ -21,6 +23,10 @@ export default {
   name: 'fileUpload',
   props: {
     fileList: Array,
+    multiple: {
+      type: Boolean,
+      default: false
+    },
     fileType: {
       type: Array,
       default: () => ['image', 'video', 'word', 'excel', 'ppt', 'pdf']
@@ -42,10 +48,12 @@ export default {
   computed: {
     isShowFileList: {
       get: function () {
-        if (this.fileList.length > 0 && this.fileList[0].url) {
-          return true
-        } else {
-          return false
+        if (!this.multiple) {
+          if (this.fileList.length > 0 && this.fileList[0].url) {
+            return true
+          } else {
+            return false
+          }
         }
       },
       set: function (newValue) {}
@@ -58,6 +66,7 @@ export default {
       })
     },
     createName(name) {
+      console.log(444)
       const date = Date.now()
       const uuid = this.getUUID()
       const fileSuffix = name.substring(name.lastIndexOf('.') + 1)
@@ -68,6 +77,7 @@ export default {
       this.fileList.pop()
     },
     beforeUpload(file) {
+      console.log(file)
       const fileSuffix = file.name.substring(file.name.lastIndexOf('.') + 1)
       const imgList = ['jpg', 'jpeg', 'png']
       const videoList = ['mp4']
@@ -116,11 +126,15 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      this.fileList.pop()
+      if (!this.multiple) {
+        this.fileList.pop()
+      }
       this.fileList.push({
         name: file.name,
+        status: 'success',
         url: this.dataObj.key
       })
+
       this.showFileList = true
       loading.close()
     }

src/views/basic_data/dealer/dealer_apply.vue

@@ -3,7 +3,7 @@
     <div v-if="isShow">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <Collapse :screen-form="searchForm">
           <template #right_btn>
             <el-button size="mini" @click="clearFn">清空</el-button>
             <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/basic_data/dealer/dealer_deposit.vue

@@ -14,7 +14,7 @@
       </el-row>
     </el-card> -->
       <!-- 筛选条件 -->
-      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+      <Collapse :screen-form="searchForm">
         <template #right_btn>
           <el-button size="mini" @click="clearFn">清空</el-button>
           <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/basic_data/dealer/dealer_list.vue

@@ -3,7 +3,7 @@
     <div v-if="isShow">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <Collapse :screen-form="searchForm">
           <template #right_btn>
             <el-button size="mini" @click="clearFn">清空</el-button>
             <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/basic_data/dealer/dealer_stock.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+      <Collapse :screen-form="searchForm">
         <template #right_btn>
           <el-button size="mini" @click="clearFn">清空</el-button>
           <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/basic_data/logistics/logistics_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/material/category_list.vue

@@ -3,7 +3,7 @@
     <div>
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/material/classify_list.vue

@@ -42,7 +42,7 @@
       <div class="main-right">
         <!-- 筛选条件 -->
         <div>
-          <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+          <Collapse :screen-form="searchForm">
             <template #right_btn>
               <el-button size="mini" @click="clearFn">清空</el-button>
               <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/basic_data/material/machine_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm" :is-show="false">
+      <Collapse :screen-form="screenForm" :is-show="false">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/material/material_list.vue

@@ -3,7 +3,7 @@
     <div v-if="isShow">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/material/modify_list.vue

@@ -4,7 +4,7 @@
       <!-- 筛选条件 -->
       <div>
         <div>
-          <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+          <Collapse :screen-form="screenForm">
             <template #right_btn>
               <el-button size="mini" @click="resetScreenForm">清空</el-button>
               <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/material/price_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/material/relation_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/stock/Issue_list.vue

@@ -3,7 +3,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/stock/customer_product_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/stock/material_list.vue

@@ -3,7 +3,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/stock/product_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/stock/product_list_customer.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/stock/stock_fee_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/stock/warehousing_list.vue

@@ -3,7 +3,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/supplier/supplier_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div v-if="isShow">
       <!-- 筛选条件 -->
-      <Collapse :is-collapse="isCollapse" :screen-form="searchForm" screenFnName="searchFn">
+      <Collapse :screen-form="searchForm" screenFnName="searchFn">
         <template #right_btn>
           <el-button size="mini" @click="clearFn">清空</el-button>
           <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/basic_data/taker/taker_car.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+      <Collapse :screen-form="searchForm">
         <template #right_btn>
           <el-button size="mini" @click="clearFn">清空</el-button>
           <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/basic_data/taker/taker_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+      <Collapse :screen-form="searchForm">
         <template #right_btn>
           <el-button size="mini" @click="clearFn">清空</el-button>
           <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/basic_data/warehouse/warehouse_cost.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/warehouse/warehouse_list.vue

@@ -3,7 +3,7 @@
     <div v-if="isShow">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/basic_data/warehouse/warehouse_site.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/deposit_commerce/deposit_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showPage == 1">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/deposit_commerce/nodeduct_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showExamine">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <Collapse :screen-form="searchForm">
           <template #right_btn>
             <el-button size="mini">清空</el-button>
             <el-button size="mini" type="primary">搜索</el-button>

src/views/deposit_commerce/refund_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showSurrender">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetFn">清空</el-button>
             <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/deposit_home/deposit_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showPage == 1">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空 </el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索 </el-button>

src/views/deposit_home/nodeduct_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showExamine">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <Collapse :screen-form="searchForm">
           <template #right_btn>
             <el-button size="mini">清空</el-button>
             <el-button size="mini" type="primary">搜索</el-button>

src/views/deposit_home/refund_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showSurrender">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetFn">清空</el-button>
             <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/finance/account_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showReconciliation">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <Collapse :screen-form="searchForm">
           <template #right_btn>
             <el-button size="mini" @click="clearFn">清空</el-button>
             <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/finance/balance_sum.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+      <Collapse :screen-form="searchForm">
         <template #right_btn>
           <el-button size="mini" @click="clearFn">清空</el-button>
           <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/finance/change_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showPage == 1">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <Collapse :screen-form="searchForm">
           <template #right_btn>
             <el-button size="mini" @click="clearFn">清空</el-button>
             <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/finance/credit_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showRecord">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <Collapse :screen-form="searchForm">
           <template #right_btn>
             <el-button size="mini" @click="clearFn">清空</el-button>
             <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/finance/details/loan_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showReconciliation">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="searchForm" :is-show="false">
+        <Collapse :screen-form="searchForm" :is-show="false">
           <template #right_btn>
             <el-button size="mini" @click="clearFn">清空</el-button>
             <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/finance/finance_sum.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+      <Collapse :screen-form="searchForm">
         <template #right_btn>
           <el-button size="mini" @click="clearFn">清空</el-button>
           <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/finance/rebate_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showPage == 1">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <Collapse :screen-form="searchForm">
           <template #right_btn>
             <el-button size="mini" @click="cancelFn">清空</el-button>
             <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/finance/receipt_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showDetail == 1">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <Collapse :screen-form="searchForm">
           <template #right_btn>
             <el-button size="mini" @click="cancelFn">清空</el-button>
             <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/finance/receivable_list.vue

@@ -3,7 +3,7 @@
     <div v-if="showPage == 1">
       <!-- 筛选条件 -->
       <div>
-        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <Collapse :screen-form="searchForm">
           <template #right_btn>
             <el-button size="mini" @click="clearFn">清空</el-button>
             <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/finance/standbook_list.vue

@@ -20,7 +20,7 @@
     <h1></h1>
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+      <Collapse :screen-form="searchForm">
         <template #right_btn>
           <el-button size="mini" @click="resetFn">清空</el-button>
           <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>

src/views/issue/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/merchant/merchant_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/notice/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/sales/price/commercial_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+      <Collapse :screen-form="searchForm">
         <template #right_btn>
           <el-button size="mini" @click="clearFn">清空</el-button>
           <el-button size="mini" type="primary" @click="searchFormFn">搜索</el-button>

src/views/sales_policy/codealer_list.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container" v-if="isShow">
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button type="primary" size="mini" @click="submitScreenForm">搜索</el-button>

src/views/sales_policy/policy_list.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="isShow === 1" class="app-container">
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button type="primary" size="mini" @click="submitScreenForm">搜索</el-button>

src/views/setting/account.vue

@@ -34,7 +34,7 @@
         <!-- <div class="top clearfix">
           <div class="title fl">条件筛选</div>
         </div> -->
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/setting/api.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/setting/components/log-examine.vue

@@ -2,7 +2,7 @@
   <div class="detail-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/setting/components/log-login.vue

@@ -2,7 +2,7 @@
   <div class="detail-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/setting/components/log-operation.vue

@@ -2,7 +2,7 @@
   <div class="detail-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/stock/reserved_stock.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/stock/stock_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/allot/allot_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/apply/apply_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #left_btn>
             <el-radio-group v-model="screenForm.status" size="mini" @change="getList()">
               <el-radio-button label="">全部</el-radio-button>

src/views/supply/apply/components/apply_detail.vue

@@ -48,20 +48,20 @@
           <el-col :span="24" class="item file">
             <div class="label">附件</div>
             <div class="value">
-              <div class="file-list" v-if="detailData.fileUrl">
+              <div class="file-list" v-for="item in detailData.salesOrderPictures">
                 <div class="file-item">
                   <el-image
-                    v-if="checkFileType(detailData.fileUrl) == 'image'"
+                    v-if="checkFileType(item.fileUrl) == 'image'"
                     class="img"
-                    :src="imageURL + detailData.fileUrl"
-                    :preview-src-list="[imageURL + detailData.fileUrl]"
+                    :src="imageURL + item.fileUrl"
+                    :preview-src-list="[imageURL + item.fileUrl]"
                   ></el-image>
-                  <div v-else class="box2" @click="openLink(detailData.fileUrl)">
-                    <img src="@/assets/common/word.png" v-if="checkFileType(detailData.fileUrl) == 'word'" />
-                    <img src="@/assets/common/excel.png" v-if="checkFileType(detailData.fileUrl) == 'excel'" />
-                    <img src="@/assets/common/ppt.png" v-if="checkFileType(detailData.fileUrl) == 'ppt'" />
-                    <img src="@/assets/common/pdf.png" v-if="checkFileType(detailData.fileUrl) == 'pdf'" />
-                    <div class="name ellipsis-3">{{ detailData.fileName }}</div>
+                  <div v-else class="box2" @click="openLink(item.fileUrl)">
+                    <img src="@/assets/common/word.png" v-if="checkFileType(item.fileUrl) == 'word'" />
+                    <img src="@/assets/common/excel.png" v-if="checkFileType(item.fileUrl) == 'excel'" />
+                    <img src="@/assets/common/ppt.png" v-if="checkFileType(item.fileUrl) == 'ppt'" />
+                    <img src="@/assets/common/pdf.png" v-if="checkFileType(item.fileUrl) == 'pdf'" />
+                    <div class="name ellipsis-3">{{ item.fileName }}</div>
                   </div>
                 </div>
               </div>

src/views/supply/apply/components/apply_examine.vue

@@ -44,20 +44,20 @@
         <el-col :span="24" class="item file">
           <div class="label">附件</div>
           <div class="value">
-            <div class="file-list" v-if="detailData.fileUrl">
+            <div class="file-list" v-for="item in detailData.salesOrderPictures">
               <div class="file-item">
                 <el-image
-                  v-if="checkFileType(detailData.fileUrl) == 'image'"
+                  v-if="checkFileType(item.fileUrl) == 'image'"
                   class="img"
-                  :src="imageURL + detailData.fileUrl"
-                  :preview-src-list="[imageURL + detailData.fileUrl]"
+                  :src="imageURL + item.fileUrl"
+                  :preview-src-list="[imageURL + item.fileUrl]"
                 ></el-image>
-                <div v-else class="box2" @click="openLink(detailData.fileUrl)">
-                  <img src="@/assets/common/word.png" v-if="checkFileType(detailData.fileUrl) == 'word'" />
-                  <img src="@/assets/common/excel.png" v-if="checkFileType(detailData.fileUrl) == 'excel'" />
-                  <img src="@/assets/common/ppt.png" v-if="checkFileType(detailData.fileUrl) == 'ppt'" />
-                  <img src="@/assets/common/pdf.png" v-if="checkFileType(detailData.fileUrl) == 'pdf'" />
-                  <div class="name ellipsis-3">{{ detailData.fileName }}</div>
+                <div v-else class="box2" @click="openLink(item.fileUrl)">
+                  <img src="@/assets/common/word.png" v-if="checkFileType(item.fileUrl) == 'word'" />
+                  <img src="@/assets/common/excel.png" v-if="checkFileType(item.fileUrl) == 'excel'" />
+                  <img src="@/assets/common/ppt.png" v-if="checkFileType(item.fileUrl) == 'ppt'" />
+                  <img src="@/assets/common/pdf.png" v-if="checkFileType(item.fileUrl) == 'pdf'" />
+                  <div class="name ellipsis-3">{{ item.fileName }}</div>
                 </div>
               </div>
             </div>

src/views/supply/apply/components/apply_return_form.vue

@@ -79,7 +79,7 @@
         </el-col>
         <el-col :xs="24" :sm="8" :lg="8">
           <el-form-item label="附件" prop="fileUrl">
-            <fileUpload :fileList="fileList" />
+            <fileUpload :fileList="fileList" multiple />
           </el-form-item>
         </el-col>
       </el-row>
@@ -721,6 +721,16 @@ export default {
           })
 
           let warehouseItem = this.warehouseList.find(o => o.id === this.mainForm.warehouse)
+          const salesOrderPictures = []
+          if (this.fileList.length) {
+            this.fileList.forEach(k => {
+              salesOrderPictures.push({
+                fileName: k.name,
+                fileUrl: k.url,
+                salesId: this.goodsList[0].id
+              })
+            })
+          }
           let params = {
             remark: this.mainForm.remark,
             fileUrl: this.fileList && this.fileList.length > 0 ? this.fileList[0].url : '',
@@ -729,7 +739,8 @@ export default {
             correspondName: warehouseItem && warehouseItem.name ? warehouseItem.name : '',
             salesOrderId: this.goodsList[0].id,
             orders: goodsList,
-            examineStatus: status
+            examineStatus: status,
+            salesOrderPictures
           }
           if (this.listItem) {
             params.id = this.listItem.id

src/views/supply/apply/components/engin_detail.vue

@@ -85,20 +85,20 @@
           <el-col :span="24" class="item file">
             <div class="label">附件</div>
             <div class="value">
-              <div class="file-list" v-if="detailData.fileUrl">
-                <div class="file-item">
+              <div class="file-list">
+                <div class="file-item" v-for="item in detailData.salesOrderPictures">
                   <el-image
-                    v-if="checkFileType(detailData.fileUrl) == 'image'"
+                    v-if="checkFileType(item.fileUrl) == 'image'"
                     class="img"
-                    :src="imageURL + detailData.fileUrl"
-                    :preview-src-list="[imageURL + detailData.fileUrl]"
+                    :src="imageURL + item.fileUrl"
+                    :preview-src-list="[imageURL + item.fileUrl]"
                   ></el-image>
-                  <div v-else class="box2" @click="openLink(detailData.fileUrl)">
-                    <img src="@/assets/common/word.png" v-if="checkFileType(detailData.fileUrl) == 'word'" />
-                    <img src="@/assets/common/excel.png" v-if="checkFileType(detailData.fileUrl) == 'excel'" />
-                    <img src="@/assets/common/ppt.png" v-if="checkFileType(detailData.fileUrl) == 'ppt'" />
-                    <img src="@/assets/common/pdf.png" v-if="checkFileType(detailData.fileUrl) == 'pdf'" />
-                    <div class="name ellipsis-3">{{ detailData.fileName }}</div>
+                  <div v-else class="box2" @click="openLink(item.fileUrl)">
+                    <img src="@/assets/common/word.png" v-if="checkFileType(item.fileUrl) == 'word'" />
+                    <img src="@/assets/common/excel.png" v-if="checkFileType(item.fileUrl) == 'excel'" />
+                    <img src="@/assets/common/ppt.png" v-if="checkFileType(item.fileUrl) == 'ppt'" />
+                    <img src="@/assets/common/pdf.png" v-if="checkFileType(item.fileUrl) == 'pdf'" />
+                    <div class="name ellipsis-3">{{ item.fileName }}</div>
                   </div>
                 </div>
               </div>

src/views/supply/apply/components/engin_examine.vue

@@ -83,19 +83,19 @@
           <div class="label">附件</div>
           <div class="value">
             <div class="file-list" v-if="detailData.fileUrl">
-              <div class="file-item">
+              <div class="file-item" v-for="item in detailData.salesOrderPictures">
                 <el-image
-                  v-if="checkFileType(detailData.fileUrl) == 'image'"
+                  v-if="checkFileType(item.fileUrl) == 'image'"
                   class="img"
-                  :src="imageURL + detailData.fileUrl"
-                  :preview-src-list="[imageURL + detailData.fileUrl]"
+                  :src="imageURL + item.fileUrl"
+                  :preview-src-list="[imageURL + item.fileUrl]"
                 ></el-image>
-                <div v-else class="box2" @click="openLink(detailData.fileUrl)">
-                  <img src="@/assets/common/word.png" v-if="checkFileType(detailData.fileUrl) == 'word'" />
-                  <img src="@/assets/common/excel.png" v-if="checkFileType(detailData.fileUrl) == 'excel'" />
-                  <img src="@/assets/common/ppt.png" v-if="checkFileType(detailData.fileUrl) == 'ppt'" />
-                  <img src="@/assets/common/pdf.png" v-if="checkFileType(detailData.fileUrl) == 'pdf'" />
-                  <div class="name ellipsis-3">{{ detailData.fileName }}</div>
+                <div v-else class="box2" @click="openLink(item.fileUrl)">
+                  <img src="@/assets/common/word.png" v-if="checkFileType(item.fileUrl) == 'word'" />
+                  <img src="@/assets/common/excel.png" v-if="checkFileType(item.fileUrl) == 'excel'" />
+                  <img src="@/assets/common/ppt.png" v-if="checkFileType(item.fileUrl) == 'ppt'" />
+                  <img src="@/assets/common/pdf.png" v-if="checkFileType(item.fileUrl) == 'pdf'" />
+                  <div class="name ellipsis-3">{{ item.fileName }}</div>
                 </div>
               </div>
             </div>

src/views/supply/apply/components/engin_return_form.vue

@@ -115,7 +115,7 @@
       <el-row :gutter="20">
         <el-col :xs="24" :sm="8" :lg="8">
           <el-form-item label="附件" prop="fileUrl">
-            <fileUpload :fileList="fileList" />
+            <fileUpload :fileList="fileList" multiple />
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="8" :lg="8">
@@ -936,6 +936,16 @@ export default {
           })
 
           let warehouseItem = this.warehouseList.find(o => o.id === this.mainForm.warehouse)
+          const salesOrderPictures = []
+          if (this.fileList.length) {
+            this.fileList.forEach(k => {
+              salesOrderPictures.push({
+                fileName: k.name,
+                fileUrl: k.url,
+                salesId: this.goodsList[0].id
+              })
+            })
+          }
           let params = {
             customerNumber: this.mainForm.jxsNum,
             customerName: this.mainForm.jxsName,
@@ -958,7 +968,8 @@ export default {
             correspondName: warehouseItem ? warehouseItem.name : '',
             salesOrderId: this.goodsList[0].id,
             orders: goodsList,
-            examineStatus: status
+            examineStatus: status,
+            salesOrderPictures
           }
           if (this.listItem) {
             params.id = this.listItem.id

src/views/supply/apply/engin_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #left_btn>
             <el-radio-group size="mini" v-model="screenForm.status" @change="getList()">
               <el-radio-button label="">全部</el-radio-button>

src/views/supply/deliver/commerce_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/deliver/deliver_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/deliver/home_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/deliver/sum_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowPrint">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/direct/direct_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/engin/commerce_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/engin/engin_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/engin/home_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/implement/commercial_implement_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDisplaceDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/implement/implement_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDisplaceDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/implement/implement_total_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDisplaceDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/implement/nsales_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/pickup/pickup_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button type="primary" size="mini" @click="submitScreenForm">搜索</el-button>

src/views/supply/pickup/sum_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/policy/policy_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/price/difference_modify_list.vue

@@ -4,7 +4,7 @@
       <!-- 筛选条件 -->
       <div>
         <div>
-          <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+          <Collapse :screen-form="screenForm">
             <template #right_btn>
               <el-button size="mini" @click="resetScreenForm">清空</el-button>
               <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/price/difference_price_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/price/modify_list.vue

@@ -4,7 +4,7 @@
       <!-- 筛选条件 -->
       <div>
         <div>
-          <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+          <Collapse :screen-form="screenForm">
             <template #right_btn>
               <el-button size="mini" @click="resetScreenForm">清空</el-button>
               <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/price/price_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <div>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>

src/views/supply/purchase/enter_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/purchase/plan_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/purchase/purchase_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/purchase/sum_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+      <Collapse :screen-form="screenForm">
         <template #right_btn>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/reserve/reserve_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/retail/retail_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>

src/views/supply/sales/components/sales_detail.vue

@@ -40,29 +40,31 @@
               <el-input v-model="detailData.remark" :readonly="!edit" placeholder="请输入备注"></el-input>
             </div>
           </el-col>
+          <el-col :span="24" class="item file" style="width: 100%; height: auto">
+            <div class="label">附件</div>
+            <div class="value">
+              <div class="file-list">
+                <div class="file-item" v-for="item in detailData.salesOrderPictures">
+                  <el-image
+                    v-if="checkFileType(item.fileUrl) == 'image'"
+                    class="img"
+                    :src="$imageUrl + item.fileUrl"
+                    :preview-src-list="[$imageUrl + item.fileUrl]"
+                  ></el-image>
+                  <div v-else class="box2" @click="openLink(item.fileUrl)">
+                    <img src="@/assets/common/word.png" v-if="checkFileType(item.fileUrl) == 'word'" />
+                    <img src="@/assets/common/excel.png" v-if="checkFileType(item.fileUrl) == 'excel'" />
+                    <img src="@/assets/common/ppt.png" v-if="checkFileType(item.fileUrl) == 'ppt'" />
+                    <img src="@/assets/common/pdf.png" v-if="checkFileType(item.fileUrl) == 'pdf'" />
+                    <div class="name ellipsis-3">{{ item.fileName }}</div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-col>
         </el-row>
       </div>
-      <div class="main-title">
-        <div class="title">附件</div>
-      </div>
-      <el-row class="img-box">
-        <el-col :span="24" class="item">
-          <div class="value" style="height: 150px; width: 150px">
-            <el-image
-              style="height: 120px; widht: 120px"
-              v-if="checkFileType(detailData.fileUrl) == 'image'"
-              :src="$imageUrl + detailData.fileUrl"
-              fit="fill"
-              :preview-src-list="srcList"
-            />
-            <img class="file" src="@/assets/common/word.png" v-if="checkFileType(detailData.fileUrl) == 'word'" />
-            <img class="file" src="@/assets/common/excel.png" v-if="checkFileType(detailData.fileUrl) == 'excel'" />
-            <img class="file" src="@/assets/common/ppt.png" v-if="checkFileType(detailData.fileUrl) == 'ppt'" />
-            <img class="file" src="@/assets/common/pdf.png" v-if="checkFileType(detailData.fileUrl) == 'pdf'" />
-            <img v-if="checkFileType(detailData.fileUrl) == 'file'" class="file aaa" src="@/assets/common/zip.jpeg" />
-          </div>
-        </el-col>
-      </el-row>
+
       <div class="main-title">
         <div class="title">货品信息</div>
       </div>
@@ -245,6 +247,7 @@
 <script>
 import print from 'vue-print-nb'
 import { getDetail, updateNum } from '@/api/supply/sales'
+import { getFileUrl } from '@/api/common'
 
 export default {
   name: 'SalesDetail',
@@ -297,7 +300,14 @@ export default {
         this.goBack()
         this.$parent.getList()
       })
-    }, // 检查文件类型
+    },
+    // 打开链接
+    openLink(url) {
+      getFileUrl({ key: url }).then(res => {
+        window.open(res.data)
+      })
+    },
+    // 检查文件类型
     checkFileType(url) {
       if (!url) return ''
       const fileSuffix = url.substring(url.lastIndexOf('.') + 1)
@@ -351,4 +361,8 @@ export default {
   display: flex;
   align-items: center;
 }
+.file {
+  width: 64px;
+  height: 64px;
+}
 </style>

src/views/supply/sales/components/sales_examine.vue

@@ -33,31 +33,35 @@
         </el-col>
         <el-col :span="16" class="item">
           <div class="label">备注</div>
-          <div class="value">{{ detailData.remark }}</div>
+          <div class="value">
+            <el-input v-model="detailData.remark" placeholder="请输入备注"></el-input>
+          </div>
+        </el-col>
+        <el-col :span="24" class="item file" style="width: 100%; height: auto">
+          <div class="label">附件</div>
+          <div class="value">
+            <div class="file-list">
+              <div class="file-item" v-for="item in detailData.salesOrderPictures">
+                <el-image
+                  v-if="checkFileType(item.fileUrl) == 'image'"
+                  class="img"
+                  :src="$imageUrl + item.fileUrl"
+                  :preview-src-list="[$imageUrl + item.fileUrl]"
+                ></el-image>
+                <div v-else class="box2" @click="openLink(item.fileUrl)">
+                  <img src="@/assets/common/word.png" v-if="checkFileType(item.fileUrl) == 'word'" />
+                  <img src="@/assets/common/excel.png" v-if="checkFileType(item.fileUrl) == 'excel'" />
+                  <img src="@/assets/common/ppt.png" v-if="checkFileType(item.fileUrl) == 'ppt'" />
+                  <img src="@/assets/common/pdf.png" v-if="checkFileType(item.fileUrl) == 'pdf'" />
+                  <div class="name ellipsis-3">{{ item.fileName }}</div>
+                </div>
+              </div>
+            </div>
+          </div>
         </el-col>
       </el-row>
     </div>
-    <div class="main-title">
-      <div class="title">附件</div>
-    </div>
-    <el-row class="img-box">
-      <el-col :span="24" class="item">
-        <div class="value" style="height: 150px; width: 150px">
-          <el-image
-            style="height: 120px; widht: 120px"
-            v-if="checkFileType(detailData.fileUrl) == 'image'"
-            :src="$imageUrl + detailData.fileUrl"
-            fit="fill"
-            :preview-src-list="srcList"
-          />
-          <img class="file" src="@/assets/common/word.png" v-if="checkFileType(detailData.fileUrl) == 'word'" />
-          <img class="file" src="@/assets/common/excel.png" v-if="checkFileType(detailData.fileUrl) == 'excel'" />
-          <img class="file" src="@/assets/common/ppt.png" v-if="checkFileType(detailData.fileUrl) == 'ppt'" />
-          <img class="file" src="@/assets/common/pdf.png" v-if="checkFileType(detailData.fileUrl) == 'pdf'" />
-          <img v-if="checkFileType(detailData.fileUrl) == 'file'" class="file aaa" src="@/assets/common/zip.jpeg" />
-        </div>
-      </el-col>
-    </el-row>
+
     <div class="main-title">
       <div class="title">货品信息</div>
     </div>
@@ -170,6 +174,7 @@
 
 <script>
 import { getDetail, examineData } from '@/api/supply/sales'
+import { getFileUrl } from '@/api/common'
 
 export default {
   name: 'SalesDetail',
@@ -219,6 +224,12 @@ export default {
       var currentdate = year + seperator1 + month + seperator1 + strDate
       return currentdate
     },
+    // 打开链接
+    openLink(url) {
+      getFileUrl({ key: url }).then(res => {
+        window.open(res.data)
+      })
+    },
     checkFileType(url) {
       if (!url) return ''
       const fileSuffix = url.substring(url.lastIndexOf('.') + 1)

src/views/supply/sales/components/sales_return_form.vue

@@ -55,7 +55,7 @@
         </el-col>
         <el-col :xs="24" :sm="8" :lg="8">
           <el-form-item label="附件" prop="fileUrl">
-            <fileUpload :fileList="fileList" />
+            <fileUpload :fileList="fileList" multiple />
           </el-form-item>
         </el-col>
       </el-row>
@@ -625,6 +625,7 @@ export default {
     // 保存
     clickSubmitForm(status) {
       this.$refs.mainForm.validate(valid => {
+        console.log(this.fileList)
         if (valid) {
           if (this.goodsList.length < 1) {
             return this.$errorMsg('请添加引用')
@@ -649,6 +650,16 @@ export default {
           this.goodsList.forEach(item => {
             item.correspondName = this.warehouseList.find(o => o.id === item.correspondId).name
           })
+          const salesOrderPictures = []
+          if (this.fileList.length) {
+            this.fileList.forEach(k => {
+              salesOrderPictures.push({
+                fileName: k.name,
+                fileUrl: k.url,
+                salesId: this.goodsList[0].id
+              })
+            })
+          }
 
           let params = {
             // id: this.listItem ? this.listItem.id : '',
@@ -660,7 +671,8 @@ export default {
             correspondName: this.goodsList[0].correspondName,
             id: this.goodsList[0].id,
             saleOrderData: this.goodsList,
-            examineStatus: status
+            examineStatus: status,
+            salesOrderPictures
           }
           if (this.listItem) {
             editApply(params).then(res => {

src/views/supply/sales/sales_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #right_btn>
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>