Merge branch 'mergeBranch' into allTestUrgent

src/HDrpManagement/contractManage/components/productClassList/addProduct.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="small" :disabled="disabled" @click="addBtn">{{$t(title?title:'添 加')}}</el-button>
-    <el-drawer append-to-body size="80%" :with-header="false" :visible.sync="drawer" @close="onClose">
+    <el-drawer append-to-body size="800px" :with-header="false" :visible.sync="drawer" @close="onClose">
       <div class="container ">
         <p class="normal-title normal-margin">{{$t(`产品类别`)}}</p>
         <div class="drawer__panel" style="margin-bottom: 0 !important;">
@@ -116,8 +116,10 @@ export default {
         // 新节点
         var elNode = {
           itemclassname: node["itemclassname"],
+          itemclassfullname: node["itemclassfullname"],
           itemclassnum:node["itemclassnum"],
           brandname:node["brandname"],
+          disabled:!node["isCheck"],
           isCheck:node["isCheck"],
           itemclassid:node['itemclassid'],
           selected:false,

src/HDrpManagement/orderManage/modules/edit.vue

@@ -267,7 +267,8 @@
           <div :style="{marginTop:projectError?'20px':''}">
             <small class="inline-16"><span style="color:red;">*</span><b>{{$t(`关联项目`)}}:</b>&nbsp;</small>
             <popoverTemp class="inline-16" :tablecols="tablecols" :isButton="false" :params="paramsProject" :isRest="true"
-                         placeholder="选择关联项目" @rowClick="rowClick" :inputData="projectname"></popoverTemp>
+                         placeholder="选择关联项目" @rowClick="rowClick" :disVal="true" :inputData="projectname"></popoverTemp>
+            <el-button type="primary" size="small" @click="clearProject">清空</el-button>
           </div>
           <div v-if="projectError" style="color:red;font-size: 12px;margin-left: 90px;">{{projectError}}</div>
         </div>
@@ -456,7 +457,7 @@ export default {
         "content": {
           "sys_enterpriseid": '',
           "pageNumber": 1,
-          "pageSize": 100,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -751,6 +752,11 @@ export default {
       this.projectname = val.projectname
       this.sa_projectid = val.sa_projectid
       this.projectError = ''
+    },
+    clearProject(){
+      this.projectname = ''
+      this.sa_projectid = ''
+      this.projectError = ''
     }
   },
 }

src/SDrpManagement/QuotedPrice/detail/modules/itemClass/add.vue

@@ -109,9 +109,11 @@ export default {
         // 新节点
         var elNode = {
           itemclassname: node["itemclassname"],
+          itemclassfullname: node["itemclassfullname"],
           itemclassnum:node["itemclassnum"],
           brandname:node["brandname"],
           num:node["num"],
+          disabled:!node["isCheck"],
           isCheck:node["isCheck"],
           itemclassid:node['itemclassid'],
           selected:false,

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -487,7 +487,8 @@
             <div :style="{marginTop:projectError?'20px':''}">
               <small class="inline-16"><span style="color:red;">*</span><b>{{$t(`关联项目`)}}:</b>&nbsp;</small>
               <popoverTemp class="inline-16" :tablecols="tablecols" :isButton="false" :params="paramsProject" :isRest="true"
-                           placeholder="选择关联项目" @rowClick="rowClick" :inputData="projectname"></popoverTemp>
+                           placeholder="选择关联项目" @rowClick="rowClick" :disVal="true" :inputData="projectname"></popoverTemp>
+              <el-button type="primary" size="small" @click="clearProject">清空</el-button>
             </div>
             <div v-if="projectError" style="color:red;font-size: 12px;margin-left: 90px;">{{projectError}}</div>
           </div>
@@ -718,7 +719,7 @@ export default {
         "content": {
           "sys_enterpriseid": '',
           "pageNumber": 1,
-          "pageSize": 100,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -1006,6 +1007,11 @@ export default {
       this.projectname = val.projectname
       this.sa_projectid = val.sa_projectid
       this.projectError = ''
+    },
+    clearProject(){
+      this.projectname = ''
+      this.sa_projectid = ''
+      this.projectError = ''
     }
   },
   mounted () {

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -474,7 +474,8 @@
             <div :style="{marginTop:projectError?'20px':''}">
               <small class="inline-16"><span style="color:red;">*</span><b>{{$t(`关联项目`)}}:</b>&nbsp;</small>
               <popoverTemp class="inline-16" :tablecols="tablecols" :isButton="false" :params="paramsProject" :isRest="true"
-                           placeholder="选择关联项目" @rowClick="rowClick" :inputData="projectname"></popoverTemp>
+                           placeholder="选择关联项目" @rowClick="rowClick" :disVal="true" :inputData="projectname"></popoverTemp>
+              <el-button type="primary" size="small" @click="clearProject">清空</el-button>
             </div>
             <div v-if="projectError" style="color:red;font-size: 12px;margin-left: 90px;">{{projectError}}</div>
           </div>
@@ -712,7 +713,7 @@ export default {
         "content": {
           "sys_enterpriseid": '',
           "pageNumber": 1,
-          "pageSize": 100,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -1001,6 +1002,11 @@ export default {
       this.projectname = val.projectname
       this.sa_projectid = val.sa_projectid
       this.projectError = ''
+    },
+    clearProject(){
+      this.projectname = ''
+      this.sa_projectid = ''
+      this.projectError = ''
     }
   },
   mounted () {

src/components/selectPopover/index.vue

@@ -133,7 +133,7 @@
 <script>
 export default {
   props:["tablecols","params","placeholder",'restName','inputData','isRest','isContracted','type',
-    'idName','isButton','inputSize','disabled','isTask','rowIndex'],
+    'idName','isButton','inputSize','disabled','isTask','rowIndex','disVal'],
   name: "index",
   data(){
     return {
@@ -165,6 +165,8 @@ export default {
       this.visible = false
       if (this.isButton){
         this.$emit('rowClick',val)
+      }else if(this.disVal){
+        this.$emit('rowClick',val,this.type,this.restName,this.idName,this.rowIndex)
       }else {
         this.inputData = val[this.restName]
         this.$emit('rowClick',val,this.type,this.restName,this.idName,this.rowIndex)

src/components/treeTable/index.vue

@@ -9,13 +9,13 @@
         size="small"
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column
-          prop="itemclassname"
+          prop="itemclassfullname"
           show-overflow-tooltip
           :label="$t(`类别名称`)"
           width="300">
         <template slot-scope="scope">
           <el-checkbox v-model="scope.row.selected" :checked="scope.row.selected" @change="onRowSelect(scope.row)" :disabled="scope.row.disabled" style="margin-right: 5px"></el-checkbox>
-          <span style="color:#3874f6"><b>{{scope.row.itemclassname}}</b></span>
+          <span style="color:#3874f6"><b>{{scope.row.itemclassfullname}}</b></span>
         </template>
       </el-table-column>
       <el-table-column