imeik-bizui 1.2.4 → 1.2.6

package/dist/bizui/src/FieldBatchesDelivery/components/MaterialList.vue

@@ -11,14 +11,14 @@
         <p class="materialSubName">商标：{{ row.materialTrademark }}</p>
       </template>
       <template slot="materialCountInfo" slot-scope="{ row }">
-        <p class="materialSubName">申请数量：{{ row.materialQuantity || '-' }}</p>
+        <p class="materialName">申请数量：{{ row.materialQuantity || '-' }}</p>
         <p class="materialSubName">规格型号：{{ row.materialModel }}</p>
         <p class="materialSubName">规格代码：{{ row.materialSpecCode }}</p>
         <p class="materialSubName">包装规格：{{ row.materialSpecification }}</p>
         <p class="materialSubName">计量单位：{{ row.materialUnit }}</p>
       </template>
       <template slot="deliveryQuantity" slot-scope="{ row }">
-        <p v-if="isView">{{ row.deliveryQuantity }}</p>
+        <p v-if="isView" class="materialName">{{ row.deliveryQuantity }}</p>
         <div v-else>
           <el-input v-model="row.deliveryQuantity" :class="{ error: row.quantityError || (row.checkData === false && !row.deliveryQuantity) }" placeholder="请输入" @input="handleInput(row)" @blur="handleBlur(row)"></el-input>
           <p v-if="row.quantityError" class="materialSubName" style="margin-top: 10px; color: red">发货数量不能大于剩余发货数量</p>

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,11 +14,7 @@
     <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">
-          <img src="https://udstatic.imeik.com/pcUploads/1738999803093/delete%402x.png" class="delect-img" @click="clearInfo" />
-        </el-button>
-      </div>
+      <div v-if="!isView" class="button-view" @click="clearInfo"></div>
     </div>
     <p v-show="showText" class="text-xs">提示：如果申请械类产品，请填写客户名称</p>
   </div>
@@ -90,7 +86,7 @@ export default {
   },
   methods: {
     handleGetEmployeeIsForSale() {
-      getEmployeeIsForSale().then(res => {
+      getEmployeeIsForSale().then((res) => {
         if (res.code === 200) {
           this.isDeptForSale = res.data
         }
@@ -161,12 +157,32 @@ 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;
+    background-image: url('https://udstatic.imeik.com/pcUploads/1738999803093/delete%402x.png');
+    background-repeat: no-repeat; /* 防止平铺 */
+    background-position: center; /* 居中显示 */
+    background-size: cover; /* 覆盖整个元素 */
+    background-size: 16px;
+    cursor: pointer;
+  }
+  .button-view:hover {
+    background: rgba(244, 51, 74, 0.08);
+    background-image: url('https://udstatic.imeik.com/pcUploads/1745809448715/delete-red.png');
+    background-repeat: no-repeat; /* 防止平铺 */
+    background-position: center; /* 居中显示 */
+    background-size: cover; /* 覆盖整个元素 */
+    background-size: 16px;
   }
 }
 .text-xs {

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

@@ -5,7 +5,7 @@
         <p><span v-if="!isView" class="start">*</span>超母方案说明</p>
       </template>
       <template slot="materialCountInfoHead">
-        <p><span v-if="!isView" class="start">*</span>数量</p>
+        <p><span v-if="!isView" class="start">*</span>规格</p>
       </template>
       <template slot="materialBasicsInfo" slot-scope="{ row }">
         <!-- <el-tag type="danger">未签约</el-tag>
@@ -73,10 +73,10 @@
         <div v-else class="materialName">{{ row.materialAssociatedMotherSchemeName || '-' }}</div>
         <div v-if="row.materialAssociatedMotherSchemeCode">
           <p class="schemeCount">
-            母方案剩余数量：<span>{{ row.materialSchemeRemainingQuantity }}</span>
+            母方案剩余数量：<span style="color: #3285f6">{{ row.materialSchemeRemainingQuantity }}</span>
           </p>
           <p class="schemeCount">
-            母方案总数量：<span>{{ row.materialSchemeTotalQuantity }}</span>
+            母方案总数量：<span style="color: #3285f6">{{ row.materialSchemeTotalQuantity }}</span>
           </p>
         </div>
       </template>
@@ -102,7 +102,7 @@
           <el-input v-model="row.materialBatch" style="margin-top: 16px" :class="{ 'is-error': !row.materialBatch && row.valid === false }" placeholder="请输入批次号"></el-input>
           <p v-show="!row.materialBatch && row.valid === false" class="error-message">请输入批次号</p>
         </div>
-        <div v-if="row.materialBatch && isView && !hasApprovalInputBatch" class="materialName">{{ row.materialBatch || '-' }}</div>
+        <div v-if="row.materialBatch && isView && !hasApprovalInputBatch" class="materialName">批次号：{{ row.materialBatch || '-' }}</div>
       </template>
       <template slot="warehouse" slot-scope="{ row }">
         <div v-if="hasApprovalInputWarehouse && !row.fixedWarehouseFlag">
@@ -219,7 +219,7 @@ export default {
         },
         materialCountInfo: {
           prop: 'materialCountInfo',
-          label: '数量',
+          label: '规格',
           type: 'slot',
           slot: 'materialCountInfo',
           headSlot: 'materialCountInfoHead',
@@ -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/components/SelectProductDialog.vue

@@ -14,16 +14,17 @@
       <template slot="productName" slot-scope="{ row }">
         <p class="lineHeight">
           {{ row.materialAbbreviation }}
-          <!-- <el-tag type="danger" class="ml-2">未签约</el-tag> -->
         </p>
         <p class="lineHeight">名称：{{ row.materialName }}</p>
         <p class="lineHeight">商标：{{ row.materialTrademark }}</p>
       </template>
       <template slot="materialSpec" slot-scope="{ row }">
-        <p class="lineHeight">规格型号：{{ row.materialModel || '-' }}</p>
-        <p class="lineHeight">规格代码：{{ row.materialSpecCode || '-' }}</p>
-        <p class="lineHeight">包装规格：{{ row.materialSpecification || '-' }}</p>
-        <p class="lineHeight">计量单位：{{ row.materialUnit || '-' }}</p>
+        <div>
+          <ImOneLineDot :text="`规格型号：${row.materialModel}`">规格型号：{{ row.materialModel || '-' }}</ImOneLineDot>
+          <ImOneLineDot :text="`规格代码：${row.materialSpecCode}`">规格代码：{{ row.materialSpecCode || '-' }}</ImOneLineDot>
+          <ImOneLineDot :text="`包装规格：${row.materialModel}`">包装规格：{{ row.materialSpecification || '-' }}</ImOneLineDot>
+          <ImOneLineDot :text="`计量单位：${row.materialUnit}`">计量单位：{{ row.materialUnit || '-' }}</ImOneLineDot>
+        </div>
       </template>
     </ImTable>
     <ImPagination ref="ImPagination" :page-size.sync="pageSize" :current-page.sync="currentPage" :total="total" @change="getList"></ImPagination>
@@ -149,8 +150,8 @@ export default {
             type: 'slot',
             slot: 'materialSpec',
             attrs: {
-              'show-overflow-tooltip': true,
-              'min-width': '246'
+              width: '246',
+              'show-overflow-tooltip': false
             }
           }
         ],
@@ -280,4 +281,12 @@ export default {
     color: #3285f6;
   }
 }
+/deep/ .el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: #3285f6 !important;
+  border-color: #3285f6 !important;
+}
+/deep/ .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: #3285f6 !important;
+  border-color: #3285f6 !important;
+}
 </style>