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

src/HDrpManagement/AccountMoney/modules/detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="text" @click="editBtn">明 细</el-button>
-    <el-drawer title="账户流水明细" append-to-body :visible.sync="dialogFormVisible" size="50%">
+    <el-drawer title="账户流水明细" append-to-body :visible.sync="dialogFormVisible" size="1300px">
       <div class="container">
         <el-input type="text" size="small" class="inline-16" style="width:200px;margin-bottom:10px" clearable @clear="getList" v-model="params.content.where.condition" placeholder="请输入搜索内容" @keyup.native.enter="getList(params.content.pageNumber=1)"></el-input>
         <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="600px">
@@ -55,7 +55,7 @@ export default {
         "id":20221022161304,
         "content": {
           "pageNumber":1,
-          "pageSize":20,
+          "pageSize":100,
           "sa_accountclassid":"",
           "sys_enterpriseid":"",
           "minAmount":20,
@@ -79,14 +79,18 @@ export default {
       this.params.content.sa_accountclassid = this.rowData.sa_accountclassid
       this.params.content.sys_enterpriseid = this.rowData.sys_enterpriseid
       let res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.total =res.total
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.params.content.pageSize = val
+      this.getList()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.params.content.pageNumber = val
+      this.getList()
     },
   }
 }

src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -13,7 +13,7 @@
         @onEditSuccess="queryMainData($route.query.id)"
         :statusCheck="[{key:'isonsale',value:1}]">
       <div slot="customOperation">
-        <Edit class="inline-16" :data="mainData" @onSuccess="queryMainData"/>
+        <Edit class="inline-16" v-if="mainData.isonsale == 0 && tool.checkAuth($route.name,'update')" :data="mainData" @onSuccess="queryMainData"/>
         <shelves class="inline-16" @upSuccess="queryMainData" :data="mainData"></shelves>
       </div>
       <div slot="slot0" >

src/HDrpManagement/orderManage/details/index.vue

@@ -3,7 +3,6 @@
     <basicDetails
         ref="details"
         :titleText="`${mainData.sonum}`"
-        :oldFormPath="{edit:'HDrpManagement/orderManage/modules'}"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20230105143002"
@@ -16,6 +15,7 @@
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation" class="inline-16">
+          <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
           <changeSaler class="inline-16" ref="saler" @selectRow="salerChange">
             <el-button v-if="tool.checkAuth($route.name,'changeSaler')" type="primary" slot="input" size="mini" @click="$refs.saler.visible=true;$refs.saler.listData()">变更业务员</el-button>
           </changeSaler>
@@ -88,6 +88,7 @@
 </template>
 
 <script>
+import Edit from '../modules/edit'
 import defaultInfo from './tabs/defaultInfo.vue';
 import productList from './tabs/productlist.vue'
 import confirmDate from '../modules/confirmDate.vue'
@@ -120,6 +121,7 @@ export default {
     }
   },
   components:{
+    Edit,
     defaultInfo,
     productList,
     confirmDate,
@@ -147,6 +149,7 @@ export default {
           }
         })
         this.mainData = res.data
+        console.log(this.mainData,'楚大');
         
         this.changeDataStructure()
         this.orderreviewtype()

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -313,6 +313,7 @@ export default {
         "id": 20221109093602,
         "content": val
       })
+      this.$emit('onSuccess')
       res.code === 1?fn():""
     },
     async dateChangeNeed(val){
@@ -374,6 +375,7 @@ export default {
       this.tool.showMessage(res,()=>{
         this.setcol = 24
         this.listData()
+        this.$emit('onSuccess')
       })
     },
   },

src/HDrpManagement/orderManage/modules/edit.vue

@@ -10,9 +10,9 @@
     <div slot="title">
       <div class="flex-align-center">
         <p><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>
