Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/HDrpManagement/invoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -123,6 +123,7 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
+        this.listData()
         this.$emit('onSuccess')
       })
     },

src/HDrpManagement/invoiceapp/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -1,6 +1,18 @@
 <template>
   <div>
     <addorderline :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData();$emit('onSuccess')" class="inline-16"></addorderline>
+    <uploadAllData
+        v-if="tool.checkAuth($route.name,'InvioceOrder') "
+        class="inline-16"
+        :total="total"
+        dataType="订单"
+        :disabled="status !== '新建'"
+        @onSuccess="allDelSuccess"
+        @handlePullApi="handlePullApi"
+        @handleDelApi="handleDelApi"
+        idName="sa_invoiceapply_orderid"
+        type="del"
+    ></uploadAllData>
     <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
     </el-input>
     <el-table :data="list" size="mini" border>
@@ -40,11 +52,13 @@
 <script>
 import addorderline from './components/addorderline.vue'
 import changeOrderline from './components/changeOrderline.vue'
+import uploadAllData from '@/components/uploadAllData/index'
 export default {
   props:['sys_enterpriseid','status'],
   components:{
     addorderline,
-    changeOrderline
+    changeOrderline,
+    uploadAllData
   },
   data () {
     return {
@@ -94,7 +108,27 @@ export default {
         this.listData()
         this.$emit('onSuccess')
       })
-    } 
+    },
+    /*一键删除*/
+    handlePullApi (pullApi) {
+      pullApi.content = JSON.parse(JSON.stringify(this.param.content))
+      pullApi.id = 20221217091303
+      pullApi.content.sa_invoiceapplyid = this.$route.query.id
+    },
+    handleDelApi (delApi,data) {
+      delApi.id = 20221217091403
+      delApi.content = {
+        "sa_invoiceapply_orderids":data,
+        "pageNumber":0,
+        "pageSize":0
+      }
+      this.listData()
+      this.$emit('onSuccess')
+    },
+    allDelSuccess(){
+      this.listData()
+      this.$emit('onSuccess')
+    }
   },
   mounted () {
     this.listData()

src/HDrpManagement/invoiceapp/modules/add.vue

@@ -168,7 +168,11 @@ export default {
         sa_invoiceapplyid:0,
         remarks:'',
         byhand:false,
-        invoiceline:'p'
+        invoiceline:'p',
+        quota:1000000,
+        invoicepayee:"孙惠吉",
+        invoiceclerk:"冯云霞",
+        invoicechecker:"王蒋雯",
       }
     },
     onSubmit () {

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -170,6 +170,7 @@ export default {
         })
       }
     },
