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

src/components/jeecg/modal/ProcessPlan.vue

@@ -54,11 +54,11 @@
 
       <!-- table区域-begin -->
       <div>
-        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-          <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-          this.selectedRowKeys.length }}</a>项
-          <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-        </div>
+<!--        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--          <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
+<!--          this.selectedRowKeys.length }}</a>项-->
+<!--          <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--        </div>-->
 
         <a-table
           ref="table"
@@ -71,10 +71,12 @@
           :dataSource="dataSource"
           :pagination="pagination"
           :loading="loading"
-          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           :customRow="clickThenSelect"
           @change="handleTableChange">
-
+        <span slot="describes" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="30"/>
+        </span>
           <template slot="htmlSlot" slot-scope="text">
             <div v-html="text"></div>
           </template>
@@ -173,6 +175,7 @@
           {
             title: '流程提示',
             align: 'center',
+            scopedSlots: { customRender: 'describes' },
             dataIndex: 'describes'
           },
           {

src/views/dashboard/HomePage.vue

@@ -270,7 +270,7 @@ export default {
 <style scoped>
 @import url("http://at.alicdn.com/t/c/font_3733417_ws9m9bvag1h.css");
 
-/deep/.bottom-div > ant-card-body {
+.bottom-div > /deep/.ant-card-body {
   padding: 10px 24px;
 }
 
@@ -355,6 +355,7 @@ export default {
 
 /deep/.ant-card-body{
   height: 80%;
+  padding: 10px 24px;
 }
 
 .bottom-div /deep/.ant-card-head{

src/views/processmaterials/ProcessUdgetPlanMaterialList.vue

@@ -25,10 +25,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
@@ -40,7 +40,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
         <template slot="htmlSlot" slot-scope="text">
@@ -101,6 +100,7 @@
       mainId:{
         immediate: true,
         handler(val) {
+          console.log("val>>>>>>>>>>>>>>>>>>>>>>>>>>>",val)
           if(!this.mainId){
             this.clearList()
           }else{
@@ -203,6 +203,7 @@
           {
             title:'单价',
             align:"center",
+            disabled: this.disabled,
             dataIndex: 'materialPrice'
           },
          /* {