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

# Conflicts:
#	src/SDrpManagement/myaccountclass/index.vue

src/HDrpManagement/AccountMoney/index.vue

@@ -6,7 +6,8 @@
       formPath="AccountMoney" 
       tableName="accountMoneyTable" 
       :apiId="{query:20221008145903}"
-      :options="options">
+      :options="options"
+      @listCreate="list">
       <template #custom>
         <div class="mt-10">
           <label class="search__label">企业:</label>
@@ -80,6 +81,9 @@ export default {
     this.getAccountType()
   },
   methods:{
+    list (param) {
+      param.content.sys_enterpiseid = JSON.parse(window.sessionStorage.getItem('accountinfo')).enterprise.sys_enterpriseid
+    },
     /** 获取公司数据 */
     async getEnterprise () {
       let res = await this.$api.requested({

src/HDrpManagement/ProductMag/detail/index.vue

@@ -3,7 +3,6 @@
     <basicDetails
         ref="details"
         :titleText="mainData.itemname"
-        :oldFormPath="{edit:'HDrpManagement/ProductMag/modules'}"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20220923140602"
@@ -17,6 +16,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
+        <Edit class="inline-16" :data="mainData" @onSuccess="queryMainData" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'"/>
         <customBtn 
           btnName="审核"
           message="确认审核当前商品吗?"
@@ -44,7 +44,7 @@
           message="确认上架当前商品吗?"
           idName="20220923154802"
           keyName="itemids"
-          :id="$route.query.id"
+          :id="[+$route.query.id]"
           :paramData="[{key:'isonsale',value:1}]"
           @onSuccess="queryMainData($route.query.id)"
           class="inline-16"
@@ -55,7 +55,7 @@
           message="确认下架当前商品吗?"
           idName="20220923154802"
           keyName="itemids"
-          :id="$route.query.id"
+          :id="[+$route.query.id]"
           :paramData="[{key:'isonsale',value:0}]"
           @onSuccess="queryMainData($route.query.id)"
           class="inline-16"
@@ -68,7 +68,11 @@
       <div slot="slot1">
         <saleClass ref="saleClass" :data="mainData">
           <template v-slot:addClass="scope">
+<<<<<<< HEAD
             <addClass v-if="tool.checkAuth($route.name,'salerClass') && mainData.status === '新建'" :data="scope.data" @onSuccess="$refs.saleClass.listData();queryMainData($route.query.id)"/>
+=======
+            <addClass v-if="tool.checkAuth($route.name,'salerClass')" :data="mainData" @onSuccess="$refs.saleClass.listData();queryMainData($route.query.id)"/>
+>>>>>>> xiaoqin
           </template>
         </saleClass>
       </div>
@@ -80,6 +84,7 @@
 </template>
 
 <script>
+import Edit from '../modules/edit'
 import detail_data from './modules/detailedData'
 import saleClass from '../modules/saleClass.vue'
 import productPrice from '../modules/productPrice'
@@ -92,7 +97,7 @@ export default {
       mainAreaData:{}
     }
   },
-  components:{detail_data,saleClass,productPrice,addClass},
+  components:{detail_data,saleClass,productPrice,addClass,Edit},
   methods: {
     async queryMainData(id) {
       const res = await this.$api.requested({

src/HDrpManagement/ProductMag/index.vue

@@ -49,12 +49,7 @@
       <template v-slot:tbList="scope">
         <div>
         <p :style="scope.data.column.data.isonsale === 1?'color:#52c41a':'color:red'" v-if="scope.data.column.columnname === 'isonsale'">
-          <el-switch
-            v-model="scope.data.column.data.isonsale"
-            :active-value='1'
-            :inactive-value='0'
-            @change="isOnSaleChange(scope.data.column.data)">
-          </el-switch>
+          {{ scope.data.column.data.isonsale ? '上架' : '下架' }}
         </p>
         <p v-else-if="scope.data.column.columnname === 'cover'">
           <previewImage v-if="scope.data.column.data.attinfos[0]" class="image" :image="scope.data.column.data.attinfos[0]" :list="scope.data.column.data.attinfos" :deletebtn="false"></previewImage>

src/HDrpManagement/orderManage/modules/edit.vue

@@ -334,7 +334,10 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
-        this.isusedrebate === 1?this.useRebate():""
+        if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+          this.isusedrebate === 1?this.useRebate():""
+        }
+        
         this.drawer = false
       })
     },

src/HManagement/siteManage/systemRemind/components/edit.vue

@@ -129,9 +129,8 @@ export default {
     /* 角色选择结果 */
     roleResult (result) {
       this.form.rolename = result.map(item => item.rolename).join(',')
-      this.form.rolemsg = result.map(item => item.rolename)
       this.form.roleids = result.map(item => item.roleid)
-      console.log(this.form.rolemsg);
+      console.log(this.form.rolename,result);
       
     },
     /* 人员选择结果 */

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -134,9 +134,6 @@ export default {
   padding-bottom:16px;
   border-bottom: 1px solid #e3e5ea;
 }
-.normal-margin{
-  margin-bottom: 2px !important;
-}
 .border-all{
   margin-left: 0px
 }

src/SDrpManagement/Products/modules/Select.vue

@@ -134,9 +134,6 @@ export default {
   padding-bottom:16px;
   border-bottom: 1px solid #e3e5ea;
 }
-.normal-margin{
-  margin-bottom: 2px !important;
-}
 .border-all{
   margin-left: 0px
 }

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -308,7 +308,9 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
-        this.isusedrebate === 1?this.useRebate():""
+        if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+          this.isusedrebate === 1?this.useRebate():""
+        }
         this.drawer = false
       })
     },

