From f02e20bcd15a605e22471ff6a09c59a40f27276d Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Fri, 27 May 2022 17:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=EF=BC=88?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/jichuxinxi/basemanufacturer.js    |  11 +-
 .../src/views/changshang/changshang.vue       |  46 +-
 .../changshangguanli/changshangguanli.vue     |  31 +-
 .../changshangguanli/changshangguanliAdd.vue  | 197 ++++----
 .../changshangguanli/changshanglook.vue       | 433 +++++++++++++-----
 .../views/pinpai/pinpaiguanli/pinpaiAdd.vue   |  14 +-
 6 files changed, 460 insertions(+), 272 deletions(-)

diff --git a/anrui-base/anrui-base-ui/src/api/jichuxinxi/basemanufacturer.js b/anrui-base/anrui-base-ui/src/api/jichuxinxi/basemanufacturer.js
index 1c061d46ba..6f236b98b2 100644
--- a/anrui-base/anrui-base-ui/src/api/jichuxinxi/basemanufacturer.js
+++ b/anrui-base/anrui-base-ui/src/api/jichuxinxi/basemanufacturer.js
@@ -6,7 +6,7 @@ export function pagerList(data) {
     return request({
         url: '/base/v1/basemanufacturer/pagerList',data,
         method: 'post',
-        headers: {'Content-Type': 'application/json'},
+        headers:{'Content-Type':'application/json'},
     })
 }
 //添加
@@ -15,16 +15,16 @@ export function SaveList(data) {
         url: '/base/v1/basemanufacturer/save',
         method: 'post',
         data: data,
-        headers: { 'Content-Type': 'application/json' }
+        headers:{ 'Content-Type':'application/json' }
     })
     }
 //修改
 export function Update(data) {
     return request({
-        url: `/base/v1/basemanufacturer/update/${data.sid}`,
+        url: 'base/v1/basemanufacturer/update/' + data.sid,
         method: 'post',
         data: data,
-        headers: {'Content-Type': 'application/json'},
+        headers:{'Content-Type':'application/json'},
     })
 }
 // 删除
@@ -42,6 +42,7 @@ export function details(data) {
         method: 'get',
     })
 }
