From 1ccf950c0be7178cd33d1bc0b1997da79cb12eab Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 29 Sep 2021 14:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=90=8E?=
 =?UTF-8?q?=20=E5=90=91=E7=88=B6=E7=BB=84=E4=BB=B6=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/calendar.vue           |  5 ++--
 src/views/modules/common/upload.vue           | 28 +++++++++----------
 .../purchaseorder/purchaseRequisition.vue     | 12 ++++----
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue
index 9cd322e..527c2e7 100644
--- a/src/views/modules/base/calendar.vue
+++ b/src/views/modules/base/calendar.vue
@@ -182,8 +182,9 @@
           :label="this.timeArray[0]">
           <template slot-scope="scope">
             <el-select v-model="scope.row.val0" placeholder="请选择" style="height: 12px;padding: 0px " filterable allow-create>
-               <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
-               </el-option>
+              <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
+
+              </el-option>
             </el-select>
           </template>
         </el-table-column>
diff --git a/src/views/modules/common/upload.vue b/src/views/modules/common/upload.vue
index 873d18e..afb8e34 100644
--- a/src/views/modules/common/upload.vue
+++ b/src/views/modules/common/upload.vue
@@ -6,12 +6,10 @@
         :before-upload="beforeUploadHandle"
         :on-success="successHandle"
         multiple
-
-        style="text-align: center;">   <!--drag  :file-list="fileList"-->
-<!--        <i class="el-icon-upload"></i>-->
+        :show-file-list="false"
+        style="text-align: center;">
         <el-button size="small" type="primary">点击上传</el-button>
-        <!--<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip" slot="tip">只支持jpg、png、gif格式的图片！</div>-->
+
       </el-upload>
     </div>
 </template>
@@ -42,23 +40,23 @@
       },
       // 上传成功
       successHandle (response, file, fileList) {
-        this.fileList = fileList
+
+        this.fileList =   fileList.map(item => {
+
+          return item.response.ossEntity
+        })
         console.log(this.fileList)
         this.successNum++
         if (response && response.code === 0) {
-          /*if (this.num === this.successNum) {
-            this.$confirm('操作成功, 是否继续操作?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).catch(() => {
-              this.visible = false
-            })
-          }*/
+          this.childClick()
         } else {
           this.$message.error(response.msg)
         }
       },
+      childClick () {
+        // childByValue是在父组件on监听的方法
+        this.$emit('childByValue', this.fileList)
+      }
     },
     created() {
       this.init()
diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue
index 235265b..9d65970 100644
--- a/src/views/modules/purchaseorder/purchaseRequisition.vue
+++ b/src/views/modules/purchaseorder/purchaseRequisition.vue
@@ -204,7 +204,7 @@
                     :disabled="true"></el-input>
         </el-form-item>
         <el-form-item style="margin-top: 10px">
-         <upload></upload>
+         <upload v-on:childByValue="childByValue"></upload>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -240,6 +240,7 @@
         </el-table-column>
       </el-table>
     </el-dialog>
+
   </div>
 </template>
 
@@ -274,13 +275,10 @@
   } from '@/api/purchaseorder/purchaseRequisition.js'
   import upload from "../common/upload";
   export default {
-    // add,
-    // sub,
-    // mul,
-    // div,
     components:{upload},
     data() {
       return {
+        fileList: [],
         // table 高度
         height: 0,
         bannersBut: false,
@@ -853,6 +851,10 @@
     },
 
     methods: {
+      childByValue (childValue) {
+        // childValue就是子组件传过来的值
+        this.fileList = childValue
+      },
       updateAuthorizeFlag(row){
         let saveData = {
           site : row.site,