From e3e824f77348544492463d347ed76e6ddf539d16 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 27 Sep 2023 16:37:52 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=89=A9=E6=96=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=81=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/deviceLedger/index.vue | 30 +++++++++++++++++++++++++++
 src/views/base/materialInfo/index.vue | 16 ++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/src/views/base/deviceLedger/index.vue b/src/views/base/deviceLedger/index.vue
index 794161c..922f919 100644
--- a/src/views/base/deviceLedger/index.vue
+++ b/src/views/base/deviceLedger/index.vue
@@ -124,6 +124,13 @@
       </el-table-column>
       <el-table-column label="使用部门" align="center" prop="usedDepartment" v-if="columns[7].visible"/>
       <el-table-column label="所属工位" align="center" prop="productLineCode" v-if="columns[8].visible"/>
+      <el-table-column label="成本中心" align="center" prop="costCenter" v-if="columns[14].visible"/>
+      <el-table-column label="生产厂商" align="center" prop="manufacturer" v-if="columns[15].visible"/>
+      <el-table-column label="启用日期" align="center" prop="enableDate" width="180" v-if="columns[16].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.enableDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible"/>
       <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[10].visible"/>
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[11].visible">
@@ -202,6 +209,20 @@
         <el-form-item label="使用部门" prop="usedDepartment">
           <el-input v-model="form.usedDepartment" placeholder="请输入使用部门" />
         </el-form-item>
+        <el-form-item label="成本中心" prop="costCenter">
+          <el-input v-model="form.costCenter" placeholder="请输入成本中心" />
+        </el-form-item>
+        <el-form-item label="生产厂商" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入生产厂商" />
+        </el-form-item>
+        <el-form-item label="启用日期" prop="enableDate">
+          <el-date-picker clearable
+                          v-model="form.enableDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择启用日期">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="所属工位">
           <el-select v-model="form.productLineCode" placeholder="请选择所属工位">
             <el-option
@@ -268,6 +289,9 @@ export default {
         deviceAddress: null,
         deviceStatus: null,
         usedDepartment: null,
+        costCenter: null,
+        manufacturer: null,
+        enableDate: null,
         productLineCode: null,
         isFlag: null,
         createdBy: null,
@@ -295,6 +319,9 @@ export default {
             { key: 11, label: `创建时间`, visible: false },
             { key: 12, label: `更新人`, visible: false },
             { key: 13, label: `更新时间`, visible: false },
+            { key: 14, label: `成本中心`, visible: true },
+            { key: 15, label: `生产厂商`, visible: true },
+            { key: 16, label: `启用日期`, visible: true },
         ],
       // 产线选项
       productLineList: [],
@@ -333,6 +360,9 @@ export default {
         deviceStatus: 0,
         usedDepartment: null,
         productLineCode: null,
+        costCenter: null,
+        manufacturer: null,
+        enableDate: null,
         isFlag: 0,
         createdBy: null,
         createdTime: null,
diff --git a/src/views/base/materialInfo/index.vue b/src/views/base/materialInfo/index.vue
index f9b326e..2d5280d 100644
--- a/src/views/base/materialInfo/index.vue
+++ b/src/views/base/materialInfo/index.vue
@@ -133,6 +133,11 @@
       <el-table-column label="物料规格" align="center" prop="materialSpecifications" v-if="columns[8].visible"/>
       <el-table-column label="所属工厂" align="center" prop="plantName" v-if="columns[9].visible"/>
       <el-table-column label="产线工位" align="center" prop="productLineName" v-if="columns[10].visible"/>
+      <el-table-column label="增量日期" align="center" prop="incrementDate" width="180" v-if="columns[16].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.incrementDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[11].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@@ -246,6 +251,14 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="增量日期" prop="incrementDate">
+          <el-date-picker clearable
+                          v-model="form.incrementDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择采集时间">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="启用标识" prop="isFlag">
           <el-radio-group v-model="form.isFlag">
             <el-radio
@@ -307,6 +320,7 @@ export default {
         plantCode: null,
         productLineCode: null,
         isFlag: null,
+        incrementDate: null,
         createdBy: null,
         createdTime: null,
         updatedBy: null,
@@ -334,6 +348,7 @@ export default {
         { key: 13, label: `创建时间`, visible: false },
         { key: 14, label: `更新人`, visible: false },
         { key: 15, label: `更新时间`, visible: false },
+        { key: 16, label: `增量日期`, visible: true },
       ],
       // 工厂选项
       factoryList: [],
@@ -379,6 +394,7 @@ export default {
         materialSpecifications: null,
         plantCode: null,
         productLineCode: null,
+        incrementDate: null,
         isFlag: 0,
         createdBy: null,
         createdTime: null,