入库申请、我的审批

src/views/modules/common/material-component.vue

@@ -133,6 +133,8 @@
           this.value = null
         }
         let selectedItem = this.options.find(item1 => item1.value === item)
+        selectedItem.buttonType = '0'
+        // console.log(JSON.stringify(selectedItem))
         this.$emit('materialSelected', selectedItem)
       },
       cancelReadOnly (onOff) {

src/views/modules/common/material-type-component.vue

@@ -27,7 +27,6 @@
     },
     watch: {
       typeId (value) {
-        console.log(JSON.stringify(value))
         this.value = value
       }
     },

src/views/modules/msg-center/approve.vue

@@ -42,9 +42,9 @@
         </el-form-item>
       </el-form>
       <el-tabs v-model="dataForm.type" @tab-click="queryData">
-        <el-tab-pane label="待审批" name="'1'"></el-tab-pane>
-        <el-tab-pane label="审批历史" name="'2'"></el-tab-pane>
-        <el-tab-pane label="我的申请" name="'3'"></el-tab-pane>
+        <el-tab-pane label="待审批" name="1"></el-tab-pane>
+        <el-tab-pane label="审批历史" name="2"></el-tab-pane>
+        <el-tab-pane label="我的申请" name="3"></el-tab-pane>
       </el-tabs>
       <el-table
         :data="dataList"
@@ -339,7 +339,6 @@
         }
       },
       batchApprove () {
-        // console.log(JSON.stringify(this.dataListSelections))
         if (this.dataListSelections && this.dataListSelections.length > 0) {
           this.approveDialogVisible = true
           let businessIds = this.dataListSelections.map(item => item.businessId)

src/views/modules/warehouse/stock-order-inbound.vue

@@ -37,8 +37,8 @@
               </el-col>
               <el-col :span="8" style="padding-left: 20px">
                 <el-form-item label="类别" prop="materialTypeId" :rules="{required: false, message: '类别不能为空', trigger: 'blur'}">
-                  <el-input v-if="!item.buttonType || item.buttonType === '0'" v-model="item.categoryName" :disabled="true" style="width: 200px"></el-input>
-                  <material-type-component v-else v-model="item.materialTypeId" :type-id.sync="item.materialTypeId"></material-type-component>
+<!--                  <el-input v-if="!item.buttonType || item.buttonType === '0'" v-model="item.categoryName" :disabled="true" style="width: 200px"></el-input>-->
+                  <material-type-component v-model="item.materialTypeId" :type-id.sync="item.materialTypeId"></material-type-component>
                 </el-form-item>
               </el-col>
               <el-col :span="8" style="padding-left: 20px">
@@ -55,16 +55,16 @@
               </el-col>
             </el-row>
             <el-row class="my-row">
-              <el-col :span="8">
-                <el-form-item label="单位" prop="unitName" :rules="{required: false, message: '单位不能为空', trigger: 'blur'}">
-                  <el-input v-model="item.unitName" :disabled="display || !item.buttonType || item.buttonType === '0'" placeholder="单位"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8" style="padding-left: 20px">
-                <el-form-item label="规格" prop="specifications" :rules="{required: false, message: '规格不能为空', trigger: 'blur'}">
-                  <el-input v-model="item.specifications" :disabled="display || !item.buttonType || item.buttonType === '0'" placeholder="规格"></el-input>
-                </el-form-item>
-              </el-col>
+<!--              <el-col :span="8">-->
+<!--                <el-form-item label="单位" prop="unitName" :rules="{required: false, message: '单位不能为空', trigger: 'blur'}">-->
+<!--                  <el-input v-model="item.unitName" :disabled="display || !item.buttonType || item.buttonType === '0'" placeholder="单位"></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+<!--              <el-col :span="8" style="padding-left: 20px">-->
+<!--                <el-form-item label="规格" prop="specifications" :rules="{required: false, message: '规格不能为空', trigger: 'blur'}">-->
+<!--                  <el-input v-model="item.specifications" :disabled="display || !item.buttonType || item.buttonType === '0'" placeholder="规格"></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
               <el-col :span="8" style="padding-left: 20px">
                 <el-form-item label="批次号" prop="batchNumber" :rules="{required: false, message: '批次号不能为空', trigger: 'blur'}">
                   <el-input v-model="item.batchNumber" :disabled="display" placeholder="请填写入库物品（零件）批次"></el-input>