From 4fee9e32aa820feec91886ce7a141a3f168d708c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 6 Mar 2024 09:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6--=E5=A2=9E=E5=8A=A0=E5=8E=82=E5=AE=B6=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cheliangtaizhang/cheliangtaizhang.vue     | 16 +++++++++++++---
 .../cheliangtaizhang/cheliangtaizhangAdd.vue  | 19 +++++++++++++------
 .../cheliangtaizhang/cheliangtaizhangInfo.vue | 12 +++++++++---
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
index 425cecf0eb..aa98460b35 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
@@ -249,6 +249,11 @@
                     <span style="padding: 0 8px">至</span>
                     <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.solidEndDate" clearable type="date" placeholder="结束日期"/>
                   </el-form-item>
+                  <el-form-item label="厂家开票日期">
+                    <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.manDateStart" clearable  type="date" placeholder="开始日期"/>
+                    <span style="padding: 0 8px">至</span>
+                    <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.manDateEnd" clearable type="date" placeholder="结束日期"/>
+                  </el-form-item>
                 </el-collapse-item>
               </el-collapse>
             </el-form>
@@ -305,6 +310,7 @@
             <el-table-column prop="arrivalDate" width="130" label="物流到车日期" align="center"/>
             <el-table-column prop="returnDate" width="130" label="退库日期" align="center"/>
             <el-table-column prop="solidDate" width="130" label="买断日期" align="center"/>
+            <el-table-column prop="manDate" width="130" label="厂家开票日期" align="center"/>
             <el-table-column prop="salesDate" width="130" label="销售日期" align="center"/>
             <el-table-column width="140" label="存放地点" align="center">
               <template slot-scope="scope">
@@ -376,6 +382,7 @@
             <el-table-column prop="vehicleTypeCode" width="100" label="车型编码" align="center"/>
             <el-table-column prop="configCode" width="100" label="配置编码" align="center"/>
             <el-table-column prop="remarks" width="130" label="备注" align="center"/>
+            <el-table-column prop="warrantyCardNo" width="130" label="保修卡号" align="center"/>
             <el-table-column prop="createOrgName" width="130" label="创建组织名称" align="center"/>
             <el-table-column prop="vehModelBrandName" width="130" label="品牌" align="center"/>
             <el-table-column prop="vehicleTypeValue" width="130" label="功能" align="center"/>
@@ -386,7 +393,6 @@
 <!--            <el-table-column prop="jacketPrice" width="200" label="上装价格" align="center"/>-->
 <!--            <el-table-column prop="refitFactory" width="200" label="上装委改厂" align="center"/>-->
             <!--最新版车辆台账表中不包含以下字段，暂时放到最后-->
-            <el-table-column prop="warrantyCardNo" width="130" label="保修卡号" align="center"/>
             <el-table-column prop="departmentValue" width="130" label="系别" align="center"/>
           </el-table>
         </div>
@@ -680,7 +686,9 @@ export default {
           orgSidPath: '',
           otherConfigOne: '',
           otherConfigTwo: '',
-          otherConfigThree: ''
+          otherConfigThree: '',
+          manDateStart: '',
+          manDateEnd: ''
         },
         current: 1,
         size: 5,
@@ -1170,7 +1178,9 @@ export default {
           orgSidPath: '',
           otherConfigOne: '',
           otherConfigTwo: '',
-          otherConfigThree: ''
+          otherConfigThree: '',
+          manDateStart: '',
+          manDateEnd: ''
         },
         current: 1,
         size: 5,
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
index b727f3b149..04f1b1a3aa 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
@@ -57,7 +57,6 @@
               <span>{{ temp.insideCode }}</span>
             </el-form-item>
           </el-col>
-
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -167,8 +166,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <span slot="label">保修卡号：</span>
-              <el-input v-model="temp.warrantyCardNo" maxlength="125" placeholder="" class="addinputw" clearable/>
+              <span slot="label">内部编码：</span>
+              <span>{{ temp.manDate }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -235,12 +234,18 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="16">
+          <el-col :span="8">
             <el-form-item>
               <span slot="label">备注：</span>
               <el-input v-model="temp.remarks" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span slot="label">保修卡号：</span>
+              <el-input v-model="temp.warrantyCardNo" maxlength="125" placeholder="" class="addinputw" clearable/>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item prop="isProblemVeh">
               <span slot="label">是否为问题车辆：</span>
@@ -377,7 +382,8 @@ export default {
         supplierName: '',
         supplierSid: '',
         freight: '',
-        vehMark: ''
+        vehMark: '',
+        manDate: ''
       }, // 添加和修改
       dialogFormVisible: false, // 添加修改对话框状态
       dialogStatus: '', // 对话框状态
@@ -664,7 +670,8 @@ export default {
         supplierName: '',
         supplierSid: '',
         freight: '',
-        vehMark: ''
+        vehMark: '',
+        manDate: ''
       }
       this.$emit('doback')
     },
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
index a2a1f44e65..8b0e267997 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
@@ -141,8 +141,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <span slot="label">保修卡号：</span>
-              <span>{{ temp.warrantyCardNo }}</span>
+              <span slot="label">厂家开票日期：</span>
+              <span>{{ temp.manDate }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -207,12 +207,18 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="16">
+          <el-col :span="8">
             <el-form-item>
               <span slot="label">备注：</span>
               <span>{{ temp.remarks }}</span>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span slot="label">保修卡号：</span>
+              <span>{{ temp.warrantyCardNo }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item>
               <span slot="label">是否为问题车辆：</span>