From a1a8ac84ca7a77b49512e6f3f194edc68764614b Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 27 Jul 2022 13:44:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E8=B0=83=E8=BD=A6?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8E=BB=E6=8E=89=E5=8F=91=E7=A5=A8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cheliangneigou/cheliangneigouInfo.vue     | 10 ++---
 .../cheliangpaichan/cheliangpaichan.vue       |  6 +--
 .../cheliangpaichan/cheliangpaichanAdd.vue    | 37 +++++++++++++++++--
 .../neigouDaiBanByBusinessDivisionInfo.vue    | 10 ++---
 .../neigouDaiBanByShunTingTypeValueInfo.vue   | 10 ++---
 .../neigouguanli/neigouDaiBanByVinNoInfo.vue  | 10 ++---
 .../neigouguanli/neigouDaiBanInfo.vue         | 10 ++---
 .../neigouguanli/neigouEdit.vue               | 14 +++----
 .../neigouguanli/neigouYiBanInfo.vue          | 10 ++---
 9 files changed, 74 insertions(+), 43 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouInfo.vue
index 53dd19f768..e51cab1967 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouInfo.vue
@@ -65,11 +65,11 @@
                 <span>{{ scope.row.witPinMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发票类型" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.invoiceTypeValue }}</span>
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="发票类型" align="center" width="150">-->
+<!--              <template slot-scope="scope">-->
+<!--                <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="运费" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.freight }}</span>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
index ed8cbfe768..dc294236e7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
@@ -30,9 +30,9 @@
         </div>
         <div class="">
           <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%;" @selection-change="handleSelectionChange">
-            <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column width="50" type="selection" align="center"/>
-            <el-table-column width="150" label="操作" align="center">
+            <el-table-column fixed width="50" type="selection" align="center"/>
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column fixed width="150" label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="small" :disabled="scope.row.nodeState =='排产申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="handleEdit(scope.row)">办理</el-button>
                 <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
index d5d2f43662..230d56f040 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
@@ -61,7 +61,7 @@
               <template slot-scope="scope">
                 <el-button size="mini" type="danger" @click="dataDelete(scope.$index)">删除
                 </el-button>
-                <el-button size="mini" type="primary">上装选择</el-button>
+                <el-button size="mini" type="primary" @click="handleShangZhuang(scope.$index)">上装选择</el-button>
               </template>
             </el-table-column>
             <el-table-column label="车型" align="center" header-align="center" width="250">
@@ -116,18 +116,21 @@
     <!--End 添加修改部分-->
     <!--选择车型和常用配置-->
     <configuration v-show="viewState == 2" ref="divconfiguration" @backData="backData" @doback="closePage"/>
+    <shangzhuangpeizhi v-show="viewState == 3" ref="divShangzhuangpeizhi" @backData="backPeizhi" @doback="closePage"/>
   </div>
 </template>
 
 <script>
 import req from '@/api/supplychain/busvehicleapply'
 import configuration from './chexingbyconfiguration'
+import shangzhuangpeizhi from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhi'
 import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'cheliangpaichanAdd',
   components: {
-    configuration
+    configuration,
+    shangzhuangpeizhi
   },
   data() {
     return {
@@ -262,7 +265,23 @@ export default {
             saleGuPrice: e.guidedPrice,
             insideCode: e.insideCode, // 内部编码
             vehicleName: e.vehicleAlias,
-            vehicleSid: e.modelSid
+            vehicleSid: e.modelSid,
+            busVehicleApplySz: {
+              color: '',
+              coverPlate: '',
+              floorHeating: '',
+              otherConfig: '',
+              overallDimension: '',
+              plateMaterial: '',
+              plateThickness: '',
+              refitFactory: '',
+              refitMethod: '',
+              refrigerator: '',
+              sid: '',
+              tarpaulinSlide: '',
+              topName: '',
+              vehicleFunction: ''
+            }
           })
           if (e.insideCode) {
             this.isRead = true
@@ -324,6 +343,18 @@ export default {
         }
       })
     },
+    handleShangZhuang(index) {
+      this.viewState = 3
+      this.$refs['divShangzhuangpeizhi'].showData(index)
+    },
+    backPeizhi(val, index) {
+      console.log(val, index)
+      this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.color = val.colorValue
+      this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.coverPlate = val.selfUnHyCoPl
+      this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.floorHeating = val.floorHeating
+      this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.otherConfig = val.moreConfig
+      this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.overallDimension = val.wk
+    },
     // 返回（===既判断）
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue
index aa9f22f79b..b225bc4be4 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue
@@ -67,11 +67,11 @@
                 <span>{{ scope.row.witPinMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发票类型" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.invoiceTypeValue }}</span>
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="发票类型" align="center" width="150">-->
+<!--              <template slot-scope="scope">-->
+<!--                <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="运费" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.freight }}</span>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue
index 1d5f8949e0..f4956e0456 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue
@@ -67,11 +67,11 @@
                 <span>{{ scope.row.witPinMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发票类型" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.invoiceTypeValue }}</span>
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="发票类型" align="center" width="150">-->
+<!--              <template slot-scope="scope">-->
+<!--                <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="运费" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.freight }}</span>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue
index c5e4a85697..1e90d47f29 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue
@@ -79,11 +79,11 @@
                 <span>{{ scope.row.witPinMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发票类型" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.invoiceTypeValue }}</span>
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="发票类型" align="center" width="150">-->
+<!--              <template slot-scope="scope">-->
+<!--                <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="运费" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.freight }}</span>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue
index 9c74e6ec0a..4477e1f87d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue
@@ -67,11 +67,11 @@
                 <span>{{ scope.row.witPinMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发票类型" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.invoiceTypeValue }}</span>
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="发票类型" align="center" width="150">-->
+<!--              <template slot-scope="scope">-->
+<!--                <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="运费" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.freight }}</span>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
index d632ca5e5d..9ece6c3d03 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
@@ -84,13 +84,13 @@
                 <el-input v-model="scope.row.witPinMoney" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
               </template>
             </el-table-column>
-            <el-table-column label="发票类型" align="center" width="150">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.invoiceTypeValue" placeholder="请选择" clearable class="addinputw" @change="changeInvoiceType(scope.row, this)">
-                  <el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
-                </el-select>
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="发票类型" align="center" width="150">-->
+<!--              <template slot-scope="scope">-->
+<!--                <el-select v-model="scope.row.invoiceTypeValue" placeholder="请选择" clearable class="addinputw" @change="changeInvoiceType(scope.row, this)">-->
+<!--                  <el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>-->
+<!--                </el-select>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="运费" align="center" width="150">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.freight" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue
index 5c790e2a76..63f359f320 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue
@@ -65,11 +65,11 @@
                 <span>{{ scope.row.witPinMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发票类型" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.invoiceTypeValue }}</span>
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="发票类型" align="center" width="150">-->
+<!--              <template slot-scope="scope">-->
+<!--                <span>{{ scope.row.invoiceTypeValue }}</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="运费" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.freight }}</span>