From c6defb8a01892051fd1fb1c4ad8f347f0a0c6b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Thu, 21 Nov 2024 11:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Business/Price/PriceCheck.vue  |  5 +++--
 src/components/Business/Price/PriceDialog.vue | 16 ++++++--------
 src/utils/index.js                            |  8 +++++++
 .../yh/price/components/VerifyPriceDialog.vue |  6 ++++-
 src/views/yh/price/index.vue                  | 18 +++++++++------
 .../edit/components/ReportProductEdit.vue     |  6 +++--
 .../edit/components/ReportProductRowEdit.vue  |  5 +++--
 src/views/yh/report/view/view.vue             |  2 +-
 src/views/yh/reportOrderProd/index.vue        | 22 +++----------------
 .../ReportOrderProdDescriptions.vue           | 10 ++++-----
 src/views/yh/reportProd/index.vue             |  7 +++---
 11 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/src/components/Business/Price/PriceCheck.vue b/src/components/Business/Price/PriceCheck.vue
index 8f7c896..067a1c9 100644
--- a/src/components/Business/Price/PriceCheck.vue
+++ b/src/components/Business/Price/PriceCheck.vue
@@ -113,7 +113,7 @@
               <boolean-tag :value="d.row.disabled" true-text="禁用" true-type="danger" false-text="启用" false-type="success" />
             </template>
             <template v-else-if="column.key === 'quantity'">
-              {{d.row.quantity | fix2 | dv}} 个
+              {{formatFraction(d.row.quantityNumerator, d.row.quantityDenominator)}} 个
             </template>
             <template v-else-if="column.key === 'price'">
               {{d.row.price | dv}} 元
@@ -143,7 +143,7 @@ import Price from "@/views/yh/price/index.vue";
 import DeptTreeSelect from "@/components/Business/Dept/DeptTreeSelect.vue";
 import {$showColumns} from "@/utils/mixins";
 import {listPrice} from "@/api/yh/price";
