fix show bug

2 years ago · 38d7799b13
parent 37fd069908
commit 38d7799b13
13 changed files with 100 additions and 25 deletions
--- a/package.json
+++ b/package.json
@ -57,6 +57,7 @@
    "nprogress": "^0.2.0",
    "pinia": "^2.1.7",
    "pinia-plugin-persistedstate": "^3.2.1",
+    "pixiu-number-toolkit": "^1.3.1",
    "qrcode": "^1.5.3",
    "qs": "^6.12.0",
    "steady-xml": "^0.1.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -104,6 +104,9 @@ importers:
      pinia-plugin-persistedstate:
        specifier: ^3.2.1
        version: 3.2.1(pinia@2.1.7(typescript@5.3.3)(vue@3.4.21(typescript@5.3.3)))
+      pixiu-number-toolkit:
+        specifier: ^1.3.1
+        version: 1.3.1
      qrcode:
        specifier: ^1.5.3
        version: 1.5.3
@ -921,6 +924,10 @@ packages:
    resolution: {integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==}
    engines: {node: '>=6.9.0'}

+  '@babel/runtime@7.24.7':
+    resolution: {integrity: sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==}
+    engines: {node: '>=6.9.0'}
+
  '@babel/template@7.24.0':
    resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==}
    engines: {node: '>=6.9.0'}
@ -2450,6 +2457,9 @@ packages:
  compare-func@2.0.0:
    resolution: {integrity: sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==}

+  complex.js@2.1.1:
+    resolution: {integrity: sha512-8njCHOTtFFLtegk6zQo0kkVX1rngygb/KQI6z1qZxlFI3scluC+LVTCFbrkWjBv4vvLlbQ9t88IPMC6k95VTTg==}
+
  component-classes@1.2.6:
    resolution: {integrity: sha512-hPFGULxdwugu1QWW3SvVOCUHLzO34+a2J6Wqy0c5ASQkfi9/8nZcBB0ZohaEbXOQlCflMAEMmEWk7u7BVs4koA==}

@ -2640,6 +2650,9 @@ packages:
    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
    engines: {node: '>=0.10.0'}

+  decimal.js@10.4.3:
+    resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
+
  decode-uri-component@0.2.2:
    resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
    engines: {node: '>=0.10'}
@ -2872,6 +2885,9 @@ packages:
  escape-html@1.0.3:
    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}

+  escape-latex@1.2.0:
+    resolution: {integrity: sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==}
+
  escape-string-regexp@1.0.5:
    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
    engines: {node: '>=0.8.0'}
@ -3571,6 +3587,9 @@ packages:
    engines: {node: '>=10'}
    hasBin: true

+  javascript-natural-sort@0.7.1:
+    resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==}
+
  jiti@1.21.0:
    resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==}
    hasBin: true
@ -3810,6 +3829,11 @@ packages:
  matches-selector@1.2.0:
    resolution: {integrity: sha512-c4vLwYWyl+Ji+U43eU/G5FwxWd4ZH0ePUsFs5y0uwD9HUEFBXUQ1zUUan+78IpRD+y4pUfG0nAzNM292K7ItvA==}

+  mathjs@13.0.1:
+    resolution: {integrity: sha512-38IzJ/MY0erNp7apXJp6DZwUYHOuvlqRqk2KtMo9GPqrTmCaLb1vTzw/Fib3PessXEMs52wnJaga0pd9xkIjjA==}
+    engines: {node: '>= 18'}
+    hasBin: true
+
  mathml-tag-names@2.1.3:
    resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}

@ -4170,6 +4194,9 @@ packages:
      typescript:
        optional: true

+  pixiu-number-toolkit@1.3.1:
+    resolution: {integrity: sha512-QhgLsEYgLkZoGTFN2i2keD/ql78D20xfpFalDfzJtNfzKEDs1kTFl5asO05Jyqem55h/5rQjvL2LJhPNi2+Nkw==}
+
  pkcs7@1.0.4:
    resolution: {integrity: sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==}
    hasBin: true
@ -4488,6 +4515,9 @@ packages:
  scule@1.3.0:
    resolution: {integrity: sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==}

+  seedrandom@3.0.5:
+    resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
+
  selection-update@0.1.2:
    resolution: {integrity: sha512-4jzoJNh7VT2s2tvm/kUSskSw7pD0BVcrrGccbfOMK+3AXLBPz6nIy1yo+pbXgvNoTNII96Pq92+sAY+rF0LUAA==}

