imeik-bizui 0.7.0 → 0.7.2

package/dist/bizui/src/FieldApplyTypeView/index.vue

@@ -198,7 +198,7 @@ export default {
       if (!this.formConfig.props.applyType && this.attrs.applyTypeOptions.default) {
         this.formConfig.props.applyType = this.attrs.applyTypeOptions.default
       }
-      if (this.attrs.undefined) {
+      if (this.attrs.needProject) {
         this.formConfig.formItems[3].hidden = false
       }
       this.changeShowItems()
@@ -216,8 +216,6 @@ export default {
         applyType: this.formConfig.props.applyType,
         applyTypeName: this.getTypeName()
       }
-      console.log(this.formConfig.props, 'this.formConfig.props');
-      
       if (this.$bizui && this.$bizui.bus) {
         this.$bizui.bus.$emit('formApplyTypeChange')
       }

package/dist/bizui/src/FieldMaterialSelect/components/ProductList.vue

@@ -65,7 +65,7 @@
           <el-radio :label="'0'">否</el-radio>
         </el-radio-group>
         <div v-else>{{ row.materialIsSpecifiedBatch === '1' ? '是' : '否' }}</div>
-        <div v-if="row.materialIsSpecifiedBatch === '1'">
+        <div v-if="row.materialIsSpecifiedBatch === '1' && !approvalInputBatch">
           <el-input v-if="!isView" v-model="row.materialBatch" style="margin-top: 16px" placeholder="请输入批次号"></el-input>
           <div v-else>{{ row.materialBatch || '-' }}</div>
         </div>
@@ -128,6 +128,10 @@ export default {
         return []
       }
     },
+    approvalInputBatch: {
+      type: Boolean,
+      default: false
+    },
     loading: {
       type: Boolean,
       default: false
@@ -344,7 +348,8 @@ export default {
     // 获取母方案列表
     handleGetMotherSchemeList(materialCodeList) {
       getMotherSchemeList({
-        materialCodeList: materialCodeList
+        materialCodeList: materialCodeList,
+        costBearDepartmentCode: this.formProps.costBearDepartmentCode
       })
         .then((res) => {
           if (res.code === 200) {

package/dist/bizui/src/FieldMaterialSelect/index.vue

@@ -10,7 +10,7 @@
         添加
       </el-button>
     </div>
-    <ProductList :table-data="tableData" :is-view="isView" :table-item-arr="tableItemArr" @removeItem="onRemoveItem"></ProductList>
+    <ProductList :table-data="tableData" :is-view="isView" :table-item-arr="tableItemArr" :approval-input-batch="attrs.approvalInputBatch" @removeItem="onRemoveItem"></ProductList>
     <SelectProductDialog ref="selectProductDialog" :rcoi-info="rcoiInfo" @addProduct="addProduct"></SelectProductDialog>
   </div>
 </template>
@@ -105,7 +105,7 @@ export default {
         if (!item.materialQuantity) {
           this.$message.error('请检查物料数量')
           item.valid = false
-        } else if (this.tableItemArr.includes('batch') && item.materialIsSpecifiedBatch === '1' && !item.materialBatch) {
+        } else if (this.tableItemArr.includes('batch') && !this.attrs.approvalInputBatch && item.materialIsSpecifiedBatch === '1' && !item.materialBatch) {
           this.$message.error('请检查批次号信息')
           item.valid = false
         } else {