Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

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')
     },
   }
 }

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>

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>

src/SDrpManagement/ProductGroup/index.vue

@@ -18,7 +18,7 @@
       <div class="group-list content">
         <div class="group-item" v-for="item in productGroup" :key="item.sa_itemgroupid" @click="itemClick(item)">
           <div class="top">
-            <el-image style="width:100%" :src="item.attinfos[0].url" fit="cover" />
+            <el-image style="width:100%;width: 200px" :src="item.attinfos[0].url" fit="contain" />
           </div>
           <div class="bottom">
             <p class="title">{{item.groupname}}</p>
@@ -204,8 +204,8 @@ export default {
   flex-wrap: wrap;
 }
 .group .group-list .group-item {
-  min-width: 261px;
-  max-width: 357px;
+  width: 261px;
+  /* max-width: 357px; */
   background: #ffffff;
   transition: all 0.1s ease-in;
   cursor: pointer;
@@ -229,7 +229,7 @@ export default {
 }
 .group .group-list .group-item .bottom {
   padding: 10px;
-  border:1px solid #f1f2f3;
+  /* border:1px solid #f1f2f3; */
   border-top:none;
 }
 .group .group-list .group-item .bottom .title {
@@ -262,6 +262,10 @@ export default {
   font-weight: 400;
   color: #999;
 }
+.group-item{
+  border:1px solid #f1f2f3;
+  border-radius: 3px;
+}
 .page {
   display: flex;
   flex-direction: row-reverse;

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -4,9 +4,9 @@
   <el-tag style="margin-left: 15px" size="small" >{{selectProduct.brandname}}</el-tag>
   <div class="product-detail container flex-align-stretch" style="width: 100%;flex-wrap:nowrap">
     <div>
-     <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage?actImage.url:''" fit="cover" />
+     <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage?actImage.url:''" fit="contain" />
       <div class="flex-align-stretch column">
-        <el-image class="thumImage  mt-10" :class="item.attachmentid === actImage.attachmentid?'act':''" v-for="item in selectProduct.attinfos" :key="item.index" :src="item.url" @click="actImage = item" fit="cover" />
+        <el-image class="thumImage  mt-10" :class="item.attachmentid === actImage.attachmentid?'act':''" v-for="item in selectProduct.attinfos" :key="item.index" :src="item.url" @click="actImage = item" fit="contain" />
       </div>
     </div>
 
@@ -270,7 +270,7 @@ export default {
   margin-right:30px;
   border:1px solid #f1f2f3;
   cursor: pointer;
-  
+  overflow: hidden;
 }
 .column{
   flex-direction: row;

src/SDrpManagement/Products/modules/ProductDetails.vue

@@ -2,9 +2,9 @@
 <div class="container normal-panel">
   <div class="product-detail container flex-align-stretch">
     <div class="flex-align-stretch column">
-      <el-image class="thumImage mt-10" :class="item.attachmentid === actImage.attachmentid?'act':''" v-for="item in selectProduct.attinfos" :key="item.index" :src="item.url" @click="actImage = item" fit="cover" />
+      <el-image class="thumImage mt-10" :class="item.attachmentid === actImage.attachmentid?'act':''" v-for="item in selectProduct.attinfos" :key="item.index" :src="item.url" @click="actImage = item" fit="contain" />
     </div>
-    <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage?actImage.url:''" fit="cover" />
+    <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage?actImage.url:''" fit="contain" />
     <div style="flex:1">
       <p class="productName normal-margin">{{selectProduct.itemname}}</p>
       <p class="normal-margin" style="color:#888;">编码:&emsp;{{selectProduct.itemno}}</p>

src/SDrpManagement/Products/modules/list.vue

@@ -25,7 +25,7 @@
 <!--          <div  @click="$router.push({path:'/ProductDetails',query:{id:item.itemid,brandid:params.content.brandids[0]}})" class="group-item" v-for="item in list" :key="item.index">-->
           <div  class="group-item" v-for="item in list" :key="item.index">
             <div class="top">
-              <el-image style="width:100%" :src="Object.keys(item.attinfos).length > 0 ? item.attinfos[0].url : ''" fit="cover" />
+              <el-image style="width:100%" :src="Object.keys(item.attinfos).length > 0 ? item.attinfos[0].url : ''" fit="contain" />
             </div>
             <div class="bottom">
               <p class="title">{{item.itemname}}</p>
@@ -157,8 +157,7 @@ export default {
   flex-wrap: wrap;
 }
 .group .group-list .group-item {
-  min-width: 261px;
-  max-width: 357px;
+  width: 261px;
   background: #ffffff;
   transition: all 0.1s ease-in;
   cursor: pointer;
@@ -182,7 +181,7 @@ export default {
 }
 .group .group-list .group-item .bottom {
   padding: 10px;
-  border:1px solid #f1f2f3;
+  /* border:1px solid #f1f2f3; */
   border-top:none;
 }
 .group .group-list .group-item .bottom .title {
@@ -215,6 +214,10 @@ export default {
   font-weight: 400;
   color: #999;
 }
+.group-item{
+  border:1px solid #f1f2f3;
+  border-radius: 3px;
+}
 .product-price{
   color:red
 }

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>

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')
     },
   }
 }

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>

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')
     },
   }
 }