imeik-bizui 1.2.3 → 1.2.5

package/dist/bizui/src/FieldCustomSelect/components/CustomShow.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="item-view" :class="{ 'disabled-color': disabled }">
     <div>
-      <el-tag>{{ customData.belongCompanyName }}</el-tag>
+      <el-tag color="#E7F8FB" style="border-color: #B7EDFC; color: #01A0E2;">{{ customData.belongCompanyName }}</el-tag>
       <el-tag v-if="showAuthorization" effect="plain" style="margin-left: 12px">授权发货</el-tag>
       <el-tag v-if="showDealer" effect="plain" style="margin-left: 12px">经销商</el-tag>
       <el-tag v-if="showMedical" effect="plain" style="margin-left: 12px">医疗机构</el-tag>

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

@@ -14,8 +14,8 @@
     <div v-if="!showSelect" class="customerDetails">
       <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">
+      <div v-if="!isView" class="button-view">
+        <el-button type="text" style="padding: 0; margin: 0" @click="clearInfo">
           <img src="https://udstatic.imeik.com/pcUploads/1738999803093/delete%402x.png" class="delect-img" @click="clearInfo" />
         </el-button>
       </div>
@@ -161,13 +161,20 @@ export default {
   background: #f2f5fa;
   padding: 3px 16px;
   border-radius: 3px;
-  .button {
-    width: 40px;
+  .button-view {
+    width: 24px;
+    height: 24px;
     text-align: center;
     position: absolute;
     right: 0;
     top: 0;
+    background: rgba(50,133,246,0.08);
+    border-radius: 0px 4px 0px 8px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
+
 }
 .text-xs {
   font-size: 12px;

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

@@ -614,7 +614,7 @@ export default {
     },
     // 检查木方案超不超
     checkQuantity(row) {
-      if (!row.materialQuantity || !row.materialSchemeRemainingQuantity) {
+      if (!row.materialQuantity || [null, undefined].includes(row.materialSchemeRemainingQuantity)) {
         this.$set(row, 'overSchemeFlag', '0')
         this.$set(row, 'overSchemeExplain', '')
         return false

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

@@ -134,6 +134,7 @@ export default {
       this.onUpdate()
     },
     handleValidate() {
+      let showMessage = true
       this.tableData.forEach((item) => {
         let res = true
         if (item.materialQuantity) {
@@ -145,19 +146,20 @@ export default {
           }
         }
         if (!item.materialQuantity) {
-          res && this.$message.warning('请检查物料数量')
+          (res && showMessage) && this.$message.warning('请检查物料数量')
           res = false
         } else if (this.tableItemArr.includes('materialBatchInfo') && !this.attrs.approvalInputBatch && item.materialIsSpecifiedBatch === '1' && !item.materialBatch) {
-          res && this.$message.warning('请检查批次号信息')
+          (res && showMessage) && this.$message.warning('请检查批次号信息')
           res = false
         } else if (!item.materialReceivingContact || !item.materialReceivingContactNumber || !item.materialReceivingAddress) {
-          res && this.$message.warning('请检查地址信息')
+          (res && showMessage) && this.$message.warning('请检查地址信息')
           res = false
         } else if (item.overSchemeFlag === '1' && !item.overSchemeExplain) {
-          res && this.$message.warning('请检查超母方案说明')
+          (res && showMessage) && this.$message.warning('请检查超母方案说明')
           res = false
         }
         item.valid = res
+        showMessage = res
       })
       this.onUpdate()
     },