-import {deepClone} from "@/utils";
+import {deepClone, formatFraction} from "@/utils";
 
 const defaultSort = {
   prop: "createTime",
@@ -227,6 +227,7 @@ export default {
       this.getList();
   },
   methods: {
+    formatFraction,
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
diff --git a/src/components/Business/Price/PriceDialog.vue b/src/components/Business/Price/PriceDialog.vue
index f5f4426..a94a066 100644
--- a/src/components/Business/Price/PriceDialog.vue
+++ b/src/components/Business/Price/PriceDialog.vue
@@ -3,15 +3,13 @@
 
 <template>
   <el-dialog :title="title" :visible="show" width="90%" top="2vh" @close="close" :append-to-body="true">
-      <el-scrollbar style="height: 50vh">
-        <price-check
-          v-if="show"
-          ref="check"
-          :multiple="multiple"
-          :init-select="initSelect"
-          v-on="$listeners"
-        />
-      </el-scrollbar>
+    <price-check
+      v-if="show"
+      ref="check"
+      :multiple="multiple"
+      :init-select="initSelect"
+      v-on="$listeners"
+    />
     <template #footer>
       <el-button type="primary" @click="submit()">确定</el-button>
     </template>
diff --git a/src/utils/index.js b/src/utils/index.js
index c5f1fee..d4dff41 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -499,3 +499,11 @@ export function getLastDateTimeStart(n) {
 export function getLastDateTimeEnd(n) {
   return new Date(getLastDateTimeEndStr(n));
 }
+
+// 展示分数
+export function formatFraction(numerator, denominator) {
+  if (denominator === 1) {
+    return numerator;
+  }
+  return `${numerator}/${denominator}`;
+}
diff --git a/src/views/yh/price/components/VerifyPriceDialog.vue b/src/views/yh/price/components/VerifyPriceDialog.vue
index 7877cb2..97d583b 100644
--- a/src/views/yh/price/components/VerifyPriceDialog.vue
+++ b/src/views/yh/price/components/VerifyPriceDialog.vue
@@ -19,7 +19,9 @@
         <el-descriptions-item label="单价">{{detail.price | dv}} 元</el-descriptions-item>
         <el-descriptions-item label="单位">{{detail.unit | dv}}</el-descriptions-item>
         <el-descriptions-item label="分类">{{detail.classify | dv}}</el-descriptions-item>
-        <el-descriptions-item label="生产数量" span="2">{{detail.quantity | fix2 | dv}} 个</el-descriptions-item>
+        <el-descriptions-item label="生产倍数" span="2">
+          {{formatFraction(detail.quantityNumerator, detail.quantityDenominator)}} 个
+        </el-descriptions-item>
         <el-descriptions-item label="备注" span="3">{{detail.remark | dv}}</el-descriptions-item>
       </el-descriptions>
     </div>
@@ -32,6 +34,7 @@
 </template>
 <script>
 import {getPrice, verifyPrice} from "@/api/yh/price";
+import {formatFraction} from "../../../../utils";
 
 export default {
   name: "VerifyPriceDialog",
@@ -71,6 +74,7 @@ export default {
     this.getDetail(this.priceId);
   },
   methods: {
+    formatFraction,
     submitVerify(pass) {
       this.$confirm(`确定要${pass ? '通过' : '驳回'}吗？`, '提示', {
         confirmButtonText: '确定',
diff --git a/src/views/yh/price/index.vue b/src/views/yh/price/index.vue
index 63b232a..606faf5 100644
--- a/src/views/yh/price/index.vue
+++ b/src/views/yh/price/index.vue
@@ -190,7 +190,7 @@
               <boolean-tag :value="d.row.disabled" true-text="禁用" true-type="danger" false-text="启用" false-type="success" />
             </template>
             <template v-else-if="column.key === 'quantity'">
-              {{d.row.quantity | fix2 | dv}} 个
+              {{formatFraction(d.row.quantityNumerator, d.row.quantityDenominator)}} 个
             </template>
             <template v-else-if="column.key === 'price'">
               {{d.row.price | dv}} 元
@@ -299,10 +299,11 @@
           <form-col :span="span"  label="分类" prop="classify">
             <el-input v-model="form.classify" placeholder="请输入分类" />
           </form-col>
-          <form-col :span="span"  label="生产数量" prop="quantity">
-            <el-input v-model="form.quantity" placeholder="请输入生产数量" type="number" :min="0">
-              <template #suffix>个</template>
-            </el-input>
+          <form-col :span="span"  label="生产倍数" prop="quantity">
+            <el-input v-model="form.quantityNumerator" placeholder="分子" type="number" :min="0" style="width: calc(50% - 1.5em)"/>
+            /
+            <el-input v-model="form.quantityDenominator" placeholder="分母" type="number" :min="0" style="width: calc(50% - 1.5em)"/>
+            个
           </form-col>
         </el-row>
         <el-form-item label="备注" prop="remark">
@@ -345,6 +346,7 @@ import {PriceStatus} from "@/utils/constants";
 import VerifyPriceDialog from "@/views/yh/price/components/VerifyPriceDialog.vue";
 import FormCol from "@/components/FormCol/index.vue";
 import ImportDialog from "@/components/ImportDialog/index.vue";
+import {formatFraction} from "../../../utils";
 
 // 默认排序字段
 const defaultSort = {
@@ -385,7 +387,7 @@ export default {
         {key: 'price', visible: true, label: '单价', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'unit', visible: true, label: '单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'classify', visible: true, label: '分类', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'quantity', visible: false, label: '生产数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'quantity', visible: false, label: '生产倍数', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
         {key: 'createBy', visible: false, label: '创建人', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'createTime', visible: false, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
@@ -469,6 +471,7 @@ export default {
     this.getList();
   },
   methods: {
+    formatFraction,
     /** 当排序按钮被点击时触发 **/
     onSortChange(column) {
       if (column.order == null) {
@@ -521,7 +524,8 @@ export default {
         updateBy: null,
         disabled: null,
         disabledTime: null,
-        quantity: null
+        quantityNumerator: 1,
+        quantityDenominator : 1,
       };
       this.resetForm("form");
     },
diff --git a/src/views/yh/report/edit/components/ReportProductEdit.vue b/src/views/yh/report/edit/components/ReportProductEdit.vue
index 3d3a05f..f3a14dd 100644
--- a/src/views/yh/report/edit/components/ReportProductEdit.vue
+++ b/src/views/yh/report/edit/components/ReportProductEdit.vue
@@ -289,7 +289,8 @@ export default {
         pricePrice: price.price,
         priceUnit: price.unit,
         priceClassify: price.classify,
-        priceQuantity: price.quantity
+        priceQuantityNumerator: price.quantityNumerator,
+        priceQuantityDenominator: price.quantityDenominator,
       }
     },
     // 工序修改后操作
@@ -304,7 +305,8 @@ export default {
       row.pricePrice = price.price;
       row.priceUnit = price.unit;
       row.priceClassify = price.classify;
-      row.priceQuantity = price.quantity;
+      row.priceQuantityNumerator = price.quantityNumerator;
+      row.priceQuantityDenominator = price.quantityDenominator;
     },
     // 表格选择项发生变化后
     onSelectionChange(selection) {
diff --git a/src/views/yh/report/edit/components/ReportProductRowEdit.vue b/src/views/yh/report/edit/components/ReportProductRowEdit.vue
index f01b1fd..f13842e 100644
--- a/src/views/yh/report/edit/components/ReportProductRowEdit.vue
+++ b/src/views/yh/report/edit/components/ReportProductRowEdit.vue
@@ -49,7 +49,7 @@
           <div class="edit-title">关联订单</div>
           <report-product-order-list-edit
             v-model="form.orderProdList"
-            :quantity="form.priceQuantity"
+            :quantity="form.priceQuantityNumerator / form.priceQuantityDenominator"
             :price-unit="form.priceUnit"
             :rules="rules.orderProdList"
           />
@@ -169,7 +169,8 @@ export default {
       this.form.pricePrice = price.price;
       this.form.priceUnit = price.unit;
       this.form.priceClassify = price.classify;
-      this.form.priceQuantity = price.quantity;
+      this.form.priceQuantityNumerator = price.quantityNumerator;
+      this.form.priceQuantityDenominator = price.quantityDenominator;
     },
   },
 }
diff --git a/src/views/yh/report/view/view.vue b/src/views/yh/report/view/view.vue
index 58540ca..378c894 100644
--- a/src/views/yh/report/view/view.vue
+++ b/src/views/yh/report/view/view.vue
@@ -34,7 +34,7 @@
               containerClass: null,
               showTableOpera: false,
               showSearch: false,
-              showSelection: false,
+              showSelection: false
             }"/>
         </el-card>
       </el-col>
diff --git a/src/views/yh/reportOrderProd/index.vue b/src/views/yh/reportOrderProd/index.vue
index 89ec5f0..5cdc6b2 100644
--- a/src/views/yh/reportOrderProd/index.vue
+++ b/src/views/yh/reportOrderProd/index.vue
@@ -1,26 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="报表关联订单ID" prop="id">
+      <el-form-item label="生产订单" prop="orderErpBillNo">
         <el-input
-          v-model="queryParams.id"
-          placeholder="请输入报表关联订单ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="报表产量ID" prop="reportProdId">
-        <el-input
-          v-model="queryParams.reportProdId"
-          placeholder="请输入报表产量ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="生产订单ID" prop="orderId">
-        <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入生产订单ID"
+          v-model="queryParams.orderErpBillNo"
+          placeholder="请输入生产订单编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
diff --git a/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue b/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue
index 6fea7b3..97fe25c 100644
--- a/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue
+++ b/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue
@@ -3,14 +3,14 @@
     <template  v-for="(item, index) of data">
       <el-descriptions border :column="4" >
           <el-descriptions-item :key="item.id" label="生产订单" :span="2">{{item.orderErpBillNo | dv}}</el-descriptions-item>
-          <el-descriptions-item :key="item.id" label="本次提交产量">{{item.num | dv}} {{priceUnit}}</el-descriptions-item>
+          <el-descriptions-item :key="item.id" label="本次提交产量">{{item.num | fix2 | dv}} {{priceUnit}}</el-descriptions-item>
           <el-descriptions-item :key="item.id" label="订单进度">
             <el-progress text-inside :stroke-width="16" :percentage="percentage(item)" :color="customColors" text-color="#fff" style="width: 80px"/>
           </el-descriptions-item>
-          <el-descriptions-item :key="item.id" label="订单需求数量">{{item.orderErpBaseUnitQty | dv}} {{item.baseUnitName}}</el-descriptions-item>
-          <el-descriptions-item :key="item.id" label="订单未入库数量">{{item.orderErpBaseNoStockInQty | dv}} {{item.baseUnitName}}</el-descriptions-item>
-          <el-descriptions-item :key="item.id" label="订单审核中产量">{{item.verifyingBaseNum | dv}} {{item.baseUnitName}}</el-descriptions-item>
-          <el-descriptions-item :key="item.id" label="订单已审核产量">{{item.verifiedBaseNum | dv}} {{item.baseUnitName}}</el-descriptions-item>
+          <el-descriptions-item :key="item.id" label="订单需求数量">{{item.orderErpBaseUnitQty | fix2 | dv}} {{item.baseUnitName}}</el-descriptions-item>
+          <el-descriptions-item :key="item.id" label="订单未入库数量">{{item.orderErpBaseNoStockInQty | fix2 | dv}} {{item.baseUnitName}}</el-descriptions-item>
+          <el-descriptions-item :key="item.id" label="订单审核中产量">{{item.verifyingBaseNum | fix2 | dv}} {{item.baseUnitName}}</el-descriptions-item>
+          <el-descriptions-item :key="item.id" label="订单已审核产量">{{item.verifiedBaseNum | fix2 | dv}} {{item.baseUnitName}}</el-descriptions-item>
       </el-descriptions>
       <br/>
     </template>
diff --git a/src/views/yh/reportProd/index.vue b/src/views/yh/reportProd/index.vue
index bb47e76..a11c03d 100644
--- a/src/views/yh/reportProd/index.vue
+++ b/src/views/yh/reportProd/index.vue
@@ -78,7 +78,7 @@
               <el-descriptions-item label="图案">{{d.row.pricePattern | dv}}</el-descriptions-item>
               <el-descriptions-item label="规格">{{d.row.priceSpec | dv}}</el-descriptions-item>
               <el-descriptions-item label="分类">{{d.row.priceClassify | dv}}</el-descriptions-item>
-              <el-descriptions-item label="倍数">{{d.row.priceQuantity | dv}}</el-descriptions-item>
+              <el-descriptions-item label="倍数">{{formatFraction(d.row.priceQuantityNumerator, d.row.priceQuantityDenominator)}}</el-descriptions-item>
             </el-descriptions>
             <template v-if="!isEmpty(d.row.userProdList)">
               <div class="edit-title">员工产量</div>
@@ -86,7 +86,7 @@
             </template>
             <template v-if="!isEmpty(d.row.orderProdList)">
               <div class="edit-title">订单产量</div>
-              <report-order-prod-descriptions  :data="d.row.orderProdList" :price-unit="d.row.priceUnit" :price-quantity="d.row.priceQuantity"/>
+              <report-order-prod-descriptions  :data="d.row.orderProdList" :price-unit="d.row.priceUnit" :price-quantity="d.row.priceQuantityNumerator / d.row.priceQuantityDenominator"/>
             </template>
           </div>
         </template>
@@ -222,7 +222,7 @@ import SearchFormItem from "@/components/SearchFormItem/index.vue";
 import ReportUserProd from "@/views/yh/reportUserProd/index.vue";
 import {calcMulDecimal} from "@/utils/money";
 import ReportUserProdDescriptions from "@/views/yh/reportProd/components/ReportUserProdDescriptions.vue";
-import {isEmpty} from "@/utils";
+import {formatFraction, isEmpty} from "@/utils";
 import ReportOrderProdDescriptions from "@/views/yh/reportProd/components/ReportOrderProdDescriptions.vue";
 
 // 默认排序字段
@@ -373,6 +373,7 @@ export default {
     this.getList();
   },
   methods: {
+    formatFraction,
     isEmpty,
     calcMulDecimal,
     // 展开行