From acf22e0d90b3801f54d84f0338a8155a8d8e6283 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: Wed, 20 Nov 2024 22:09:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yh/prodOrder.js                       |   5 +-
 src/views/yh/logImport/index.vue              |  22 +++-
 src/views/yh/logImport/view.vue               |  11 +-
 src/views/yh/prodOrder/index.vue              |  26 +++--
 src/views/yh/reportOrderProd/index.vue        | 100 ++++++++++--------
 .../ReportOrderProdDescriptions.vue           |  13 ++-
 6 files changed, 108 insertions(+), 69 deletions(-)

diff --git a/src/api/yh/prodOrder.js b/src/api/yh/prodOrder.js
index ff14f55..6c38c2e 100644
--- a/src/api/yh/prodOrder.js
+++ b/src/api/yh/prodOrder.js
@@ -55,10 +55,11 @@ export function delProdOrder(id) {
 }
 
 // 同步生产订单
-export function syncProdOrder() {
+export function syncProdOrder(query) {
   return request({
     url: '/yh/prodOrder/sync',
-    method: 'put'
+    method: 'put',
+    data: query
   })
 }
 
diff --git a/src/views/yh/logImport/index.vue b/src/views/yh/logImport/index.vue
index 68c96e0..28ad539 100644
--- a/src/views/yh/logImport/index.vue
+++ b/src/views/yh/logImport/index.vue
@@ -1,10 +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="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable @change="handleQuery">
+      <el-form-item label="日志类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择日志类型" clearable @change="handleQuery">
           <el-option
-            v-for="dict in dict.type.log_import_status"
+            v-for="dict in dict.type.log_import_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -21,6 +21,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable @change="handleQuery">
+          <el-option
+            v-for="dict in dict.type.log_import_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="创建人" prop="createBy">
         <el-input
           v-model="queryParams.createBy"
@@ -94,6 +104,9 @@
             <template v-else-if="column.key === 'bizType'">
               <dict-tag :options="dict.type.log_import_biz_type" :value="d.row[column.key]"/>
             </template>
+            <template v-else-if="column.key === 'type'">
+              <dict-tag :options="dict.type.log_import_type" :value="d.row[column.key]"/>
+            </template>
             <template v-else-if="column.key === 'seconds'">
               {{calcSecond(d.row.createTime, d.row.finishedTime)}} 秒
             </template>
@@ -216,7 +229,7 @@ const defaultSort = {
 export default {
   name: "LogImport",
   mixins: [$showColumns],
-  dicts: ['log_import_status', 'log_import_biz_type'],
+  dicts: ['log_import_status', 'log_import_biz_type', 'log_import_type'],
   components: {LogImportView, LogImportDetail, FormCol},
   data() {
     return {
@@ -226,6 +239,7 @@ export default {
       // 字段列表
       columns: [
         {key: 'logId', visible: true, label: '日志ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'type', visible: true, label: '日志类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'bizType', visible: true, label: '业务类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'createBy', visible: true, label: '创建人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
diff --git a/src/views/yh/logImport/view.vue b/src/views/yh/logImport/view.vue
index 50e8161..14c6b13 100644
--- a/src/views/yh/logImport/view.vue
+++ b/src/views/yh/logImport/view.vue
@@ -1,13 +1,16 @@
 <template>
   <div class="app-container" v-loading="loading">
-    <el-descriptions title="导入详情">
+    <el-descriptions title="导入详情" :column="4">
       <el-descriptions-item label="日志ID">{{detail.logId | dv}}</el-descriptions-item>
-      <el-descriptions-item label="状态">
-        <dict-tag :options="dict.type.log_import_status" :value="detail.status" size="small"/>
+      <el-descriptions-item label="日志类型">
+        <dict-tag :options="dict.type.log_import_type" :value="detail.type" size="small"/>
       </el-descriptions-item>
       <el-descriptions-item label="业务类型">
         <dict-tag :options="dict.type.log_import_biz_type" :value="detail.bizType" size="small"/>
       </el-descriptions-item>
+      <el-descriptions-item label="状态">
+        <dict-tag :options="dict.type.log_import_status" :value="detail.status" size="small"/>
+      </el-descriptions-item>
       <el-descriptions-item label="创建人">
         {{detail.createBy | dv}}
       </el-descriptions-item>
@@ -51,7 +54,7 @@ import {calcSecond} from "@/utils/date";
 export default {
   name: "LogImportView",
   components: {LogImportDetail},
-  dicts: ['log_import_status', 'log_import_biz_type'],
+  dicts: ['log_import_status', 'log_import_biz_type', 'log_import_type'],
   props: {
     logId: {
       type: String,
diff --git a/src/views/yh/prodOrder/index.vue b/src/views/yh/prodOrder/index.vue
index 928ca42..679e1a8 100644
--- a/src/views/yh/prodOrder/index.vue
+++ b/src/views/yh/prodOrder/index.vue
@@ -132,13 +132,13 @@
       </template>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-has-permi="['yh:prodOrder:edit']"
-          >修改</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-has-permi="['yh:prodOrder:edit']"-->
+<!--          >修改</el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -146,6 +146,13 @@
             @click="handleDelete(scope.row)"
             v-has-permi="['yh:prodOrder:remove']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-refresh"
+            @click="handleSync({id: scope.row.erpId})"
+            v-has-permi="['yh:prodOrder:sync']"
+          >同步</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -280,6 +287,7 @@ export default {
         {key: 'erpNoStockInQty', visible: true, label: '未入库', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'erpBaseNoStockInQty', visible: false, label: '基本未入库', minWidth: null, sortable: true, overflow: false, align: 'center', width: "130"},
         {key: 'baseUnitName', visible: false, label: '基本单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'syncTime', visible: true, label: '同步时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
@@ -342,8 +350,8 @@ export default {
   },
   methods: {
     isEmpty,
-    handleSync() {
-      syncProdOrder().then(res => {
+    handleSync(query = {}) {
+      syncProdOrder(query).then(res => {
         if (res.code === 200) {
           this.$message.success("同步成功");
         }
diff --git a/src/views/yh/reportOrderProd/index.vue b/src/views/yh/reportOrderProd/index.vue
index ef2ee9c..89ec5f0 100644
--- a/src/views/yh/reportOrderProd/index.vue
+++ b/src/views/yh/reportOrderProd/index.vue
@@ -32,27 +32,27 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-has-permi="['yh:reportOrderProd:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-has-permi="['yh:reportOrderProd:remove']"
-        >删除</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-has-permi="['yh:reportOrderProd:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-has-permi="['yh:reportOrderProd:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -84,30 +84,39 @@
             <template v-if="column.key === 'id'">
               {{d.row[column.key]}}
             </template>
+            <template v-else-if="column.key === 'num'">
+              {{d.row[column.key] | dv}} {{d.row.priceUnit}}
+            </template>
+            <template v-else-if="column.key === 'pricePrice'">
+              {{d.row[column.key] | dv}} 元 / {{d.row.priceUnit}}
+            </template>
+            <template v-else-if="column.key === 'reportStatus'">
+              <dict-tag :value="d.row.reportStatus" :options="dict.type.report_status"/>
+            </template>
             <template v-else>
               {{d.row[column.key]}}
             </template>
           </template>
         </el-table-column>
       </template>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-has-permi="['yh:reportOrderProd:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-has-permi="['yh:reportOrderProd:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-has-permi="['yh:reportOrderProd:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-has-permi="['yh:reportOrderProd:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -148,22 +157,27 @@ import FormCol from "@/components/FormCol/index.vue";
 
 // 默认排序字段
 const defaultSort = {
-  prop: "createTime",
+  prop: "id",
   order: "descending"
 }
 
 export default {
   name: "ReportOrderProd",
   mixins: [$showColumns],
+  dicts: ['report_status'],
   components: {FormCol},
   data() {
     return {
       span: 24,
       // 字段列表
       columns: [
-        {key: 'id', visible: true, label: '报表关联订单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'reportProdId', visible: true, label: '报表产量ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'orderId', visible: true, label: '生产订单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'reportId', visible: false, label: '报表编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'reportDate', visible: true, label: '报表日期', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'reportStatus', visible: true, label: '报表状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'orderErpBillNo', visible: true, label: '生产订单', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'priceName', visible: true, label: '工序', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'pricePrice', visible: true, label: '单价', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'num', visible: true, label: '生产数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
       ],
       // 排序方式
diff --git a/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue b/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue
index 4cb4a4c..6fea7b3 100644
--- a/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue
+++ b/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue
@@ -2,15 +2,15 @@
   <div>
     <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="生产订单" :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.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="进度">
+          <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>
       <br/>
     </template>
@@ -20,7 +20,6 @@
 <script>
 
 import {notNullDecimal} from "@/utils";
-import {calcMulDecimal} from "@/utils/money";
 import Decimal from "decimal.js";
 
 export default {