+
 // 供应厂商列表导出
 export function basefinbankExportExcel(data) {
   return request({
@@ -74,7 +75,7 @@ export function selectListOrg(data) {
 // 根据厂商名称模糊搜索厂商名称下拉框
 export function getNamesDownes(data) {
     return request({
-        url: '/base/v1/basemanufacturer/namesDown',data,
+        url: '/base/v1/basemanufacturer/namesDown',
         method: 'get',
         params: data,
         data: qs.stringify(data),
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshang.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshang.vue
index 79c8a93224..6433872116 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshang.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshang.vue
@@ -14,33 +14,15 @@
 </template>
 
 <script>
-import {
-  mapGetters
-} from "vuex";
-import {
-  SaveList,
-  Update,
-  details,
-  selectListOrg,
-} from "@/api/jichuxinxi/basemanufacturer";
-import {
-  getProvince,
-  getCity,
-  getCounty
-} from '@/api/portal/areaPicker' // 省市区
-import {
-  typeValues
-} from "@/api/jichuxinxi/dictcommons";
-import {
-  setuser,
-  getuser,
-  getXiu,
-  getLook
-} from "@/utils/baocun";
+import {mapGetters} from "vuex";
+import {details, SaveList, selectListOrg, Update,} from "@/api/jichuxinxi/basemanufacturer";
+import {getCity, getCounty, getProvince} from '@/api/portal/areaPicker' // 省市区
+import {typeValues} from "@/api/jichuxinxi/dictcommons";
+import {getLook, getXiu, setuser} from "@/utils/baocun";
+
 export default {
   name: "ChangshangguanliAdd1",
-  components: {
-  },
+  components: {},
   data() {
     var checkEamil = (rule, value, callback) => {
       const regEamil = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/;
@@ -377,12 +359,14 @@ export default {
     },
     zuzhi0(data) {
       data.forEach((e) => {
-        if (e.children.length != 0) {
-          this.zuzhi0(e.children)
-        } else {
-          delete e.children
-          this.dataArr.push(e)
-          return
+        if (e.children) {
+          if (e.children.length != 0) {
+            this.zuzhi0(e.children)
+          } else {
+            delete e.children
+            this.dataArr.push(e)
+            return
+          }
         }
       })
     },
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
index 67081e409c..3f7f8fc738 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <changshang />
+<!--    <changshang />-->
     <div v-show="viewState === 1">
       <div class="tab-header webtop">
         <div>厂商管理</div>
@@ -87,14 +87,15 @@
         class="pagination" @pagination="getList" />
     </div>
     </div>
+
     <changshangguanli-add v-show="viewState == 2 || viewState == 3"  ref="divadd" @doback="resetState"
-                          @reloadlist="handleFilter" ></changshangguanli-add>
+                          @reloadlist="handleFilter" />
+    <changshanglook v-show="viewState == 4"  ref="divinfo" @doback="resetState" />
 
   </div>
 </template>
 
 <script>
-  import changshangguanliAdd from './changshangguanliAdd'
   import {
     mapGetters
   } from 'vuex'
@@ -118,11 +119,14 @@
   import {
     delUser
   } from '@/api/system/user/Auser'
-  import ChangshangguanliAdd from "@/views/changshang/changshangguanli/changshanglook";
+  import ChangshangguanliAdd from "@/views/changshang/changshangguanli/changshangguanliAdd.vue";
+  import changshanglook from "@/views/changshang/changshangguanli/changshanglook";
+
   export default {
-    name: 'Changshangguanli',
+    name: 'changshangguanli',
     components: {
-      changshangguanliAdd,
+      ChangshangguanliAdd,
+      changshanglook,
       Pagination,
       pageye
     },
@@ -349,9 +353,6 @@
       },
       // 打开添加对话框
       handleCreate() {
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
         this.viewState = 2
         this.$refs['divadd'].showAdd()
        /* if (this.$store.state.counter === 0) {
@@ -459,16 +460,8 @@
       },
       // 打开查看
       handleCheck(row) {
-        this.$store.state.counter = 3
-        console.log('111', row)
-        this.$router.push({
-          path: '/changshang/changshangguanliAdd/0',
-          query: {
-            sid: row.sid,
-            info: 3
-          },
-        })
-        setLook(row.sid)
+        this.viewState = 4
+        this.$refs['divinfo'].showInfo(row.sid)
       },
       // 导出
       handleDaoChu() {
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
index 89671b2066..c92eadefd4 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
@@ -2,8 +2,8 @@
   <div class="app-container">
     <div class="tab-header webtop">
       <div >
-        <div v-if="stateId === '0'">新增基础信息</div>
-        <div v-else>修改基础信息</div>
+        <div v-if="stateId == '0'">【新增】厂商信息</div>
+        <div v-else>【修改】厂商信息</div>
       </div>
       <div>
         <el-button  type="primary" size="small" @click="handleCreate()">保存</el-button>
@@ -171,16 +171,17 @@
             <el-col :span="12">
               <el-form-item>
                 <span slot="label">结算币种：</span>
-                <el-select v-model="temp1.settlementCurrency" class="addinputw" placeholder="结算币种" @change="getBiZhong()">
-                  <el-option v-for="item in Currency" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
+                <el-select v-model="temp1.settlementCurrency" class="addinputw" placeholder="结算币种" @change="getBiZhong">
+                  <el-option v-for="item in Currency" :key="item.dictKey" :label="item.dictValue"
+                             :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item prop="settlementWay">
                 <span slot="label">结算方式：</span>
-                <el-select v-model="temp1.settlementWay" class="addinputw" placeholder="结算方式" @change="getFangShi()">
-                  <el-option v-for="item in tWay" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
+                <el-select v-model="temp1.settlementWay" class="addinputw" placeholder="结算方式" @change="getFangShi">
+                  <el-option v-for="item in tWay" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -209,8 +210,10 @@
             <el-col :span="12">
               <el-form-item prop="taxClassification">
                 <span slot="label">税分类：</span>
-                <el-select v-model="temp1.taxClassification" class="addinputw" placeholder="税分类" @change="getShuiFenLei()">
-                  <el-option v-for="item in fication" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
+                <el-select v-model="temp1.taxClassification" class="addinputw" placeholder="税分类"
+                           @change="getShuiFenLei">
+                  <el-option v-for="item in fication" :key="item.dictKey" :label="item.dictValue"
+                             :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -345,33 +348,14 @@
 </template>
 
 <script>
-import {
-  mapGetters
-} from "vuex";
-import {
-  SaveList,
-  Update,
-  details,
-  selectListOrg,
-} from "@/api/jichuxinxi/basemanufacturer";
-import {
-  getProvince,
-  getCity,
-  getCounty
-} from '@/api/portal/areaPicker' // 省市区
-import {
-  typeValues
-} from "@/api/jichuxinxi/dictcommons";
-import {
-  setuser,
-  getuser,
-  getXiu,
-  getLook
-} from "@/utils/baocun";
+import {details, SaveList, selectListOrg, Update,} from "@/api/jichuxinxi/basemanufacturer";
+import {getCity, getCounty, getProvince} from '@/api/portal/areaPicker' // 省市区
+import {typeValues} from "@/api/jichuxinxi/dictcommons";
+import {getLook, getXiu, setuser} from "@/utils/baocun";
+
 export default {
   name: "ChangshangguanliAdd1",
-  components: {
-  },
+  components: {},
   data() {
     var checkEamil = (rule, value, callback) => {
       const regEamil = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/;
@@ -429,6 +413,9 @@ export default {
         upload: false, // 同步
         release: false // 下发
       },
+      sid:'',
+      tWay: [],
+      fication: [],
       province: [],
       city: [],
       county: [],
@@ -560,11 +547,11 @@ export default {
 
   },
   created() {
-    this.tempDate.sid = this.$route.params.id;
-    console.log("查看传过来的sid", this.tempDate.sid);
-    // ----------------------------------------------------------
-    this.infoe = this.$route.query.info;
-    console.log("查看传过来的状态", this.infoe);
+    // this.tempDate.sid = this.$route.params.id;
+    // console.log("查看传过来的sid", this.tempDate.sid);
+    // // ----------------------------------------------------------
+    // this.infoe = this.$route.query.info;
+    // console.log("查看传过来的状态", this.infoe);
     // ----------------------------------------------------------
     this.gertXiaLa();
     this.gertXiaLa2();
@@ -572,7 +559,7 @@ export default {
     this.gertXiaLa4();
     this.getZuZhi();
     this.huoquSheng()
-    this.init();
+    // this.init();
   },
   methods: {
     setDetaList() {
@@ -581,6 +568,7 @@ export default {
       }).then((res) => {
         if (res.code === '200') {
           this.Currency = res.data
+          console.log('结算币种', this.Currency)
         }
       })
       typeValues({
@@ -588,6 +576,7 @@ export default {
       }).then((res) => {
         if (res.code === '200') {
           this.tWay = res.data
+          console.log('结算方式', this.tWay)
         }
       })
       typeValues({
@@ -595,14 +584,15 @@ export default {
       }).then((res) => {
         if (res.code === '200') {
           this.fication = res.data
+          console.log('税分类', this.fication)
         }
       })
     },
     // 结算币种
-    getBiZhong() {
+    getBiZhong(value) {
       let bb = null
       this.Currency.forEach((e) => {
-        if (e.dictKey == this.temp.settlementCurrency) {
+        if (e.dictKey == value) {
           bb = {
             type: 'settlementCurrency',
             name: e.dictValue,
@@ -610,33 +600,46 @@ export default {
           }
         }
       })
-      this.modelValue.forEach((e, index) => {
-        if (e.type == bb.type) {
-          this.modelValue.splice(index, 1)
+      this.temp1.settlementCurrencyValue = bb.name
+    },
+    getFangShi(value) {
+      let bb = null
+      this.tWay.forEach((e) => {
+        if (e.dictKey == value) {
+          bb = {
+            type: 'settlementWay',
+            name: e.dictValue,
+            vaule: e.dictKey
+          }
         }
       })
-      this.modelValue.push(bb)
-      let ab = ''
-      this.modelValue.forEach((e, index) => {
-        ab = ab + e.name
-      })
-      this.temp.settlementCurrencyValue = ab
-      console.log(this.temp.settlementCurrencyValue, '结算币种value')
-      let cd = ''
-      this.modelValue.forEach((e, index) => {
-        cd = cd + e.vaule
+      this.temp1.settlementWayValue = bb.name
+    },
+    getShuiFenLei(value) {
+      let bb = null
+      this.fication.forEach((e) => {
+        if (e.dictKey == value) {
+          bb = {
+            type: 'taxClassification',
+            name: e.dictValue,
+            vaule: e.dictKey
+          }
+        }
       })
-      this.temp.settlementCurrency = cd
+      console.log('税分类', bb)
+      this.temp1.taxClassificationValue = bb.name
+    },
+    showAdd() {
+      this.temp = {}
+      this.temp1 = {}
+      this.temp2 = {}
+      this.dialogStatus = 'add'
+      this.viewTitle = '新增厂商详细信息'
+      this.stateId = 0
+      this.setDetaList()
     },
-      showAdd() {
-        this.temp = {}
-        this.temp1 = {}
-        this.temp2 = {}
-        this.dialogStatus = 'add'
-        this.viewTitle = '新增厂商详细信息'
-      },
 
-      init() {
+    init() {
       this.countId = this.$store.state.counter;
       // ----------------------------------------------------------
       this.stateId = this.$route.params.id;
@@ -767,27 +770,38 @@ export default {
       this.deCode.push(bb.districtCode)
     },
     showEdit(sid, row) {
+      console.log('编辑回显',sid)
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
       this.viewTitle = '修改厂商信息'
       this.dialogStatus = 'update'
-      this.temp.sid = sid
+      this.sid = sid
+      this.stateId = 1
       details(sid).then((response) => {
         if (response.code === "200") {
           if (response.data.baseManufacturerDto.useOrg) {
             this.useOrgArry = response.data.baseManufacturerDto.useOrg
           }
-          this.temp = response.data.baseManufacturerDto
-          this.temp1 = response.data.baseManufacturerFinanceDto
-          this.temp2 = response.data.baseManufacturerBankDto
+          if (response.data.baseManufacturerDto) {
+            this.temp = response.data.baseManufacturerDto
+          }
+          if (response.data.baseManufacturerFinanceDto) {
+            this.temp1 = response.data.baseManufacturerFinanceDto
+          }
+          if (response.data.baseManufacturerBankDto) {
+            this.temp2 = response.data.baseManufacturerBankDto
+          }
         }
       })
+      this.setDetaList()
     },
     // 返回
     handleReturn() {
-     // this.temp={}
-     //  this.$router.go(-1)
+      this.temp = {}
+      this.temp1 = {}
+      this.temp2 = {}
+      //  this.$router.go(-1)
       this.$emit('doback')
     },
     usrOrgArryChange(e) {
@@ -835,12 +849,14 @@ export default {
     },
     zuzhi0(data) {
       data.forEach((e) => {
-        if (e.children.length != 0) {
-          this.zuzhi0(e.children)
-        } else {
-          delete e.children
-          this.dataArr.push(e)
-          return
+        if (e.children) {
+          if (e.children.length != 0) {
+            this.zuzhi0(e.children)
+          } else {
+            delete e.children
+            this.dataArr.push(e)
+            return
+          }
         }
       })
     },
@@ -856,7 +872,7 @@ export default {
         if (valid) {
           this.FormLoading = true;
           this.dialogStatus = "create";
-          if (this.countId === 0) {
+          if (this.stateId == 0) {
             if (this.useOrgArry) {
               var abc = []
               this.useOrgArry.forEach((e) => {
@@ -866,7 +882,11 @@ export default {
             }
             var Codese = this.deCode.join(',')
             this.temp.orgAddress = Codese
-            var data={"baseManufacturerDto":this.temp,"baseManufacturerFinanceDto":this.temp1,"baseManufacturerBankDto":this.temp2};
+            var data = {
+              "baseManufacturerDto": this.temp,
+              "baseManufacturerFinanceDto": this.temp1,
+              "baseManufacturerBankDto": this.temp2
+            };
             SaveList(data).then((response) => {
               this.FormLoading = false;
               if (response.code === "200") {
@@ -878,11 +898,7 @@ export default {
                   type: "success",
                   duration: 2000
                 })
-                this.$router.push({
-                  path: '/changshang/changshangguanli',
-                  query: { jkda: 1 }
-                })
-               // this.$emit('jj', jisid)
+                this.handleReturn()
               } else {
                 this.$notify({
                   title: "提示",
@@ -900,8 +916,13 @@ export default {
               })
               this.temp.useOrg = abc.toString()
             }
-            this.temp.sid = this.stateId;
-            Update(this.temp).then((response) => {
+            var data = {
+              "sid":this.sid,
+              "baseManufacturerDto": this.temp,
+              "baseManufacturerFinanceDto": this.temp1,
+              "baseManufacturerBankDto": this.temp2
+            };
+            Update(data).then((response) => {
               this.dialogStatus = "update";
               this.FormLoading = false;
               if (response.code === "200") {
@@ -911,13 +932,7 @@ export default {
                   type: "success",
                   duration: 2000
                 })
-                this.$router.push({
-                  path: "/changshang/caiwuxinxiAdd",
-                  query: {
-                    sid: this.stateId
-                  }
-                })
-                this.$store.state.counter = 0
+                this.handleReturn()
               } else {
                 this.$notify({
                   title: "失败",
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue
index 576d4fd2e3..580915c085 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="app-container">
-    <changshang />
     <div class="tab-header webtop">
-      <div>基础信息管理</div>
+      <div>厂商管理详情</div>
       <div>
         <!-- <el-button type="primary" size="small" @click="dialogStatus==='create'?handleCreate():updateData()">保存</el-button> -->
         <el-button type="primary" size="small" @click="handleReturn()"
@@ -10,84 +9,302 @@
         >
       </div>
     </div>
-    <el-form
-      ref="dataForm"
-      :model="temp"
-      label-position="right"
-      label-width="190px"
-      class="forminfo"
-      :rules="rules"
-    >
-      <div class="title">供应厂商信息</div>
-      <el-row>
-        <el-col :span="4" class="trightb">厂商名称：</el-col>
-        <el-col :span="8"> {{ temp.manufacturerName }} </el-col>
-        <el-col :span="4" class="trightb">简称：</el-col>
-        <el-col :span="8" class="tleft"> {{ temp.manufacturerAs }} </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4" class="trightb">厂商编码：</el-col>
-        <el-col :span="8"> {{ temp.manufacturerCode }}</el-col>
-        <el-col :span="4" class="trightb">厂商通讯地址：</el-col>
-        <el-col :span="8"> {{ temp.manufacturerAddress }}</el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="4" class="trightb">厂商传真：</el-col>
-        <el-col :span="8"> {{ temp.manufacturerFax }}</el-col>
-        <el-col :span="4" class="trightb">厂商电话：</el-col>
-        <el-col :span="8"> {{ temp.manufacturerTelePhone }}</el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4" class="trightb">邮编：</el-col>
-        <el-col :span="8"> {{ temp.zipCode }}</el-col>
-        <el-col :span="4" class="trightb">邮箱：</el-col>
-        <el-col :span="8"> {{ temp.email }}</el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4" class="trightb">联系人姓名：</el-col>
-        <el-col :span="8"> {{ temp.contactName }}</el-col>
-        <el-col :span="4" class="trightb">手机号：</el-col>
-        <el-col :span="8"> {{ temp.contactMobile }}</el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4" class="trightb">办公电话：</el-col>
-        <el-col :span="8"> {{ temp.contactTelePhone }}</el-col>
-        <el-col :span="4" class="trightb">微信号：</el-col>
-        <el-col :span="8"> {{ temp.weChatID }}</el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4" class="trightb">行业：</el-col>
-        <el-col :span="8"> {{ temp.industryValue }}</el-col>
-        <el-col :span="4" class="trightb">供应商分类：</el-col>
-        <el-col :span="8"> {{ temp.supplierTypeValue }}</el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4" class="trightb">供应类别：</el-col>
-        <el-col :span="8"> {{ temp.supplyTypeValue }}</el-col>
-        <el-col :span="4" class="trightb">供应商分组：</el-col>
-        <el-col :span="8"> {{ temp.supplierGroupValue }}</el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4" class="trightb">使用组织：</el-col>
-        <el-col :span="8"> {{ temp.useOrg }}</el-col>
-        <!-- <el-col :span="4" class="trightb">国家：</el-col>
-        <el-col :span="8"> {{ temp.country }}</el-col> -->
-        <el-col :span="4" class="trightb">地区：</el-col>
-        <el-col :span="8"> {{ temp.region }}</el-col>        
-      </el-row>
-      <!-- <el-row>
-
-        <el-col :span="4" class="trightb">地区：</el-col>
-        <el-col :span="8"> {{ temp.region }}</el-col>
-         <el-col :span="4" class="trightb"></el-col>
-        <el-col :span="8"></el-col>       
-      </el-row> -->
-      <!-- <div class="footer">
-        <el-button @click="dialogFormVisible = false">取消</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确定</el-button>
-      </div> -->
-    </el-form>
+    <div  class="listconsub" style="height: auto;">
+      <el-form ref="dataForm" :title="textMap[dialogStatus]" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
+        <div class="title">供应厂商信息</div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="manufacturerName">
+              <span slot="label">厂商名称：</span>
+              <span>{{temp.manufacturerName}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">简称：</span>
+              <span>{{temp.manufacturerAs}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">厂商编码：</span>
+              <span>{{temp.manufacturerCode}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="manufacturerAddress">
+              <span slot="label">厂商通讯地址：</span>
+              <span>{{temp.manufacturerAddress}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">厂商传真：</span>
+              <span>{{temp.manufacturerFax}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="manufacturerTelePhone">
+              <span slot="label">厂商电话：</span>
+              <span>{{temp.manufacturerTelePhone}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="zipCode">
+              <span slot="label">邮编：</span>
+              <span>{{temp.zipCode}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="email">
+              <span slot="label">邮箱：</span>
+              <span>{{temp.email}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="contactName">
+              <span slot="label">联系人姓名：</span>
+              <span>{{temp.contactName}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="contactMobile">
+              <span slot="label">手机号：</span>
+              <span>{{temp.contactMobile}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="contactTelePhone">
+              <span slot="label">办公电话：</span>
+              <span>{{temp.contactTelePhone}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="weChatID">
+              <span slot="label">微信号：</span>
+              <span>{{temp.weChatID}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">行业：</span>
+              <span>{{temp.industryValue}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">供应商分类：</span>
+              <span>{{temp.supplierTypeValue}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="supplyType">
+              <span slot="label">供应类别：</span>
+              <span>{{temp.supplyTypeValue}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">供应商分组：</span>
+              <span>{{temp.supplierGroupValue}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="useOrgArry">
+              <span slot="label">使用组织：</span>
+              <span>{{temp.useOrgName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">地区：</span>
+              <span>{{temp.province + temp.city + temp.county}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">供应厂商财务信息</div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">结算币种：</span>
+              <span>{{temp1.settlementCurrencyValue}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="settlementWay">
+              <span slot="label">结算方式：</span>
+              <span>{{temp1.settlementWayValue}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">付款条件：</span>
+              <span>{{temp1.paymentConditions}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="settlementParty">
+              <span slot="label">结算方：</span>
+              <span>{{temp1.settlementParty}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">单次预付额度：</span>
+              <span>{{temp1.singleAdvance}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="taxClassification">
+              <span slot="label">税分类：</span>
+              <span>{{temp1.taxClassificationValue}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="taxRegistNum">
+              <span slot="label">税务登记号：</span>
+              <span>{{temp1.taxRegistNum}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="businessType">
+              <span slot="label">经营类型：</span>
+              <span>{{temp1.businessType}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="payee">
+              <span slot="label">收款方：</span>
+              <span>{{temp1.payee}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="invoiceType">
+              <span slot="label">发票类型：</span>
+              <span>{{temp1.invoiceType}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="defaultRate">
+              <span slot="label">默认税率：</span>
+              <span>{{temp1.defaultRate}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="remarks">
+              <span slot="label">描述：</span>
+              <span>{{temp1.remarks}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">供应厂商开户行信息</div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">国家：</span>
+              <span>{{temp2.country}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="depositBank">
+              <span slot="label">开户银行：</span>
+              <span>{{temp2.depositBank}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="bankAccount">
+              <span slot="label">银行账号：</span>
+              <span>{{temp2.bankAccount}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="accountName">
+              <span slot="label">账户名称：</span>
+              <span>{{temp2.accountName}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="dueBank">
+              <span slot="label">收款银行：</span>
+              <span>{{temp2.dueBank}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="bankingOutlets">
+              <span slot="label">银行网点：</span>
+              <span>{{temp2.bankingOutlets}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="bankAddress">
+              <span slot="label">开户行地址：</span>
+              <span>{{temp2.bankAddress}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="paymentLines">
+              <span slot="label">联行号：</span>
+              <span>{{temp2.paymentLines}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="swiftCode">
+              <span slot="label">Swiftcode(银行代码)：</span>
+              <span>{{temp2.swiftCode}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="currency">
+              <span slot="label">币种：</span>
+              <span>{{temp2.currency}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item>
+              <span slot="label">描述：</span>
+              <span>{{temp2.remarks}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" />
+        </el-row>
+      </el-form>
+    </div>
   </div>
 </template>
 
@@ -116,12 +333,14 @@ export default {
       },
       FormLoading: false,
       listLoading: false,
-      temp: {}, // 添加和修改
       templook: {}, // 查看实体
       textMap: {
         update: "修改",
         create: "创建",
       },
+      temp:{},
+      temp1:{},
+      temp2:{},
       dialogFormVisible: false, // 添加修改对话框状态
       dialogFormShowVisible: false, // 查看对话框默认关闭状态
       dialogStatus: "", // 对话框状态
@@ -175,16 +394,14 @@ export default {
     ]),
   },
   created() {
-    // console.log('路由：', JSON.stringify(this.$route.query.sid))
-    this.tempDate.sid = this.$route.query.sid;
-    this.handleCheck();
+
   },
   methods: {
     init() {},
     // ----------------------------------方法--------------------
     // 返回
     handleReturn() {
-      this.$router.go(-1);
+      this.$emit('doback')
     },
     // 添加前数据初始化
     resetTemp() {
@@ -197,34 +414,24 @@ export default {
         state: "", //	状态
       };
     },
-    // 添加数据
-    handleCreate() {
-      //   this.$refs['dataForm'].validate((valid) => {
-      //     if (valid) {
-      //       this.FormLoading = true
-      //       this.dialogStatus = 'create'
-      //       SaveList(this.temp).then((response) => {
-      //         this.dialogStatus = 'create'
-      //         this.FormLoading = false
-      //         if (response.code === '200') {
-      //           this.$notify({
-      //             title: '提示',
-      //             message: '添加成功',
-      //             type: 'success',
-      //             duration: 2000,
-      //           })
-      //           this.$router.push({ path: '/changshang/changshangguanli' })
-      //         } else {
-      //           this.$notify({
-      //             title: '提示',
-      //             message: '添加失败',
-      //             type: 'error',
-      //             duration: 2000,
-      //           })
-      //         }
-      //       })
-      //     }
-      //   })
+    showInfo(sid){
+      this.sid = sid
+      details(sid).then((response) => {
+        if (response.code === "200") {
+          if (response.data.baseManufacturerDto.useOrg) {
+            this.useOrgArry = response.data.baseManufacturerDto.useOrg
+          }
+          if (response.data.baseManufacturerDto) {
+            this.temp = response.data.baseManufacturerDto
+          }
+          if (response.data.baseManufacturerFinanceDto) {
+            this.temp1 = response.data.baseManufacturerFinanceDto
+          }
+          if (response.data.baseManufacturerBankDto) {
+            this.temp2 = response.data.baseManufacturerBankDto
+          }
+        }
+      })
     },
     // 打开修改
     handleCheck() {
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 9b257c67b8..c74eff4dc1 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
@@ -366,12 +366,6 @@
                 console.log('返回值:', response)
                 this.FormLoading = false
                 if (response.code === '200') {
-                  this.$notify({
-                    title: '提示',
-                    message: '添加成功',
-                    type: 'success',
-                    duration: 2000
-                  })
                   this.$router.push({
                     path: '/pinpai/pinpaiguanli'
                   })
@@ -399,19 +393,13 @@
                 console.log('返回值:', response)
                 this.FormLoading = false
                 if (response.code === '200') {
-                  this.$notify({
-                    title: '提示',
-                    message: '添加成功',
-                    type: 'success',
-                    duration: 2000
-                  })
                   this.$router.push({
                     path: '/pinpai/pinpaiguanli'
                   })
                 } else {
                   this.$notify({
                     title: '提示',
-                    message: '添加失败',
+                    message: '修改失败',
                     type: 'error',
                     duration: 2000
                   })