供应链完善7.18测试问题，完善常用配置样式

3 years ago · a45ba2b267
9 changed files with 108 additions and 13 deletions
--- a/anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue
@ -268,7 +268,7 @@ export default {
 /* 标题头部的样式 */
 .headtitle {
  padding: 9px;
-  font-weight: bold;
+  /*font-weight: bold;*/
  font-size: 20px;
  background-color: #0294d7;
  text-align: left;
@ -328,7 +328,7 @@ export default {
  display: inline-block;
  position: absolute;
  right: 70px;
-  color: #d00000;
+  /*color: #d00000;*/
 }

 /* 内容部分的展开与收起按钮 */
--- a/anrui-scm/anrui-scm-ui/src/styles/index.scss
+++ b/anrui-scm/anrui-scm-ui/src/styles/index.scss
@ -305,7 +305,7 @@ div:focus {
        line-height: 42px;
        .addinputw {
          //padding: 5px 0;
-          width: calc(100% - 70px);
+          width: 65%;
          margin-left: 80px;
          line-height: 42px;
        }
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
@ -57,8 +57,12 @@
            <el-table-column prop="orderType" label="采购订单类型" align="center" width="120"/>
            <el-table-column prop="applicationCode" label="排产申请编号" align="center" width="200"/>
            <el-table-column prop="subscriptionDate" label="认款日期" align="center" width="100"/>
-            <el-table-column prop="insideCode" label="内部编码" header-align="center" align="left" width="120"/>
-            <el-table-column prop="vehicleName" label="车型" align="center" width="200"/>
+            <el-table-column prop="insideCode" label="内部编码" header-align="center" align="left" width="220"/>
+            <el-table-column prop="vehicleName" label="车型" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handlePeizhi(scope.row)">{{scope.row.vehicleName}}</span>
+              </template>
+            </el-table-column>
            <el-table-column prop="platformNo" label="台数" align="center" width="80"/>
            <el-table-column prop="expectLaunchDate" label="预期上线时间" align="center" width="120"/>
            <el-table-column prop="launchDate" label="上线日期" align="center" width="100"/>
@ -78,6 +82,8 @@
    <div-add v-show="viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
    <!--详情部分组件-->
    <div-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
+    <!-- 车辆详情标准页面-->
+    <vehicleconfiguration  v-show="viewState == 5" ref="divPeizhi" @doback="resetState"/>
  </div>
 </template>

@ -88,6 +94,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import divAdd from './cheliangcaigouAdd'
 import divInfo from './cheliangcaigouInfo'
+import vehicleconfiguration from '@/views/cheliang/cheliangcaigou/relation/vehicleconfiguration'

 export default {
  name: 'cheliangcaigou',
@ -96,7 +103,8 @@ export default {
    Pagination,
    pageye,
    divAdd,
-    divInfo
+    divInfo,
+    vehicleconfiguration
  },
  data() {
    return {
@ -172,6 +180,10 @@ export default {
      this.viewState = 4
      this.$refs['divinfo'].showInfo(row)
    },
+    handlePeizhi(row){
+      this.viewState = 5
+      this.$refs['divPeizhi'].showInfo(row)
+    },
    dosearch() {
      this.queryParams.current = 1
      this.loadList()
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/relation/vehicleconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/relation/vehicleconfiguration.vue
@ -0,0 +1,65 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>车型配置详情</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn">关闭</el-button>
+      </div>
+    </div>
+    <vehicleconfiguration ref="divConfig" :params="sid_list"/>
+  </div>
+</template>
+
+<script>
+import vehicleconfiguration from '@/components/VehicleConfigurationSub/vehicleconfiguration'
+
+export default {
+  name: 'chexingpeizhibiaozhun',
+  components:{
+    vehicleconfiguration
+  },
+  data() {
+    return {
+      FormLoading: false,
+      isDown: true,
+      isDownOther: true,
+      sid_list: {
+        modelSid: '',
+        configSid: '',
+        vehModelConfigSid:'',
+        guidedPrice:''
+      }
+    }
+  },
+  methods: {
+    // 返回
+    handleReturn() {
+      this.sid_list = {
+        modelSid: '',
+        configSid: '',
+        vehModelConfigSid: '',
+        guidedPrice: ''
+      }
+      this.$emit('doback')
+    },
+    // 查看
+    showInfo(row) {
+      this.FormLoading = true
+      this.sid_list.modelSid = row.modelSid
+      this.sid_list.configSid = row.modelConfigSid
+      this.sid_list.vehModelConfigSid = row.vehModelConfigSid
+      if (row.guidedPrice !== '' || row.guidedPrice !== null){
+        const guidedPrice_two = parseFloat(Number(row.guidedPrice) / 10000).toFixed(2)
+        this.sid_list.guidedPrice = guidedPrice_two
+      }
+      if (row.guidedPrice == '' || row.guidedPrice == null){
+        this.sid_list.guidedPrice = ''
+      }
+      // this.sid_list.guidedPrice = row.guidedPrice
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
@ -1054,9 +1054,10 @@ export default {
 }
 .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw{
  margin-left: 65px;
+  width: calc(100% - 70px);
 }
 .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputwTwo{
-  width: 95%;
+  width: calc(100% - 70px);
 }
 </style>

--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
@ -1,7 +1,7 @@
 <template>
  <div class="app-container">
    <div v-show="viewState === 1">
-      <button-bar view-title="合格证台账" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <button-bar view-title="合格证管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
      <div class="main-content">
        <div class="searchcon">
          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@ -27,9 +27,23 @@
                </el-date-picker>
              </el-form-item>
              <el-form-item label="合格证状态">
-                <el-select v-model="listQuery.params.certificateState" class="addinputw" clearable placeholder="请选择合格证状态"
+                <el-select v-model="listQuery.params.certificateState" class="addinputw" clearable
+                           placeholder="请选择合格证状态"
                           style="width: 200px;">
-                  <el-option v-for="item in Situation" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-option v-for="item in Situation" :key="item.dictKey" :label="item.dictValue"
+                             :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.certificationNo" placeholder="请输入车架号" clearable
+                          class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="移交状态">
+                <el-select v-model="listQuery.params.certificateState" class="addinputw" clearable
+                           placeholder="请选择移交状态"
+                           style="width: 200px;">
+                  <el-option v-for="item in Situation" :key="item.dictKey" :label="item.dictValue"
+                             :value="item.dictKey"/>
                </el-select>
              </el-form-item>
            </el-form>
@ -40,7 +54,7 @@
          </div>
        </div>
        <div class="listtop">
-          <div class="tit">合格证台账信息列表</div>
+          <div class="tit">合格证管理信息列表</div>
          <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
                  class="pagination" @pagination="getList"/>
        </div>
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue
@ -73,7 +73,7 @@ export default {
    }
  },
  created() {
-    this.showEdit()
+    // this.showEdit()
  },
  methods: {
    handleCreate() {},
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
@ -138,7 +138,7 @@ export default {
  data() {
    return {
      viewTitle: '',
-      isCheck:false,
+      isCheck:true,
      // --按钮菜单-------
      sid: '',
      datas: null,
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue
@ -123,6 +123,9 @@ import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist'

 export default {
  name: 'yancheguanliInfo',
+  components:{
+    vehiclechecklist
+  },
  data() {
    return {
      viewTitle: '',