Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue

@@ -51,6 +51,8 @@
               :props="defaultProps"
               :indent="80"
               :expand-on-click-node="false"
+              :render-content="renderContent"
+              node-key="机床流水号"
               class="selectTree"
               default-expand-all
               @node-click="onClick"/>
@@ -181,6 +183,9 @@ export default {
         })
       }
     },
+    renderContent(h, { node, data, store }) {
+      return (<span class='treeNotes'>{node.label}</span>)
+    },
     searchTable1(row) {
       this.tableData1 = []
       selectProcedure(row.工艺计划流水号).then(response => {
@@ -196,5 +201,11 @@ export default {
     .el-tree-node__content>.el-tree-node__expand-icon{
       display: inline !important;
     }
+    .el-tree-node:focus > .el-tree-node__content {
+      background-color: #ccc !important;
+    }
+  }
+  .treeNotes {
+    background-color: green;
   }
 </style>

src/views/MarketingCenter/ContractCapitalManagement/index.vue

@@ -9,8 +9,6 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <!--      <span style="margin-left: 10px">营销经理：</span>-->
-      <!--      <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>-->
       <span>客户名称：</span>
       <el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px " size="small" clearable>
         <el-option
@@ -20,12 +18,12 @@
           :value="item.value"/>
       </el-select>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
-      <!--      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>-->
       <el-badge :value="value" :max="99" class="item">
         <el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>
       </el-badge>
     </el-card>
     <el-card>
+      <el-col :span="14">
         <el-table
           v-loading="listLoading"
           :row-key="getRowKeys"
@@ -167,8 +165,8 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
         </div>
-    </el-card>
+      </el-col>
-    <el-card>
+      <el-col :span="10">
         <el-table
           v-loading="listLoading2"
           :row-style="tableRowClassName1"
@@ -319,7 +317,9 @@
           <!--          </template>-->
           <!--        </el-table-column>-->
         </el-table>
+      </el-col>
     </el-card>
+
     <!--新增合同资金对话框-->
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
       <el-form ref="form2" :model="form2" :rules="rules" label-position="left">
@@ -411,14 +411,6 @@
       <span>姓名：</span>
       <el-input v-model="name" clearable size="small" style="width: 200px"/>
       <el-button size="small" icon="el-icon-search" style="margin-left: 10px" type="success" @click="searchName">查询</el-button>
-      <!--<span>责权省份：</span>-->
-      <!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
-      <!--<el-option-->
-      <!--v-for="item in Province"-->
-      <!--:key="item.value"-->
-      <!--:label="item.label"-->
-      <!--:value="item.value"/>-->
-      <!--</el-select>-->
       <div style="margin-top: 15px">
         <el-table :data="dataPeople" border stripe size="mini" style="width: 100%; text-align: center;margin-top: 15px" highlight-current-row @row-click="handleChange">
           <el-table-column label="销售经理" align="center" >