From 035fcb159f04a8b03c67d94ec9a3da36eaf6d316 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Tue, 26 Jul 2022 14:08:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8F=B0=E8=B4=A6=E3=80=81?=
 =?UTF-8?q?=E5=93=81=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/pinpai/pinpaiguanli/pinpaiAdd.vue   |  4 +-
 .../pinpai/pinpaiguanli/pinpaiguanli.vue      | 56 +++++++++----------
 .../cheliangtaizhang/cheliangtaizhang.vue     | 12 ++--
 .../cheliangtaizhang/cheliangtaizhangInfo.vue |  7 ++-
 .../relation/vehicleconfiguration.vue         |  7 +--
 5 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
index 925674dcc3..e81be1ac21 100644
--- a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
+++ b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
@@ -3,8 +3,8 @@
     <div class="tab-header webtop">
       <div>{{ viewTitle }}</div>
       <div>
-        <el-button type="primary" size="medium" @click="handleCreate()">保存</el-button>
-        <el-button type="info" size="medium" @click="handleReturn()">返回</el-button>
+        <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>
     <div class="listconadd">
diff --git a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue
index 99be4d4561..8152124bc2 100644
--- a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue
@@ -52,7 +52,12 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
                     @selection-change=" handleSelectionChange">
             <el-table-column width="50px" type="selection" align="center"/>
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" fixed align="center" width="90px" class-name="small-padding fixed-width">
+              <template slot-scope="{row}">
+                <el-button size="mini" type="primary" @click="handleEdit(row)">编辑</el-button>
+              </template>
+            </el-table-column>
             <el-table-column width="260px" label="品牌名称" align="center">
               <template slot-scope="scope">
                 <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.brandName }}</span>
@@ -168,13 +173,6 @@ export default {
           btnKey: 'toAdd',
           btnLabel: '新增'
         },