+    /*一键删除*/
     handlePullApi (pullApi) {
       pullApi.content = JSON.parse(JSON.stringify(this.params.content))
       pullApi.id = 20221021145702

src/HManagement/accountManage/modules/removeSite.vue

@@ -15,10 +15,9 @@ export default {
   methods:{
     async remove(){
       const res = await this.$api.requested({
-        "classname": "webmanage.users.users",
-        "method": "deleteUserSite",
+        "id":20221031141202,
         "content": {
-          "userid": this.data.userid
+          "userids": [this.data.userid]
         }
       })
       this.tool.showMessage(res,() => {

src/HManagement/siteManage/securityConfig/index.vue

@@ -64,7 +64,7 @@
     <div class="panel" style="margin-bottom:16px">
       <div class="flex-align-center flex-between">
         <div class="flex-align-stretch">
-          <img width="72" height="72" src="../../../assets/icons/customerRule.png" alt="">
+          <img width="72" height="72" src="../../../assets/icons/customerRule.svg" alt="">
           <div class="text-panel">
             <p class="explain-title">客户查重规则</p>
             <p class="explain-tips">当前设置：第一层
@@ -91,7 +91,7 @@
     <div class="panel" style="margin-bottom:16px">
       <div class="flex-align-center flex-between">
         <div class="flex-align-stretch">
-          <img width="72" height="72" src="../../../assets/icons/projectRule.png" alt="">
+          <img width="72" height="72" src="../../../assets/icons/projectRule.svg" alt="">
           <div class="text-panel">
             <p class="explain-title">项目查重规则</p>
             <p class="explain-tips">当前设置：第一层
@@ -119,7 +119,7 @@
     <div class="panel" style="margin-bottom:16px">
       <div class="flex-align-center flex-between">
         <div class="flex-align-stretch">
-          <img width="72" height="72" src="../../../assets/icons/projectReportRule.png" alt="">
+          <img width="72" height="72" src="../../../assets/icons/projectReportRule.svg" alt="">
           <div class="text-panel">
             <p class="explain-title">项目报备规则</p>
             <p class="explain-tips">当前设置：

src/SDrpManagement/invoiceapp_saler/detail/tab/invoiceOrder/components/addorderline.vue

@@ -124,6 +124,7 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
+        this.listData()
         this.$emit('onSuccess')
       })
     },

src/SDrpManagement/invoiceapp_saler/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -1,6 +1,17 @@
 <template>
   <div>
-    <addorderline :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData();$emit('onSuccess')"></addorderline>
+    <addorderline class="inline-16" :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData();$emit('onSuccess')"></addorderline>
+    <uploadAllData
+        v-if="tool.checkAuth($route.name,'InvioceOrder') "
+        class="inline-16"
+        :total="total"
+        :disabled="status !== '新建'"
+        @onSuccess="allDelSuccess"
+        @handlePullApi="handlePullApi"
+        @handleDelApi="handleDelApi"
+        idName="sa_invoiceapply_orderid"
+        type="del"
+    ></uploadAllData>
     <el-table :data="list" size="mini" border>
       <el-table-column prop="sonum" label="订单号" width="150" fixed></el-table-column>
       <el-table-column prop="type" label="订单类型" width="90"></el-table-column>
@@ -37,11 +48,13 @@
 <script>
 import addorderline from './components/addorderline.vue'
 import changeOrderline from './components/changeOrderline.vue'
+import uploadAllData from '@/components/uploadAllData/index'
 export default {
   props:['sys_enterpriseid','status'],
   components:{
     addorderline,
-    changeOrderline
+    changeOrderline,
+    uploadAllData
   },
   data () {
     return {
@@ -91,7 +104,26 @@ export default {
         this.listData()
         this.$emit('onSuccess')
       })
-    } 
+    } ,
+    /*一键删除*/
+    handlePullApi (pullApi) {
+      pullApi.content = JSON.parse(JSON.stringify(this.param.content))
+      pullApi.id = 20221217091303
+      pullApi.content.sa_invoiceapplyid = this.$route.query.id
+    },
+    handleDelApi (delApi,data) {
+      delApi.id = 20221217091403
+      delApi.content = {
+        "sa_invoiceapply_orderids":data,
+        "pageNumber":0,
+        "pageSize":0
+      }
+      this.listData()
+    },
+    allDelSuccess(){
+      this.listData()
+      this.$emit('onSuccess')
+    }
   },
   mounted () {
     this.listData()

src/SDrpManagement/invoiceapp_saler/modules/add.vue

@@ -165,7 +165,11 @@ export default {
         sa_invoiceapplyid:0,
         remarks:'',
         byhand:false,
-        invoiceline:'p'
+        invoiceline:'p',
+        quota:1000000,
+        invoicepayee:"孙惠吉",
+        invoiceclerk:"冯云霞",
+        invoicechecker:"王蒋雯",
       }
     },
     onSubmit () {

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -136,6 +136,7 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
+        this.listData()
         this.$emit('onSuccess')
       })
     },

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -1,6 +1,17 @@
 <template>
   <div>