src/SDrpManagement/myaccountclass/index.vue

@@ -15,14 +15,14 @@
               </div>
             </el-col>
           </el-row>
-<!--          <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>-->
           <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="calc(100vh - 390px)">
             <template v-slot:customcol="scope">
-              <div v-if="scope.column.columnname === 'type'">
-                {{scope.column.data[scope.column.columnname] === 1?'收入':'支出'}}
+              <div v-if="scope.column.columnname == 'type'">
+                {{ scope.column.data.type ? '收入凭证' : '支出凭证' }}
+              </div>
+              <div v-else>
+                {{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]]:'--'}}
               </div>
-              <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
             </template>
             <template v-slot:opreation="scope">
               <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data"/>
@@ -66,10 +66,7 @@ export default {
         "content": {
           "pageNumber":1,
           "pageSize":20,
-          "sa_accountclassid":"",
-          /*"where": {
-            "condition": ""
-          }*/
+          "sa_accountclassid":""
         }
       },
       total:0
@@ -81,7 +78,9 @@ export default {
     async listData () {
       const res = await this.$api.requested({
         id:"20221008145903",
-        content:{}
+        content:{
+          "sys_enterpriseid":JSON.parse(window.sessionStorage.getItem('accountinfo')).enterprise.sys_enterpriseid
+        }
       })
       this.acountlist = res.data
       console.log(this.acountlist);

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -308,7 +308,9 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
-        this.isusedrebate === 1?this.useRebate():""
+        if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+          this.isusedrebate === 1?this.useRebate():""
+        }
         this.drawer = false
       })
     },

src/SDrpManagement/shopCart/modules/total.vue

@@ -6,7 +6,8 @@
     <div class="flex-align-center">
       <div class="prcieInfo">
         <p>共&nbsp;{{data.length}}&nbsp;件商品&emsp;总价 : <span class="price">¥&nbsp;{{tool.formatAmount(total,2)}}</span></p>
-        <p class="text-grey">订单满{{freefreightamount}}元,免运费</p>
+        <!-- <p class="text-grey">订单满{{freefreightamount}}元,免运费</p> -->
+        <p>{{total > freefreightamount >= 0?'当前订单免运费':`订单满${freefreightamount}元免运费,当前还差${freefreightamount - total}元`}}</p>
       </div>
       <div class="submitBtn" @click="confirmOrder">生成订单</div>
     </div>

src/template/invoiceCanUseTax/index.vue

@@ -12,25 +12,28 @@
         border>
         <el-table-column
           prop="enterprisename"
-          label="经销商名称"
+          label="开票单位"
           width="180">
         </el-table-column>
         <el-table-column
-          prop="agentnum"
-          label="经销商编号"
+          prop="taxno"
+          label="税号"
           width="180">
         </el-table-column>
          <el-table-column
-          prop="contact"
-          label="联系人"
+          prop="address"
+          label="开票地址"
           width="90">
         </el-table-column>
         <el-table-column
-          label="地址"
+          label="开户行"
+          prop="bank"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          label="开票账户"
+          prop="bankcardno"
           width="180">
-          <template slot-scope="scope">
-            {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
-          </template>
         </el-table-column>
         <el-table-column
           label="操作"