-        <!-- <label style="font-size:14px;margin-left:10px" for="">备注:</label>
-        <input class="order__note__input" v-model="defaultData.remarks" type="text" placeholder="请输入订单备注"> -->
-         <p>运费:{{data.amount > data.freefreightamount >= 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>
+      </div>
+        <div class="flex-align-center">
+        <p style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${freefreightamount}元免运费,当前还差${freefreightamount - data.amount}元`}}</p>
       </div>
     </div>
     <div class="drawer__panel">
@@ -43,14 +43,14 @@
           <div class="flex-align-center">
             <p class="inline-16"><small>账户余额:&nbsp;</small><b>¥{{tool.formatAmount(defaultData.accountclass.balance?defaultData.accountclass.balance:0,2)}}</b></p>
             <p class="inline-16"><small>账户名称:&nbsp;</small>{{defaultData.accountclass.accountname?defaultData.accountclass.accountname:'未选择账户'}}</p>
-            <p><small>本单金额:&nbsp;</small>{{tool.formatAmount(data.amount - rebateamount,2)}}</p>
+            <p><small>本单金额:&nbsp;</small>{{data.rebate_used ? tool.formatAmount(data.defaultamount - rebateamount,2) : data.defaultamount}}</p>
           </div>
           <div v-if="(data.type === '标准订单' ||  data.type === '特殊订单') && isusedrebate === 1">
             <el-checkbox v-model="checked" :true-label="1" :false-label="0">使用返利金</el-checkbox>
             <div v-if="checked" class="flex-align-center">
               <p class="inline-16"><b>返利金余额:{{tool.formatAmount(defaultData.rebatebalance,2)}}</b></p>
-              <el-input class="inline-16" size="mini" style="width:150px" v-model="rebateamount" @blur="useRebate" placeholder="输入使用金额"></el-input>
-              <small>(返利金最高使用比例{{data.order_rebate_userate}}%,本单上限:{{tool.formatAmount(data.amount * data.order_rebate_userate / 100,2)}})</small>
+              <el-input class="inline-16" size="mini" style="width:150px" v-model="rebateamount" @blur="useRebate(data.rebateamount)" placeholder="输入使用金额"></el-input>
+              <small>(返利金最高使用比例{{data.order_rebate_userate}})</small>
             </div>
           </div>
         </div>
@@ -192,15 +192,15 @@
       <div class="mt-10">
         <div>
           <p class="normal-title inline-16">订单产品</p>
-          <el-button type="text" size="mini" @click="addMoreProduct">{{setcol === 12?'关闭选择':'添加产品'}}</el-button>
+          <!-- <el-button type="text" size="mini" @click="addMoreProduct">{{setcol === 12?'关闭选择':'添加产品'}}</el-button> -->
         </div>
         <el-row :gutter="10">
           <el-col :span="setcol">
             <product-list ref="prolist" :data="data" :type="'edit'" @onSuccess="onEditSuccess"></product-list>
           </el-col>
-          <el-col :span="24 - setcol">
+          <!-- <el-col :span="24 - setcol">
             <add-product ref="addpro" :data="data" @onConfirm="onConfirm"></add-product>
-          </el-col>
+          </el-col> -->
         </el-row>
       </div>
     </div>
@@ -234,6 +234,7 @@ export default {
   inject:['thisDetail'],
   data () {
     return {
+      freefreightamount:'',
       checked:0,
       visible:false,
       visible1:false,
@@ -262,14 +263,24 @@ export default {
       signbackstatus:'不需要',
       saletype:"",
       saler_name:"",
-      billdate:''
+      billdate:'',
     }
   },
   mounted () {
     console.log(this.data);
-    
+  },
+  created () {
+    this.queryBasicInfo()
   },
   methods:{
+    async queryBasicInfo () {
+      const res = await this.$api.requested({
+        "id":20220920084001,"content":{},
+      })
+      this.freefreightamount = res.data.freefreightamount
+      console.log(res.data);
+      
+    },
     onShow () {
       this.initPage()
     },
@@ -345,67 +356,45 @@ export default {
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
         if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
-          this.isusedrebate === 1?this.useRebate():""
+          this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
         }
         
         this.drawer = false
       })
     },
     onEditSuccess () {
-      this.$refs.addpro.listData()
+      // this.$refs.addpro.listData()
+      this.$emit('onSuccess')
     },
     addMoreProduct () {
       this.setcol === 12?this.setcol = 24 : this.setcol = 12
     },
-    // 订单添加商品
-    async onConfirm (data) {
-      const res = await this.$api.requested({
-        "id": 20221109093602,
-        "content": {
-          "sa_orderid": this.$route.query.id, //订单ID
-          "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID
-          "type":this.data.type, //订单类型
-          "items": data.map(e=>{
-            return {
-              sa_orderitemsid:0,
-              itemid:e.itemid,
-              qty:e.orderminqty,
-              needdate:e.deliverydate
-            }
-          })
-        },
-      })
-      this.tool.showMessage(res,()=>{
-        this.setcol = 24
-        this.$refs['prolist'].listData()
-        // this.$emit('onSuccess')
-      })
-    },
-    async useRebate () {
+    async useRebate (e) {
       let that = this
-      if (this.rebateamount > this.defaultData.rebatebalance ||this.rebateamount > (this.data.amount * this.data.order_rebate_userate / 100) ) return  this.$message({
-        message:`余额不足或已超过可用上限!`,
-        type:function () {
-          that.rebateamount = 0
-          return 'error'
-        }()
-      })
-      if (this.rebateamount == null) return this.$message({
-          message:"返利金不能为空",
-          type:'error'
-        })
+      /* 修改返利金 */
+        let rebateamount = e;
+        let amount = this.data.order_rebate_userate * this.data.defaultamount;//最大可用金额
       const res = await this.$api.requested({
-        "id": 20230218225002,
-        "content": {
-          "sa_orderid": this.data.sa_orderid, //订单金额
-          "isused": this.checked, //是否使用
-          "rebateamount": this.rebateamount //返利金使用金额
-        },
-      })
-      if (res.code === 0) this.$message({
-        message:`使用返利金失败!${res.msg}`,
-        type:'error'
-      })
+              "id":20230218225002,
+              "content":{
+                "sa_orderid":this.data.sa_orderid,//订单金额
+                "isused":1,//是否使用
+                "rebateamount":rebateamount>amount?amount:rebateamount
+              }
+            })
+      if(res.data=='成功'){
+        this.$emit('onSuccess')
+        this.initPage()
+        if(rebateamount>amount){
+          this.data.rebateamount=amount
+          this.$message({
+            message: '返利金最大可用值'+ amount,
+            type: 'warning'
+          });
+        }
+      }else{
+        this.$message.error(res.msg);
+      }
     },
     // 查询站点是否使用返利金
     async queryUsedrebate () {

src/HManagement/archives_ad/archives_adclass/modules/delete.vue

@@ -15,8 +15,7 @@ export default {
     },
     deleteRow() {
       this.$api.requested({
-        "classname": "webmanage.saletool.sharematerial.sharematerialClass",
-        "method": "delete",
+        "id":20221102143502,
         "content": {
           "sat_sharematerial_classid": this.data.sat_sharematerial_classid
         }

src/HManagement/archives_ad/index.vue

@@ -112,7 +112,7 @@ export default {
       this.$api.requested({
         "id": 20221102143602,
         "content": {
-          "sat_sharematerialid": list
+          "sat_sharematerialids": list
         }
       }).then(res => {
         console.log("处理删除", res);
@@ -146,6 +146,7 @@ export default {
       })
     },
     EditBtn (data) {
+      this.$store.dispatch('pageOnlyRead',false)
       window.sessionStorage.setItem('newMaterial', JSON.stringify(data))
       this.$store.dispatch('DrawerShowChange',true)
       this.$router.push({path:'/upload_archives',query:{id:data.sat_sharematerialid}})

src/HManagement/archives_ad/modules/add.vue

@@ -45,6 +45,7 @@ export default {
   methods: {
     /* 新增并编辑素材 */
     async add(type) {
+      this.$store.dispatch('pageOnlyRead',false)
       let classid = '9999' + JSON.parse(window.sessionStorage.getItem("active_account")).userid;
       let res = await this.$api.requested({
         "classname": "webmanage.saletool.sharematerial.sharematerial",

src/HManagement/archives_sc/index.vue

@@ -46,6 +46,13 @@
         <!-- <el-button type="text" size="mini" class="inline-16" @click="$router.push({path:'/archives_scedit',query:{id:scope.data.data.sat_coursewareid}})">编 辑</el-button> -->
         <!-- <el-button type="text" v-if="tool.checkAuth($route.name,'update') && scope.data.data.status == '新建'" size="mini" @click="EditBtn(scope.data.data)">编 辑</el-button> -->
         <el-button type="text" v-if="tool.checkAuth($route.name,'data_analysis')" class="inline-16" size="mini" @click="dataCalc(scope.data.data)">数 据 分 析</el-button>
+        <delete-btn
+          v-if="tool.checkAuth($route.name,'delete')"
+          nameId="20221102143802" 
+          nameKey="sat_coursewareids" 
+          message="确定删除当前课程吗?" 
+          :id="scope.data.data.sat_coursewareid" 
+          @deleteSuccess="$refs.basicLayout.listData()"></delete-btn>
       </template>
     </basicLayout>
     <!--抽屉面板-->
@@ -157,7 +164,7 @@ export default {
       this.$api.requested({
         "id": 20221102143802,
         "content": {
-          "sat_coursewareid": list
+          "sat_coursewareids": list
         }
       }).then(res => {
         if (res.msg != '成功') return;

src/HManagement/archives_sc/list/modules/add.vue

@@ -56,7 +56,7 @@
                 <el-col :span="24">
                   <el-form-item label="封面">
                     <upload btntype="limage" :folderid="folderid" accept=".JPG,.PNG"
-                      :bindData="{ ownertable: 'SAT_COURSEWARE', ownerid: '', usetype: 'cover' }"></upload>
+                      :bindData="{ ownertable: 'SAT_COURSEWARE', ownerid: '', usetype: 'cover' }" ></upload>
                     <p class="info">注：建议上传图片大小210*120px像素，大小不超过2M，格式为JPG/PNG</p>
                   </el-form-item>
                 </el-col>

src/HManagement/archvies_mag/modules/list.vue

@@ -67,7 +67,7 @@ export default {
         "classname": "webmanage.saletool.salematerial.salematerial",
         "method": "selectList",
         "content": {
-          "parentid": 0,
+          "parentid": JSON.parse(sessionStorage.getItem('folderid')).salematerialfolderid,
           "pageNumber": 1,
           "pageSize": 20,
           "where": {
@@ -133,7 +133,7 @@ export default {
     },
     folderDetails(folder) {
       if (folder.postfix === 'FOLDER') {
-        // this.$router.push({ path: '/archvies_mag', query: { id: folder.attachmentid } })
+        this.$router.push({ path: '/archvies_mag', query: { id: folder.attachmentid } })
         // this.$emit('toFolderDetail', folder.attachmentid)
         // this.queryAttachment(folder.attachmentid)
         this.upFileData(folder.parentid, folder.document,folder.attachmentid)

src/HManagement/notice/list/modules/add_notice.vue

@@ -222,6 +222,8 @@ export default {
           "sat_noticeid": this.$route.query.id
         }
       })
+      console.log(res.data);
+      
       this.attinfo_video = res.data.attinfos.filter(e => {
         if (e.postfix === 'mp4' || e.postfix === 'ogg' || e.postfix === 'webm') {
           return e

src/HManagement/notice/list/modules/message.vue

@@ -6,7 +6,7 @@
         :visible.sync="dialogTableVisible"
         :with-header="false"
         direction="rtl"
-        size="60%"
+        size="1110px"
         append-to-body>
         <div class="container normal-panel">
           <p style="font-size:16px;font-weight:bold">留言明细</p>

src/SManagement/archives_admag/index.vue

@@ -33,10 +33,10 @@
           <list :fileData="fileData" @listItemClick="listItemClick"
             v-if="tool.checkAuth($route.name, 'read')">
             <template v-slot:edit="scope">
-              <Edit :fileData="scope.data" v-if="tool.checkAuth($route.name, 'update')"></Edit>
+              <Edit :fileData="scope.data" v-if="tool.checkAuth($route.name, 'update') && scope.data.isAuth"></Edit>
             </template>
             <template v-slot:delete="scope">
-              <Delete :data="scope.data" @removeSuccess="getFileList" v-if="tool.checkAuth($route.name, 'delete')"></Delete>
+              <Delete :data="scope.data" @removeSuccess="getFileList" v-if="tool.checkAuth($route.name, 'delete') && scope.data.isAuth"></Delete>
             </template>
           </list>
           <pagination :total="total" :pageSize="params.content.pageSize" :currentPage="params.content.pageNumber"

src/components/scopeOfAuthority/modules/dep_auth.vue

@@ -1,10 +1,11 @@
 <template>
+            <!-- :disabled="disabled != 'undefined' ? disabled : ''" -->
+
   <div>
     <el-row :gutter="20">
       <el-col :span="12">
         <div class="tree-panel">
           <el-tree
-            :disabled="disabled != 'undefined' ? disabled : ''"
             ref="tree"
             :data="deplist"
             node-key="departmentid"