-    <addorderline :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData();$emit('onSuccess')"></addorderline>
+    <addorderline class="inline-16" :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData();$emit('onSuccess')"></addorderline>
+    <uploadAllData
+        v-if="tool.checkAuth($route.name,'InvioceOrder') "
+        class="inline-16"
+        :total="total"
+        :disabled="status !== '新建'"
+        @onSuccess="allDelSuccess"
+        @handlePullApi="handlePullApi"
+        @handleDelApi="handleDelApi"
+        idName="sa_invoiceapply_orderid"
+        type="del"
+    ></uploadAllData>
     <el-table :data="list" size="mini" border>
       <el-table-column prop="sonum" label="订单号" width="150" fixed></el-table-column>
       <el-table-column prop="type" label="订单类型" width="90"></el-table-column>
@@ -37,11 +48,13 @@
 <script>
 import addorderline from './components/addorderline.vue'
 import changeOrderline from './components/changeOrderline.vue'
+import uploadAllData from '@/components/uploadAllData/index'
 export default {
   props:['sys_enterpriseid','status'],
   components:{
     addorderline,
-    changeOrderline
+    changeOrderline,
+    uploadAllData
   },
   data () {
     return {
@@ -91,7 +104,26 @@ export default {
         this.listData()
         this.$emit('onSuccess')
       })
-    } 
+    } ,
+    /*一键删除*/
+    handlePullApi (pullApi) {
+      pullApi.content = JSON.parse(JSON.stringify(this.param.content))
+      pullApi.id = 20221217091303
+      pullApi.content.sa_invoiceapplyid = this.$route.query.id
+    },
+    handleDelApi (delApi,data) {
+      delApi.id = 20221217091403
+      delApi.content = {
+        "sa_invoiceapply_orderids":data,
+        "pageNumber":0,
+        "pageSize":0
+      }
+      this.listData()
+    },
+    allDelSuccess(){
+      this.listData()
+      this.$emit('onSuccess')
+    }
   },
   mounted () {
     this.listData()

src/SDrpManagement/sinvoiceapp/modules/add.vue

@@ -122,7 +122,7 @@ export default {
         byhand:false,
         invoiceline:'p'
       },
-      sys_enterpriseid:JSON.parse(window.sessionStorage.getItem('accountinfo')).agenthr.sys_enterpriseid ? JSON.parse(window.sessionStorage.getItem('accountinfo')).agenthr.sys_enterpriseid : '',
+      sys_enterpriseid:JSON.parse(window.sessionStorage.getItem('accountinfo')).agenthr.sys_enterpriseid ? JSON.parse(window.sessionStorage.getItem('accountinfo')).agenthr.sys_enterpriseid : '0',
       value:'',
       rules:{
         taxno: [

src/SDrpManagement/sinvoiceapp/modules/edit.vue

@@ -131,7 +131,7 @@ export default {
         byhand:false,
       },
       value:'',
-      sys_enterpriseid:JSON.parse(window.sessionStorage.getItem('accountinfo')).agenthr.sys_enterpriseid ? JSON.parse(window.sessionStorage.getItem('accountinfo')).agenthr.sys_enterpriseid : '',
+      sys_enterpriseid:JSON.parse(window.sessionStorage.getItem('accountinfo')).agenthr.sys_enterpriseid ? JSON.parse(window.sessionStorage.getItem('accountinfo')).agenthr.sys_enterpriseid : '0',
       rules:{
         enterprisename: [
           { required: true, message: '请输入活动名称', trigger: 'blur' },

src/assets/icons/customerRule.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#F4F5F7;}
+	.st1{fill:#3874F6;}
+</style>
+<path class="st0" d="M13.5,1.4h39c4.4,0,8,3.6,8,8v43.1c0,4.4-3.6,8-8,8h-39c-4.4,0-8-3.6-8-8V9.4C5.5,5,9.1,1.4,13.5,1.4z"/>
+<path class="st1" d="M64,72H18.3c-4.4,0-8-3.6-8-8v-3H6.9C3.1,61,0,58,0,54.2V6.8C0,3,3.1,0,6.9,0h48c3.8,0,6.8,3,6.9,6.8V11H64
+	c4.4,0,8,3.6,8,8v45C72,68.4,68.4,72,64,72z M41.6,21.1c-2.8,0-5.4,1.1-7.4,3c-2,1.9-3.1,4.6-3.1,7.3c0,3.2,1.5,6.2,3.9,8.1
+	c-3.7,1.1-6.9,3.3-9.2,6.3c-2.4,3.1-3.7,6.8-3.6,10.7c0,2.5,2,4.4,4.5,4.4h29.8c2.5,0,4.5-2,4.5-4.4c0-3.9-1.3-7.6-3.6-10.7
+	c-2.3-3-5.6-5.2-9.2-6.3c1.2-1,2.2-2.2,2.9-3.6c2-4,1.2-8.8-2-11.9C47,22.2,44.4,21.1,41.6,21.1z M6.9,1.7C4,1.7,1.7,4,1.7,6.8v47.4
+	c0,2.8,2.3,5.1,5.1,5.1h3.4V19c0-4.4,3.6-8,8-8H60V6.8c0-2.8-2.3-5.1-5.1-5.1L6.9,1.7z M56.9,58.5H26.3c-0.9,0-1.5-0.7-1.5-1.6
+	c0-2.1,0.4-4.2,1.2-6.2c0.8-1.9,1.9-3.6,3.3-5c1.4-1.4,3-2.6,4.9-3.4c1.9-0.8,3.9-1.3,5.9-1.3h3.1c2,0,4.1,0.4,5.9,1.3
+	c1.8,0.8,3.5,2,4.9,3.4c1.4,1.5,2.5,3.2,3.3,5c0.8,2,1.2,4,1.2,6.2C58.5,57.8,57.8,58.5,56.9,58.5L56.9,58.5z M41.7,43.2
+	c-0.8,0-1.5,0.7-1.5,1.5c0,0.5,0.2,0.9,0.6,1.2l0,0l-2,7c-0.1,0.5,0,1,0.4,1.4l2,2c0.3,0.3,0.7,0.3,1,0c0,0,0,0,0,0l2-2
+	c0.4-0.4,0.5-0.9,0.4-1.4l-2-7c0.4-0.3,0.6-0.7,0.6-1.2C43.1,43.8,42.5,43.2,41.7,43.2z M41.7,39.3c-4.4,0-7.9-3.6-7.8-8
+	s3.6-7.9,8-7.8c4.3,0,7.8,3.6,7.8,7.9C49.7,35.8,46.1,39.3,41.7,39.3z"/>
+</svg>

src/assets/icons/projectReportRule.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#F4F5F7;}
+	.st2{fill:#3874F6;}
+</style>
+<rect class="st0" width="72" height="72"/>
+<path class="st1" d="M54,66H15c-4.4,0-8-3.6-8-8V33c0-4.4,3.6-8,8-8h39c4.4,0,8,3.6,8,8v25C62,62.4,58.4,66,54,66z M16.5,49
+	c-1.9,0-3.5,1.6-3.5,3.5c0,1.9,1.6,3.5,3.5,3.5c1.9,0,3.5-1.6,3.5-3.5l0,0C20,50.6,18.4,49,16.5,49L16.5,49z M16.5,40
+	c-1.9,0-3.5,1.6-3.5,3.5c0,1.9,1.6,3.5,3.5,3.5c1.9,0,3.5-1.6,3.5-3.5l0,0C20,41.6,18.4,40,16.5,40L16.5,40z M16.5,31
+	c-1.9,0-3.5,1.6-3.5,3.5l0,0c0,1.9,1.6,3.5,3.5,3.5c1.9,0,3.5-1.6,3.5-3.5l0,0C20,32.6,18.4,31,16.5,31L16.5,31z"/>
+<path class="st2" d="M46.3,67.7H4.5c-2.5,0-4.5-2-4.5-4.5V8.8c0-1,0.3-2,0.9-2.7c0.6-0.8,1.4-1.3,2.3-1.6h26.9
+	c1.2,0.4,2.2,1.2,2.8,2.3l2,4c0.8,1.5,2.3,2.5,4,2.5h19.8c1.9,0,3.7,1.2,4.3,3.1v16.5c-1.4-0.5-2.8-0.9-4.3-1.1V27
+	c0-2.5-2-4.5-4.5-4.5H9.1c-2.5,0-4.5,2-4.5,4.5v31.7c0,2.5,2,4.5,4.5,4.5h32.1C42.6,65,44.3,66.5,46.3,67.7L46.3,67.7z M45.2,62.2
+	c-6.1-6.1-6.1-16.1,0-22.2s16.1-6.1,22.2,0s6.1,16.1,0,22.2c-2.9,2.9-6.9,4.6-11.1,4.6C52.1,66.8,48.1,65.1,45.2,62.2L45.2,62.2z
+	 M48,59.8c0,0.4,0.3,0.7,0.7,0.7H64c0.4,0,0.7-0.3,0.6-0.7c0-0.4-0.3-0.7-0.7-0.6h-2.3v-3.5c0-0.7-0.3-1.4-0.9-1.8L57.3,51l3.4-2.8
+	l0,0c0.5-0.5,0.8-1.1,0.9-1.8V43H64c0.4,0,0.7-0.3,0.6-0.7s-0.3-0.7-0.7-0.6H48.6c-0.4,0-0.6,0.3-0.6,0.7c0,0.4,0.3,0.6,0.7,0.6h2.4
+	v3.4v0c0,0.7,0.3,1.4,0.9,1.8l3.4,2.8l-3.4,2.9l0,0C51.3,54.4,51,55,51,55.7v3.5h-2.4C48.3,59.2,48,59.5,48,59.8L48,59.8z
+	 M29.4,54.1c-1.3,0-2.3-1-2.3-2.3s1-2.3,2.3-2.3H37c0,0.5-0.1,1-0.1,1.5c0,1,0.1,2,0.2,3l0,0L29.4,54.1z M13.6,51.9
+	c0-1.2,1-2.3,2.3-2.3c1.2,0,2.3,1,2.3,2.3c0,1.2-1,2.3-2.3,2.3C14.6,54.1,13.6,53.1,13.6,51.9z M56.3,50.2l-3.5-3l0,0
+	c-0.2-0.2-0.4-0.5-0.4-0.8V43h7.9v3.4c0,0.3-0.1,0.6-0.4,0.8l0,0L56.3,50.2L56.3,50.2z M37.8,45.1h-8.4c-1.3,0-2.3-1-2.3-2.3
+	s1-2.3,2.3-2.3H40C39.1,41.9,38.4,43.5,37.8,45.1L37.8,45.1L37.8,45.1z M13.6,42.8c0-1.3,1-2.3,2.3-2.3c1.3,0,2.3,1,2.3,2.3
+	c0,1.3-1,2.3-2.3,2.3c0,0,0,0,0,0C14.6,45.1,13.6,44,13.6,42.8z M29.4,36c-1.3,0-2.3-1-2.3-2.3s1-2.3,2.3-2.3h18.1
+	c0.9,0,1.7,0.5,2.1,1.4c-2,0.7-3.9,1.8-5.6,3.2H29.4z M13.6,33.7c0-1.3,1-2.3,2.3-2.3c1.3,0,2.3,1,2.3,2.3c0,1.3-1,2.3-2.3,2.3l0,0
+	C14.6,36,13.6,35,13.6,33.7z"/>
+</svg>

src/assets/icons/projectRule.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#F4F5F7;}
+	.st1{fill:#3874F6;}
+</style>
+<path class="st0" d="M13.5,1.4h39c4.4,0,8,3.6,8,8v43.1c0,4.4-3.6,8-8,8h-39c-4.4,0-8-3.6-8-8V9.4C5.5,5,9.1,1.4,13.5,1.4z"/>
+<path class="st1" d="M64,72H18.3c-4.4,0-8-3.6-8-8v-3H6.9C3.1,61,0,58,0,54.2V6.8C0,3,3.1,0,6.9,0h48c3.8,0,6.8,3,6.9,6.8V11H64
+	c4.4,0,8,3.6,8,8v45C72,68.4,68.4,72,64,72z M23.1,22.4c-0.9,0.5-1.5,1.5-1.5,2.5v34.3c0,1.6,1.3,2.9,2.9,2.9h34.3
+	c1,0,2-0.6,2.5-1.5V29.2c-0.5-0.9-1.5-1.5-2.5-1.5H46.2c-1.1,0-2.1-0.6-2.6-1.6l-1.3-2.6c-0.3-0.5-0.7-1-1.2-1.3L23.1,22.4z
+	 M6.9,1.7C4,1.7,1.7,4,1.7,6.8v47.4c0,2.8,2.3,5.1,5.1,5.1h3.4V19c0-4.4,3.6-8,8-8H60V6.8c0-2.8-2.3-5.1-5.1-5.1L6.9,1.7z
+	 M55.9,59.2H27.3c-1.6,0-2.9-1.3-2.9-2.9v-20c0-1.6,1.3-2.9,2.9-2.9h28.6c1.6,0,2.9,1.3,2.9,2.9v20C58.7,57.9,57.4,59.2,55.9,59.2
+	L55.9,59.2z M40.1,50.6c-0.8,0-1.4,0.6-1.4,1.4c0,0.8,0.6,1.4,1.4,1.4h11.4c0.8,0,1.4-0.6,1.4-1.4c0-0.8-0.6-1.4-1.4-1.4H40.1z
+	 M31.6,50.6c-0.8,0-1.4,0.6-1.4,1.4c0,0.8,0.6,1.4,1.4,1.4c0.8,0,1.4-0.6,1.4-1.4C33,51.2,32.4,50.6,31.6,50.6L31.6,50.6z
+	 M40.1,44.9c-0.8,0-1.4,0.6-1.4,1.4c0,0.8,0.6,1.4,1.4,1.4h11.4c0.8,0,1.4-0.6,1.4-1.4c0-0.8-0.6-1.4-1.4-1.4H40.1z M31.6,44.9
+	c-0.8,0-1.4,0.6-1.4,1.4c0,0.8,0.6,1.4,1.4,1.4c0.8,0,1.4-0.6,1.4-1.4C33,45.5,32.4,44.9,31.6,44.9L31.6,44.9z M40.1,39.2
+	c-0.8,0-1.4,0.6-1.4,1.4c0,0.8,0.6,1.4,1.4,1.4h11.4c0.8,0,1.4-0.6,1.4-1.4c0-0.8-0.6-1.4-1.4-1.4H40.1z M31.6,39.2
+	c-0.8,0-1.4,0.6-1.4,1.4c0,0.8,0.6,1.4,1.4,1.4c0.8,0,1.4-0.6,1.4-1.4C33,39.8,32.4,39.2,31.6,39.2L31.6,39.2z"/>
+</svg>

src/components/uploadAllData/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="small" class="inline-16" @click="allProduct" v-if="type=='upload'">一 键 全 选</el-button>
-    <el-button type="primary" size="small" class="inline-16" @click="allProduct" v-else>一 键 删 除</el-button>
+    <el-button type="primary" size="small" class="inline-16" @click="allProduct" v-else :disabled="disabled">一 键 删 除</el-button>
     <el-dialog
       title=""
       :visible.sync="progressVisible"
@@ -45,6 +45,9 @@ export default {
     dataType:{
       type:[String],
       default:() => '商品'
+    },
+    disabled:{
+      type:[]
     }
   },
   computed:{