-        {
-          type: 'primary',
-          size: 'small',
-          icon: 'edit',
-          btnKey: 'toEdit',
-          btnLabel: '编辑'
-        },
         {
           type: 'danger',
           size: 'small',
@@ -298,9 +296,6 @@ export default {
         case 'toAdd':
           this.toAdd()
           break
-        case 'toEdit':
-          this.toEdit()
-          break
         case 'doDel':
           this.doDel()
           break
@@ -378,7 +373,7 @@ export default {
       // console.log('wpwpwpw',this.daochu_user)
     },
     // 打开修改
-    toEdit() {
+    handleEdit(row) {
       // this.resetTemp()
       // const tempData = Object.assign({}, row) // copy obj
       // this.FormLoading = true
@@ -389,27 +384,26 @@ export default {
       //     this.temp = response.data
 
       //   this.$router.push({ path: '/pinpai/pinpaiAdd/1' })
-      if (this.sids.length === 1) {
-        this.dialogStatus = 'update'
+      // if (this.sids.length === 1) {
         this.viewState = 3
-        this.$refs['divadd'].showEdit(this.sids[0])
+        this.$refs['divadd'].showEdit(row.sid)
         // this.$router.push({ path: `/pinpai/pinpaiAdd/${this.sids[0]}` })
-      } else if (this.sids.length > 1) {
-        this.$notify({
-          title: '提示',
-          message: '不能选中多个商家修改!!',
-          type: 'info',
-          duration: 2000,
-        })
-      } else {
-        this.$notify({
-          title: '提示',
-          message: '没有选择品牌!!',
-          type: 'error',
-          duration: 2000,
-        })
-        return
-      }
+      // } else if (this.sids.length > 1) {
+      //   this.$notify({
+      //     title: '提示',
+      //     message: '不能选中多个商家修改!!',
+      //     type: 'info',
+      //     duration: 2000,
+      //   })
+      // } else {
+      //   this.$notify({
+      //     title: '提示',
+      //     message: '没有选择品牌!!',
+      //     type: 'error',
+      //     duration: 2000,
+      //   })
+      //   return
+      // }
       // this.dialogFormVisible = true
       //     this.$nextTick(() => {
       //       this.$refs['dataForm'].clearValidate()
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 300fa507a1..ebbd4945a9 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
@@ -27,8 +27,8 @@
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
-              <el-button type="primary" @click="handleFilter">查询</el-button>
-              <el-button type="primary" @click="handleReset">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" size="small"  @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
             </div>
           </div>
         </div>
@@ -48,7 +48,7 @@
 <!--                <el-button size="mini" type="primary" @click="cheLiangXiangXiPeiZhi(row)">车型配置</el-button>-->
 <!--              </template>-->
 <!--            </el-table-column>-->
-            <el-table-column  label="车型名称" fixed width="280" align="left" header-align="center">
+            <el-table-column  label="车型" fixed width="200" align="left" header-align="center">
               <template slot-scope="scope">
                 <span class="bluezi" @click="cheLiangXiangXiPeiZhi(scope.row)">{{ scope.row.modelName }}</span>
               </template>
@@ -65,6 +65,7 @@
             <!--            </el-table-column>-->
             <el-table-column prop="locationName" width="140" label="存放地点" align="center"/>
             <el-table-column prop="vehicleStateValue" width="100" label="库存状态" align="center"/>
+            <el-table-column prop="priceDate" width="130" label="厂家入库日期"  align="center" />
             <el-table-column prop="arrivalDate" width="130" label="到货日期" align="center"/>
             <el-table-column prop="configName" width="460" label="常用配置名称" align="left" header-align="center" />
             <el-table-column prop="contractPrice" width="130" label="厂家合同价" align="center" />
@@ -78,7 +79,6 @@
             <el-table-column prop="lockedStateValue" width="130" label="锁定状态" align="center" />
             <el-table-column prop="manPurOrderTypeValue" width="160" label="厂家采购订单类型" align="center" />
             <el-table-column prop="orderingNo" width="160" label="厂家订单编号" align="center" />
-            <el-table-column prop="priceDate" width="130" label="厂家入库日期"  align="center" />
             <el-table-column prop="rebate1" width="130" label="返利1"  align="center" />
             <el-table-column prop="rebate2" width="130" label="返利2" align="center" />
             <el-table-column prop="rebate3" width="130" label="返利3" align="center" />
@@ -89,7 +89,7 @@
             <el-table-column prop="solidDate" width="130" label="实销日期" align="center" />
             <el-table-column prop="specialInstructions" width="150" label="特殊或差异说明" align="left" header-align="center" />
             <el-table-column prop="useOrgName" width="130" label="使用组织名称" align="center" />
-            <el-table-column prop="vehicleStateValue" width="100" label="车辆状态" align="center" />
+            <el-table-column prop="witPinState" width="100" label="调车状态" align="center" />
             <el-table-column prop="warrantyCardNo" width="130" label="保修卡号" align="center" />
           </el-table>
         </div>
@@ -294,7 +294,7 @@ export default {
       }
     },
     setDater() {
-      typeValues({ type: 'vehicleLedgerState' }).then((res) => {
+      typeValues({ type: 'vehicleState' }).then((res) => {
         if (res.code === '200') {
           this.vehicleState_list = res.data
         }
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 c25db68305..410a92df12 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
@@ -17,7 +17,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" class="trightb">常用配置：</el-col>
-          <el-col :span="8">
+          <el-col :span="8" class="configName_sty">
             <el-form-item>
               <span>{{ temp.configName }}</span>
             </el-form-item>
@@ -259,8 +259,11 @@ export default {
   margin-bottom: 0;
 }
 /deep/ .el-form-item__content {
-  line-height: 37px;
+  /*line-height: 37px;*/
   position: relative;
   font-size: 14px;
 }
+.configName_sty /deep/ .el-form-item__content{
+  line-height: 27px;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration.vue
index 81b4061eb8..cb73e33ad3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration.vue
@@ -1,15 +1,12 @@
 <template>
   <div class="app-container">
     <div class="tab-header webtop">
-      <div>车型配置标准页面</div>
+      <div>车型配置详情</div>
       <div>
         <el-button type="info" size="small" @click="handleReturn">关闭</el-button>
       </div>
     </div>
     <div class="listconadd">
-      <div class="wlInfo">
-        <span>车型配置标准页面</span>
-      </div>
       <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
         <div class="headtitle">{{ formobj.vehicleAlias }}</div>
 <!--        <div class="headtitle"><span>系列：{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动：{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能：{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力：{{ formobj.powerValue }}</span></span></span></span></div>-->
@@ -199,10 +196,12 @@ export default {
           configSid: '',
           userSid: window.sessionStorage.getItem('userSid')
       }
+      this.formobj = {}
       this.$emit('doback')
     },
     // 查看
     showInfo(row) {
+      console.log('从车辆台账带来的数据',row)
       this.FormLoading = true
       this.sid_list.modelSid = row.modelSid
       this.sid_list.configSid = row.modelConfigSid