imeik-bizui 1.2.0 → 1.2.2

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

@@ -65,7 +65,7 @@ export default {
     formItems() {
       return [
         {
-          type: 'ImSelect',
+          type: 'FieldSelect',
           prop: 'applyType',
           span: 12,
           label: '申请类型',
@@ -73,7 +73,8 @@ export default {
           attrs: {
             options: [],
             style: {
-              width: '100%'
+              width: '100%',
+              tips: ''
             },
             isView: this.isView
           },
@@ -229,6 +230,15 @@ export default {
       if (this.$bizui && this.$bizui.bus) {
         this.$bizui.bus.$emit('formApplyTypeChange')
       }
+      if (this.formConfig.props.applyType === '1896397579051683842') {
+        this.formConfig.formItems[0].attrs.tips = '提示：如果涉及到通过物资系统继续领取物料，请选择”转市场物资库“类型'
+        this.formConfig.formItems[1].attrs.style = 'height: 56px;'
+        this.formConfig.formItems[2].attrs.style = 'height: 56px;'
+      } else {
+        this.formConfig.formItems[0].attrs.tips = ''
+        delete this.formConfig.formItems[1].attrs.style
+        delete this.formConfig.formItems[2].attrs.style
+      }
       this.changeShowItems()
       this.setTypeDataOnChange()
     },

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

@@ -12,7 +12,8 @@
       @change="onSelectChanged"
     ></CustomerSelect>
     <div v-if="!showSelect" class="customerDetails">
-      <CustomShow :custom-data="selectedItem" :detail-show="true" :show-list="showList"></CustomShow>
+      <CustomShow v-if="selectedItem && selectedItem.accountUid" :custom-data="selectedItem" :detail-show="true" :show-list="showList"></CustomShow>
+      <div v-else>-</div>
       <div v-if="!isView" class="button">
         <el-button type="text" @click="clearInfo">
           <img src="https://udstatic.imeik.com/pcUploads/1738999803093/delete%402x.png" class="delect-img" @click="clearInfo" />

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

@@ -105,11 +105,11 @@
         <div v-if="row.materialBatch && isView && !hasApprovalInputBatch" class="materialName">{{ row.materialBatch || '-' }}</div>
       </template>
       <template slot="warehouse" slot-scope="{ row }">
-        <div v-if="hasApprovalInputWarehouse">
+        <div v-if="hasApprovalInputWarehouse && !row.fixedWarehouseFlag">
           <el-select v-model="row.warehouseNumber" placeholder="请选择" :class="{ 'is-error': !row.warehouseNumber || row.valid === false }" @change="(val) => handleChangeWarehouse(val, row)">
             <el-option v-for="item in warehouseList || []" :key="item.warehouseNumber" style="width: 100%" :label="item.warehouseName" :value="item.warehouseNumber"> </el-option>
           </el-select>
-          <p v-show="!row.warehouseNumber && row.valid === false" class="error-message">请输入超母方案说明</p>
+          <p v-show="!row.warehouseNumber && row.valid === false" class="error-message">请选择库房</p>
         </div>
         <div v-else class="materialSubName autoheight">{{ row.warehouseName || '-' }}</div>
       </template>
@@ -499,7 +499,6 @@ export default {
                 if (material) {
                   // 更新对应的 motherSchemeList
                   this.$set(material, 'motherSchemeList', item.planInfoList)
-                  this.checkQuantity(material)
                   this.handleChangeScheme(material.materialAssociatedMotherSchemeCode, material)
                 }
               }
@@ -604,6 +603,7 @@ export default {
           row.materialAssociatedMotherSchemeName = item.materialAssociatedMotherSchemeName
         }
       })
+      this.checkQuantity(row)
     },
     formatPhone(val) {
       if (val) {

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

@@ -25,6 +25,7 @@
         </slot>
       </el-option>
     </el-select>
+    <p v-if="attrs.tips && !attrs.isView" class="tips">{{ attrs.tips }}</p>
   </span>
 </template>
 
@@ -138,4 +139,9 @@ export default {
   background: #e9f2ff !important;
   margin-bottom: 1px;
 }
+.tips {
+  color: #ccc;
+  font-size: 12px;
+  height: 14px;
+}
 </style>