@ -4784,6 +4814,9 @@ packages:
  through@2.3.8:
    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}

+  tiny-emitter@2.1.0:
+    resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==}
+
  tiny-svg@2.2.4:
    resolution: {integrity: sha512-NOi39lBknf4UdDEahNkbEAJnzhu1ZcN2j75IS2vLRmIhsfxdZpTChfLKBcN1ShplVmPIXJAIafk6YY5/Aa80lQ==}

@ -4863,6 +4896,10 @@ packages:
    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
    engines: {node: '>= 0.4'}

+  typed-function@4.2.1:
+    resolution: {integrity: sha512-EGjWssW7Tsk4DGfE+5yluuljS1OGYWiI1J6e8puZz9nTMM51Oug8CD5Zo4gWMsOhq5BI+1bF+rWTm4Vbj3ivRA==}
+    engines: {node: '>= 18'}
+
  typedarray.prototype.slice@1.0.3:
    resolution: {integrity: sha512-8WbVAQAUlENo1q3c3zZYuy5k9VzBQvp8AX9WOtbvyWlLM1v5JaSRmjubLjzHF4JFtptjH/5c/i95yaElvcjC0A==}
    engines: {node: '>= 0.4'}
@ -5998,6 +6035,10 @@ snapshots:
    dependencies:
      regenerator-runtime: 0.14.1

+  '@babel/runtime@7.24.7':
+    dependencies:
+      regenerator-runtime: 0.14.1
+
  '@babel/template@7.24.0':
    dependencies:
      '@babel/code-frame': 7.24.2
@ -7791,6 +7832,8 @@ snapshots:
      array-ify: 1.0.0
      dot-prop: 5.3.0

+  complex.js@2.1.1: {}
+
  component-classes@1.2.6:
    dependencies:
      component-indexof: 0.0.3
@ -7966,6 +8009,8 @@ snapshots:

  decamelize@1.2.0: {}

+  decimal.js@10.4.3: {}
+
  decode-uri-component@0.2.2: {}

  deep-is@0.1.4: {}
@ -8297,6 +8342,8 @@ snapshots:

  escape-html@1.0.3: {}

+  escape-latex@1.2.0: {}
+
  escape-string-regexp@1.0.5: {}

  escape-string-regexp@4.0.0: {}
@ -9024,6 +9071,8 @@ snapshots:
      filelist: 1.0.4
      minimatch: 3.1.2

+  javascript-natural-sort@0.7.1: {}
+
  jiti@1.21.0: {}

  js-base64@2.6.4: {}
@ -9240,6 +9289,18 @@ snapshots:

  matches-selector@1.2.0: {}

+  mathjs@13.0.1:
+    dependencies:
+      '@babel/runtime': 7.24.7
+      complex.js: 2.1.1
+      decimal.js: 10.4.3
+      escape-latex: 1.2.0
+      fraction.js: 4.3.7
+      javascript-natural-sort: 0.7.1
+      seedrandom: 3.0.5
+      tiny-emitter: 2.1.0
+      typed-function: 4.2.1
+
  mathml-tag-names@2.1.3: {}

  mdn-data@2.0.14: {}
@ -9589,6 +9650,10 @@ snapshots:
    optionalDependencies:
      typescript: 5.3.3

+  pixiu-number-toolkit@1.3.1:
+    dependencies:
+      mathjs: 13.0.1
+
  pkcs7@1.0.4:
    dependencies:
      '@babel/runtime': 7.24.4
@ -9923,6 +9988,8 @@ snapshots:

  scule@1.3.0: {}

+  seedrandom@3.0.5: {}
+
  selection-update@0.1.2: {}

  semver@6.3.1: {}
@ -10288,6 +10355,8 @@ snapshots:

  through@2.3.8: {}

+  tiny-emitter@2.1.0: {}
+
  tiny-svg@2.2.4: {}

  tiny-svg@3.0.1: {}
@ -10374,6 +10443,8 @@ snapshots:
      is-typed-array: 1.1.13
      possible-typed-array-names: 1.0.0

