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

src/HDrpManagement/writeoffbill/modules/order/index.vue

@@ -16,7 +16,7 @@
       <slot name="addOrder"></slot>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="true"  :height="tableHieght" fixedName="operation writeoffamount unwriteoffamount">
+      <tableLayout :layout="tablecols" height="400px" :data="list" :custom="true" :width="true" fixedName="operation writeoffamount unwriteoffamount">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'writeoffamount'">
             <el-input size="small" v-if="currentItem.sa_writeoffbill_orderid == scope.column.data.sa_writeoffbill_orderid" v-model="scope.column.data.writeoffamount"></el-input>
@@ -53,7 +53,6 @@ export default {
   props:["data"],
   data () {
     return {
-      tableHieght:"600px",
       tablecols:[],
       list:[],
       total:0,
@@ -145,5 +144,4 @@ export default {
 
 </script>
 <style scoped>
-
 </style>

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

@@ -85,7 +85,7 @@
           </div>
         </el-col>
         <el-col :span="12">
-          <scopeOfauth :onlyread="true" :defaultData="defaultData" appidname="sat_coursewareid" obiectName="sat_courseware" :dataid="$route.query.id"
+          <scopeOfauth v-if="Object.keys(defaultData).length" :onlyread="true" :defaultData="defaultData" appidname="sat_coursewareid" obiectName="sat_courseware" :dataid="$route.query.id"
             @onChecked="onChecked"></scopeOfauth>
         </el-col>
       </el-row>

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

@@ -154,9 +154,10 @@ export default {
         })
         
         this.selectDetail()
-        this.insertCoursewareauth()
+        this.insertCoursewareauth(() => {
+          this.$router.push({path:'/archives_scdetails',query:{id:res.data.sat_coursewareid,rowindex:res.data.rowindex}})
+        })
         callback?callback(res):''
-        this.$router.push({path:'/archives_scdetails',query:{id:res.data.sat_coursewareid,rowindex:res.data.rowindex}})
       });
     },
     async selectDetail() {
@@ -224,7 +225,7 @@ export default {
       this.authData = param
     },
     // 新增授权范围
-    async insertCoursewareauth() {
+    async insertCoursewareauth(callback) {
       const res = await this.$api.requested({
         "classname": "webmanage.saletool.courseware.coursewareauth",
         "method": "insert",
@@ -235,6 +236,7 @@ export default {
         message: res.data,
         type: 'error'
       }) : ''
+      callback && callback()
     },
     // 查询授权信息
     async query_auth() {

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -41,7 +41,7 @@
       <tableLayout :layout="tablecols" checkbox="true"  :data="list" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="offerPrice amount" @selectionChange="selectionChange">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
-            <el-input-number :disabled="data.status !== '新建' || !tool.checkAuth($route.name,'productDetails') || !disabled" v-model="scope.column.data.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.column.data.qty,scope.column.data,scope.$index)"></el-input-number>
+            <el-input-number v-model="scope.column.data.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.column.data.qty,scope.column.data,scope.$index)"></el-input-number>
           </div>
           <div v-else-if="scope.column.columnname == 'discountrate'" >
             <el-input  :disabled="data.status !== '新建' || !tool.checkAuth($route.name,'productDetails') || !disabled"  v-model="scope.column.data.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.column.data.discountrate,scope.column.data,scope.$index)"></el-input>

src/components/dynamic-table/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
-    <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini" :height="data.length <= 4?'260px':data.length <= 20?'':'calc(100vh - 420px)'"  @row-click="rowClick" style="width:100%;min-height:260px;max-height: calc(100vh - 420px)" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
+    <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini" :height="data.length <= 4?'260px':data.length <= 20?'calc(100vh - 420px)':'calc(100vh - 420px)'"  @row-click="rowClick" style="width:100%;min-height:260px;max-height: calc(100vh - 420px)" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
               :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange">
       <el-table-column
           type="selection"

src/components/normal-basic-layout/index.vue

@@ -23,7 +23,7 @@
               </el-button-group> -->
               <!-- <el-button class="inline-16" size="small" type="primary" plain>导 入</el-button> -->
               <excel class="inline-16" :tablecols="layout" :param="param" :total="total" :specialKey="specialKey" :excelTitle="routerName"></excel>
-              <reportCenter class="inline-16" position="detail" size="small" :data="reportCenterLsit.filter(item => item.type == 'datainfo')" v-if="reportCenterLsit.filter(item => item.type == 'datainfo').length > 0 && systemappid != 163">
+              <reportCenter btnName="报 表" class="inline-16" position="detail" size="small" :data="reportCenterLsit.filter(item => item.type == 'datainfo')" v-if="reportCenterLsit.filter(item => item.type == 'datainfo').length > 0 && systemappid != 163">
                 <template v-slot:print="scope2">
                   <el-button @click="printBtn({},scope2.data)" type="text" size="mini">打 印</el-button>
                 </template>

src/components/normal-basic-layout/reportCenter/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button :type="position == 'detail' ? 'primary' : 'text'" :size="size || 'mini'" @click="drawer=true">报 表</el-button>
+    <el-button :type="position == 'detail' ? 'primary' : 'text'" :size="size || 'mini'" @click="drawer=true">{{ btnName ? btnName : '导 出' }}</el-button>
     <el-drawer
     :visible.sync="drawer"
     :with-header="false"
@@ -8,7 +8,7 @@
     size="50%"
     append-to-body>
     <div class="detail__panel container">
-      <p class="normal-title" style="margin-bottom:16px">报表数据</p>
+      <p class="normal-title" style="margin-bottom:16px">选择模板</p>
       <el-table
         :data="data"
         height="250"
@@ -34,7 +34,7 @@
 
 <script>
 export default {
-  props:['data','position','size'],
+  props:['data','position','size','btnName'],
   name: '',
   data() {
     return {