kz-ui-base 1.0.123 → 1.0.125

package/components/sm/SmOrderSelectModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <base-dialog :visible.sync="visible" width="1200px" :title="title" append-to-body @on-confirm="handleConfirm"
+  <base-dialog :visible.sync="visible" width="1400px" :title="title" append-to-body @on-confirm="handleConfirm"
                @on-cancel="cancel">
     <div class="app-container">
       <el-container class="item-panel default-background">
@@ -58,12 +58,11 @@
                                    :min-width="col.width || 100" show-overflow-tooltip>
                     <template slot-scope="scope">
                       {{
-                        col.dictType
-                          ? getDictLabelByValue(
-                            col.dictType,
-                            scope.row[col.property]
-                          )
-                          : scope.row[col.property]
+                         col.formatter 
+                        ? col.formatter(scope.row, scope.column, scope.row[col.property]) 
+                        : (col.dictType 
+                            ? getDictLabelByValue(col.dictType, scope.row[col.property]) 
+                            : scope.row[col.property])
                       }}
                     </template>
                   </el-table-column>
@@ -134,12 +133,20 @@ export default class SmOrderSelectModal extends Vue {
     {text: "客户名称", property: "customerName", width: 250},
     {text: "物料编号", property: "materialNo", width: 130},
     {text: "物料名称", property: "materialName", width: 230},
+    {text: "合同数量", property: "salesQuantity", width: 80, align: "right",
+    formatter: (row: any, column: any, cellValue: any) => {
+      if (cellValue == null || isNaN(cellValue)) return '0.00';
+      return parseFloat(cellValue).toLocaleString('en-US', {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      });
+    }
+    },
+    {text: "单位", property: "salesUnit", dictType: 'uom_code', width: 80},
     {text: "规格型号", property: "materialSpec", width: 180},
     {text: "交付类型", property: "exportFlagLabel", width: 80},
-    {text: "合同数量", property: "salesQuantity", width: 80},
-    {text: "单位", property: "salesUnit", dictType: 'uom_code', width: 80}
   ];
-
+  
   handleSelectionChange(val) {
     this.currentEntities = val;
     tableOnSelectionChange(val, this.multipleChoice, this.$refs.multipleTable)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kz-ui-base",
-  "version": "1.0.123",
+  "version": "1.0.125",
   "description": "",
   "main": "index.js",
   "scripts": {

package/views/fd/common/modal/EquipmentModal.vue

@@ -148,11 +148,9 @@ export default {
         this.msgError("请选择一笔设备数据！");
       } else {
         if(this.multipleChoice) {
-          this.$emit("cancel", this.multipleSelection);
-          this.$closeDialog()
+          this.$closeDialog(true, this.multipleSelection);
         } else {
-          this.$emit("cancel", this.multipleSelection?.[0]);
-          this.$closeDialog()
+          this.$closeDialog(true, this.multipleSelection?.[0]);
         }
       }
     },

package/views/ic/common/modal/ItemInvLot.vue

@@ -90,12 +90,12 @@
           <el-table-column
             prop="itemLotNo"
             label="物料批号"
-            min-width="120"
+            min-width="110"
           />
           <el-table-column
             prop="itemLotAttribute"
             label="批次属性"
-            min-width="200"
+            min-width="150"
             show-overflow-tooltip
           />
           <el-table-column
@@ -105,7 +105,7 @@
           />
           <el-table-column
             label="库存量"
-            min-width="100"
+            min-width="75"
             align="right"
           >
             <template slot-scope="scope">
@@ -114,7 +114,7 @@
           </el-table-column>
           <el-table-column
             label="单位"
-            min-width="80"
+            min-width="70"
           >
             <template slot-scope="scope">
               <span>{{ getDictLabelByValue('uom_code', scope.row.baseUomCode) }}</span>
@@ -122,7 +122,7 @@
           </el-table-column>
           <el-table-column
             label="辅助库存量"
-            min-width="100"
+            min-width="95"
             align="right"
           >
             <template slot-scope="scope">
@@ -131,12 +131,17 @@
           </el-table-column>
           <el-table-column
             label="单位"
-            min-width="80"
+            min-width="70"
           >
             <template slot-scope="scope">
               <span>{{ getDictLabelByValue('uom_code', scope.row.subUomCode) }}</span>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="workUnitName"
+            label="作业单元"
+            min-width="140"
+          />
         </el-table>
       </div>
     </div>