zhangqiOMG 3 лет назад
Родитель
Сommit
bb625d45f9

+ 2 - 1
src/HDrpManagement/orderManage/details/importFile.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- 按钮类型 -->
     <el-button type="success" size="small" @click="dialogUploadVisible = true" icon="el-icon-upload">导 入</el-button>
-    <el-dialog title="文件上传" class="import-panel" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :show-close="false" :before-close="clearFiles">
+    <el-dialog title="文件上传" class="import-panel" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :show-close="false" @close="clearFiles">
       <div slot="title"></div>
       <div style="background:#f1f2f3" class="my-tabs" >
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
@@ -170,6 +170,7 @@ export default {
       this.$refs['my-upload'].clearFiles()
       this.filelist = []
       this.dialogUploadVisible = false
+      this.$emit('clearUrl')
     },
   }
 }

+ 1 - 1
src/HDrpManagement/orderManage/details/index.vue

@@ -55,7 +55,7 @@
       <div slot="slot0">
         <product-list @select="select" @onSuccess="queryMainData()" :data="mainData" ref="prod">
           <div slot="operation">
-            <importFile v-if="tool.checkAuth($route.name,'importOrderMx')" class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :errorUrl="errorUrl" @onSuccess="bindImportOrder"></importFile>
+            <importFile v-if="tool.checkAuth($route.name,'importOrderMx')" class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :errorUrl="errorUrl" @clearUrl="errorUrl = null" @onSuccess="bindImportOrder"></importFile>
             <changeOrderMx v-if="mainData.status === '审核'" :tableData="selection" class="inline-16" :data="mainData" @onSuccess="$refs['prod'].listData()"></changeOrderMx>
             <el-button :disabled="mainData.status !== '审核' || selection.length === 0"  size="small" type="primary" style="margin-bottom:12px" @click="adddispatch">一键发货</el-button>
           </div>

+ 5 - 0
src/HManagement/accountManage/modules/add.vue

@@ -12,6 +12,11 @@
       <div class="drawer__panel">
         <el-row>
           <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
+            <el-col :span="24">
+              <el-form-item label="账号" label-width="80px">
+                <el-input v-model="form.accountno" autocomplete="off" placeholder="编辑账号"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="手机号码" label-width="80px" prop="phonenumber">
                 <el-input v-model="form.phonenumber" autocomplete="off" placeholder="输入手机号码"></el-input>

+ 1 - 1
src/SDrpManagement/agentOrder/details/index.vue

@@ -37,7 +37,7 @@
       <div slot="slot0">
         <product-list :data="mainData" ref="prod" @qtyChange="queryMainData" @onSuccess="queryMainData">
           <div slot="operation">
-            <importFile v-if="tool.checkAuth($route.name,'importOrderMx')" class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :errorUrl="errorUrl" @onSuccess="bindImportOrder"></importFile>
+            <importFile v-if="tool.checkAuth($route.name,'importOrderMx')" class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :errorUrl="errorUrl" @clearUrl="errorUrl = null" @onSuccess="bindImportOrder"></importFile>
           </div>
         </product-list>
       </div>

+ 2 - 1
src/SDrpManagement/agentOrder/modules/importFile.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- 按钮类型 -->
     <el-button type="success" size="small" @click="dialogUploadVisible = true" icon="el-icon-upload">导 入</el-button>
-    <el-dialog title="文件上传" class="import-panel" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :show-close="false" :before-close="clearFiles">
+    <el-dialog title="文件上传" class="import-panel" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :show-close="false" @close="clearFiles">
       <div slot="title"></div>
       <div style="background:#f1f2f3" class="my-tabs" >
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
@@ -170,6 +170,7 @@ export default {
       this.$refs['my-upload'].clearFiles()
       this.filelist = []
       this.dialogUploadVisible = false
+      this.$emit('clearUrl')
     },
   }
 }

+ 1 - 1
src/SDrpManagement/salerOrder/details/index.vue

@@ -36,7 +36,7 @@
       <div slot="slot0">
         <product-list :data="mainData" @onSuccess="queryMainData($route.query.id)" ref="prod">
           <div slot="operation">
-            <importFile v-if="tool.checkAuth($route.name,'importOrderMx')" class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :errorUrl="errorUrl" @onSuccess="bindImportOrder"></importFile>
+            <importFile v-if="tool.checkAuth($route.name,'importOrderMx')" class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :errorUrl="errorUrl" @clearUrl="errorUrl = null" @onSuccess="bindImportOrder"></importFile>
           </div>
         </product-list>
       </div>

+ 2 - 1
src/SDrpManagement/salerOrder/modules/importFile.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- 按钮类型 -->
     <el-button type="success" size="small" @click="dialogUploadVisible = true" icon="el-icon-upload">导 入</el-button>
-    <el-dialog title="文件上传" class="import-panel" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :show-close="false" :before-close="clearFiles">
+    <el-dialog title="文件上传" class="import-panel" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :show-close="false" @close="clearFiles">
       <div slot="title"></div>
       <div style="background:#f1f2f3" class="my-tabs" >
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
@@ -170,6 +170,7 @@ export default {
       this.$refs['my-upload'].clearFiles()
       this.filelist = []
       this.dialogUploadVisible = false
+      this.$emit('clearUrl')
     },
   }
 }