Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/views/saleOrder/components/EquipmentDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="选择成品"
+    title="选择产品"
     :visible.sync="equipmentdialog"
     :before-close="handleClose"
     :close-on-click-modal="false"
@@ -32,7 +32,7 @@
         <el-col :span="6" class="tree_col">
           <AssetTree
             @handleNodeClick="handleNodeClick"
-            id="3"
+            id="9"
             :paramsType="'type'"
             ref="treeList"
           />
@@ -131,7 +131,8 @@
           code: this.code,
           pageNum: page,
           size: limit,
-          categoryLevelId: this.categoryLevelId
+          categoryLevelId: this.categoryLevelId,
+		  isProduct:true
         };
         const data = await getList(params);
         this.tableList = data.list;
@@ -182,7 +183,7 @@
     border: 1px solid #eee;
     padding: 10px 0;
     box-sizing: border-box;
-    height: 500px;
+    height: 530px;
     overflow: auto;
   }
   .table_col {

src/views/saleOrder/components/create-order.vue

@@ -42,7 +42,7 @@
         </el-col>
         <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
           <el-form-item label="客户名称:">
-            <el-input clearable v-model="form.customerName" />
+            <el-input clearable v-model="form.customerName" :disabled="form.orderType==3"/>
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">