+  typed-function@4.2.1: {}
+
  typedarray.prototype.slice@1.0.3:
    dependencies:
      call-bind: 1.0.7
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@ -6,7 +6,7 @@
          <el-col :xl="8" :lg="8" :md="12" :sm="24" :xs="24">
            <div class="flex items-center">
              <el-avatar :src="avatar" :size="70" class="mr-16px">
-                <img src="@/assets/imgs/avatar.gif" alt="" />
+                <img src="@/assets/imgs/profile.jpg" alt="" />
              </el-avatar>
              <div>
                <div class="text-20px">
--- a/src/views/erp/product/product/index.vue
+++ b/src/views/erp/product/product/index.vue
@ -68,16 +68,11 @@

    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
      <el-table-column label="条码" align="center" prop="barCode" />
-      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="名称" align="center" prop="name"  width="140px"/>
      <el-table-column label="规格" align="center" prop="standard" />
      <el-table-column label="分类" align="center" prop="categoryName" />
      <el-table-column label="单位" align="center" prop="unitName" />
-      <el-table-column
-        label="采购价格"
-        align="center"
-        prop="purchasePrice"
-        :formatter="erpPriceTableColumnFormatter"
-      />
+
      <el-table-column
        label="销售价格"
        align="center"
--- a/src/views/erp/sale/order/index.vue
+++ b/src/views/erp/sale/order/index.vue
@ -408,7 +408,7 @@ const handleSelectionChange = (rows: SaleOrderVO[]) => {
 onMounted(async () => {
  await getList()
  // 加载产品、仓库列表、客户
-  productList.value = await ProductApi.getProductSimpleList()
+  productList.value = await ProductApi.getMesProductSimpleList()
  customerList.value = await CustomerApi.getCustomerSimpleList()
  userList.value = await UserApi.getSimpleUserList()
 })
--- a/src/views/mes/bom/BomForm.vue
+++ b/src/views/mes/bom/BomForm.vue
@ -137,7 +137,7 @@ const open = async (type: string, id?: number) => {
  // 产品单位
  unitList.value = await ProductUnitApi.getProductUnitSimpleList()
  // 加载产品、
-  productList.value = await ProductApi.getProductSimpleList()
+  productList.value = await ProductApi.getMesProductSimpleList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗

--- a/src/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue
+++ b/src/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue
@ -7,7 +7,9 @@
      <el-table-column label="需求数量" align="center" prop="number" width="120px" />
      <el-table-column label="已下料" align="center" prop="finishNumber"  width="120px"/>
      <el-table-column label="进度" align="center" >
-        <el-progress :percentage="50" :stroke-width="15" striped striped-flow />
+        <template #default="scope">
+          <el-progress :percentage="scope.row.finishNumber/scope.row.number" :stroke-width="15" striped striped-flow />
+        </template>
      </el-table-column>
      <el-table-column label="操作" align="center"/>
    </el-table>
@ -15,6 +17,7 @@
 </template>
 <script setup lang="ts">
 import { ItemRequisitionApi } from '@/api/mes/itemrequisition'
+import {DICT_TYPE} from "@/utils/dict";

 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@ -258,10 +258,10 @@ import {ProductApi, ProductVO} from "@/api/erp/product/product";
 import {TaskApi, TaskVO} from "@/api/mes/task";
 import ItemNeedIndex from "@/views/mes/bom/ItemNeedIndex.vue";
 import Paigong from "./components/Paigong.vue";
-import BomDetailList from "@/views/mes/bom/components/BomDetailList.vue";
 import ItemRequisitionDetailList
  from "@/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue";

+
 const productList = ref<ProductVO[]>([]) // 产品列表
 const taskList = ref<TaskVO[]>([]) // 列表
 /** 生产计划 列表 */
--- a/src/views/mes/planprogress/ProgressList.vue
+++ b/src/views/mes/planprogress/ProgressList.vue
@ -5,7 +5,9 @@
      <el-table-column label="工序" align="center" prop="productName" width="120px" />
      <el-table-column label="成品数量" align="center" prop="number" width="80px"/>
      <el-table-column label="完成进度" align="center" >
-        <el-progress :percentage="50" :stroke-width="15" striped striped-flow  :color="finishColors"/>
+        <template #default="scope">
+          <el-progress :percentage="scope.row.finishNumber/scope.row.number" :stroke-width="15"  :color="finishColors" striped striped-flow />
+        </template>
      </el-table-column>
      <el-table-column label="废品数量" align="center" prop="finishNumber"  width="120px"/>
      <el-table-column label="废品率" align="center" >
--- a/src/views/mes/task/TaskForm.vue
+++ b/src/views/mes/task/TaskForm.vue
@ -8,7 +8,7 @@
      v-loading="formLoading"
    >
      <el-form-item label="编码" prop="code">
-        <el-input disabled v-model="formData.code" placeholder="编码保存后自动生成" />
+        <el-input :disabled="formType==='create'" v-model="formData.code" placeholder="编码保存后自动生成" />
      </el-form-item>
      <el-form-item label="交货日期" prop="deliveryDate">
        <el-date-picker
@ -68,6 +68,7 @@ const formData = ref({
 })
 const formRules = reactive({
  deliveryDate: [{ required: true, message: '交货日期不能为空', trigger: 'blur' }],
+  taskType: [{ required: true, message: '任务类型不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref

@ -119,12 +120,12 @@ const resetForm = () => {
    id: undefined,
    code: undefined,
    orderDate: undefined,
-    taskType: undefined,
+    taskType: '订单任务',
    deliveryDate: undefined,
    status: undefined,
    processInstanceId: undefined,
    remark: undefined,
-    isEnable: undefined
+    isEnable: true
  }
  formRef.value?.resetFields()
 }
--- a/src/views/mes/task/components/TaskDetailList.vue
+++ b/src/views/mes/task/components/TaskDetailList.vue
@ -10,7 +10,7 @@
      <Icon icon="ep:plus" class="mr-5px" /> 新增
    </el-button>
    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="产品" align="center" prop="productName" />
+      <el-table-column label="产品" align="center" prop="productName" width="140px"/>
      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="数量" align="center" prop="number" />
      <el-table-column label="每包/个" align="center" prop="packageSize" />
@ -66,12 +66,13 @@
    <!-- 表单弹窗：添加/修改 -->
    <TaskDetailForm ref="formRef" @success="getList" />
  <!-- 表单弹窗：添加/修改 -->
-  <TaskDetailView ref="formViewRef" />
+   <TaskDetailView ref="formViewRef" @success="getList"/>
 </template>
 <script setup lang="ts">
 import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
 import { TaskApi } from '@/api/mes/task'
 import TaskDetailForm from './TaskDetailForm.vue'
+import TaskDetailView from './TaskDetailView.vue'

 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@ -135,7 +136,7 @@ const openFormView = (type: string, id?: number) => {
    message.error('请选择一个生产任务单')
    return
  }
-  formViewRef.value.open(type, id, props.taskId)
+  formViewRef.value.open(type, id)
 }
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
--- a/src/views/mes/task/components/TaskDetailView.vue
+++ b/src/views/mes/task/components/TaskDetailView.vue
@ -132,8 +132,6 @@
      </div>

    </el-form>
-
-
    <template #footer>
      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
      <el-button @click="dialogVisible = false">取 消</el-button>
@ -180,12 +178,11 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref

 /** 打开弹窗 */
-const open = async (type: string, id?: number, taskId: number) => {
+const open = async (type: string, id?: number) => {
  dialogVisible.value = true
  dialogTitle.value = t('action.' + type)
  formType.value = type
  resetForm()
-  formData.value.taskId = taskId
  // 修改时，设置数据
  if (id) {
    formLoading.value = true
@ -195,8 +192,7 @@ const open = async (type: string, id?: number, taskId: number) => {
      formLoading.value = false
    }
  }
-  // 产品单位
-  //unitList.value = await ProductUnitApi.getProductUnitSimpleList()
+
  unitList.value= [
    {
      id: 5,
--- a/src/views/mes/task/index.vue
+++ b/src/views/mes/task/index.vue
@ -110,6 +110,11 @@
      <el-table-column label="编码" align="center" prop="code" />
      <el-table-column label="下达日期" align="center" prop="orderDate" :formatter="dateFormatter2" />
      <el-table-column label="交货日期" align="center" prop="deliveryDate" :formatter="dateFormatter2"/>
+      <el-table-column label="类型" align="center" prop="taskType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_TASK_TYPE" :value="scope.row.taskType" />
+        </template>
+      </el-table-column>
      <el-table-column label="状态" align="center" prop="status">
        <template #default="scope">
          <dict-tag :type="DICT_TYPE.MES_TASK_STATUS" :value="scope.row.status" />