opt:分支合并

mes/qd/src/views/wms/masterdata_manage/master/customer/index.vue

@@ -286,7 +286,8 @@ export default {
       })
     },
     getClass() {
-      crudClassstandard.getClass({ enabled: true, 'base_data_type': '05' }).then(res => {
+      //queryClassById?class_idStr=1528555443906023424
+      crudClassstandard.queryClassById({ enabled: true, 'class_idStr': '1704039126057226240' }).then(res => {
         this.classes = res.content.map(function(obj) {
           if (obj.hasChildren) {
             obj.children = null

mes/qd/src/views/wms/masterdata_manage/master/storagevehicleinfo/index.vue

@@ -81,7 +81,7 @@
           </el-form-item>
           <el-form-item label="物料编码" prop="material_code">
             <template slot-scope="scope">
-              <el-input v-model="materialForm.material_code" clearable style="width: 370px">
+              <el-input v-model="materialForm.material_code" clearable style="width: 370px" @clear="materialForm.material_id='',materialForm.material_code='',materialForm.material_name='',materialForm.material_spec=''">
                 <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
               </el-input>
             </template>
@@ -109,7 +109,7 @@
         @close="materiValueCancel()"
       >
         <el-form ref="form" :model="updateForm" :rules="rules" size="mini" label-width="110px">
-          <el-form-item label="载具编号" prop="material_code">
+          <el-form-item label="载具编号" prop="storagevehicle_code">
             <template slot-scope="scope">
               <el-input v-model="updateForm.storagevehicle_code" clearable>
               </el-input>
@@ -303,7 +303,7 @@ export default {
     return {
       updateForm: {},
       pointMVisible: false,
-      materType:'',
+      materType:'01',
       materialShow: false,
       dialogVisible: false,
       materialForm: {},
@@ -348,14 +348,10 @@ export default {
     },
     queryMater(index, row) {
       this.materialShow = true
-      this.nowindex = index
-      this.nowrow = row
     },
     setMaterValue(row) {
-      this.materialForm.material_id = row.material_id
-      this.materialForm.material_code = row.material_code
-      this.materialForm.material_name = row.material_name
-      this.materialForm.material_spec = row.material_spec
+      this.$set(this.materialForm, 'material_code', row.material_code)
+      this.$set(this.materialForm, 'material_spec', row.material_spec)
     },
     materiValueCancel(){
       this.updateForm = {}

mes/qd/src/views/wms/masterdata_manage/master/supp/index.vue

@@ -282,7 +282,7 @@ export default {
       })
     },
     getClass() {
-      crudClassstandard.getClass({ enabled: true, 'base_data_type': '04' }).then(res => {
+      crudClassstandard.queryClassById({ enabled: true, 'class_idStr': '1704039126057226240' }).then(res => {
         this.classes = res.content.map(function(obj) {
           if (obj.hasChildren) {
             obj.children = null

mes/qd/src/views/wms/pdm/device/index.vue

@@ -62,17 +62,17 @@
 <!--        >-->
 <!--          设备详情-->
 <!--        </el-button>-->
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-document-copy"
-          :disabled="crud.selections.length !== 1"
-          size="mini"
-          @click="copyAdd(crud.selections[0])"
-        >
-          复制新增
-        </el-button>
+<!--        <el-button-->
+<!--          slot="right"-->
+<!--          class="filter-item"-->
+<!--          type="warning"-->
+<!--          icon="el-icon-document-copy"-->
+<!--          :disabled="crud.selections.length !== 1"-->
+<!--          size="mini"-->
+<!--          @click="copyAdd(crud.selections[0])"-->
+<!--        >-->
+<!--          复制新增-->
+<!--        </el-button>-->
       </crudOperation>
       <!--表单组件-->
       <el-dialog