From e9cf551e6a15b7e5c9dad495bcc0fb797058da82 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 10 Oct 2022 09:29:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=95=86=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E5=8E=82=E5=AE=B6=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E9=80=9A=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../changshangguanli/changshangguanliAdd.vue  | 343 +++++++++---------
 .../changshangguanli/changshanglook.vue       | 166 +++------
 .../relation/changshangBankInfo.vue           |  67 ++--
 3 files changed, 252 insertions(+), 324 deletions(-)

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 7d4d100ee5..bd69583aae 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
@@ -50,8 +50,7 @@
             <el-col :span="8">
               <el-form-item prop="supplierType">
                 <el-select v-model="temp.supplierType" class="addinputw" placeholder="" @change="getSupplierType">
-                  <el-option v-for="(item, index) in supplierType_list" :key="index.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
+                  <el-option v-for="item in supplierType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -62,8 +61,7 @@
             </el-col>
             <el-col :span="20">
               <el-form-item prop="manufacturerAddress">
-                <el-input v-model="temp.manufacturerAddress" maxlength="80" placeholder="" class="addinputw addinputw01"
-                          clearable/>
+                <el-input v-model="temp.manufacturerAddress" maxlength="80" placeholder="" class="addinputw addinputw01" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -73,8 +71,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item prop="manufacturerTelePhone">
-                <el-input v-model="temp.manufacturerTelePhone" maxlength="20" placeholder="例:010-88888888" class="addinputw"
-                          clearable/>
+                <el-input v-model="temp.manufacturerTelePhone" maxlength="20" placeholder="例:010-88888888" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="4">
@@ -332,6 +329,7 @@
             <el-table-column prop="swiftCode" width="200px" label="swiftcode(银行代码)" align="center"/>
             <el-table-column prop="currency" width="130px" label="币种" align="center"/>
             <el-table-column prop="remarks" width="240px" label="描述" align="center"/>
+            <el-table-column prop="actualPay" width="240px" label="厂家销售通路" align="center"/>
           </el-table>
         </el-form>
       </div>
@@ -449,33 +447,33 @@
 </template>
 
 <script>
-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";
-import {getListOrg} from "@/api/jichuxinxi/brandManagement";
-import changshangBankInfo from "@/views/changshang/changshangguanli/relation/changshangBankInfo";
+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'
+import { getListOrg } from '@/api/jichuxinxi/brandManagement'
+import changshangBankInfo from '@/views/changshang/changshangguanli/relation/changshangBankInfo'
 
 export default {
-  name: "ChangshangguanliAdd1",
+  name: 'ChangshangguanliAdd1',
   components: {
     changshangBankInfo
   },
   data() {
     var checkEamil = (rule, value, callback) => {
-      const regEamil = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/;
+      const regEamil = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
       if (regEamil.test(value)) {
-        return callback();
+        return callback()
       }
-      callback(new Error("请输入邮箱"));
-    };
+      callback(new Error('请输入邮箱'))
+    }
     var validCascader = (rule, value, callback) => {
       if (this.useOrgValue.length == 0) {
         callback(new Error('请填写使用组织'))
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     // var validatePass2 = (rule, value, callback) => {
     //   const WeiXin = /^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/;
     //   const phone = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
@@ -485,63 +483,63 @@ export default {
     //   callback(new Error("请输入微信号"));
     // };
     var validatePass2 = (rule, value, callback) => {
-      const WeiXin = /^[a-zA-Z][a-zA-Z\d_-]{5,19}$/;
-      const phone = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      const WeiXin = /^[a-zA-Z][a-zA-Z\d_-]{5,19}$/
+      const phone = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
       if (value) {
         // 如果没有通过验证！！
         if (!WeiXin.test(value) && !phone.test(value)) {
-          callback(new Error("请输入正确的微信号码"));
+          callback(new Error('请输入正确的微信号码'))
         }
-        callback();
+        callback()
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     var checkYouBian = (rule, value, callback) => {
-      const YouBian = /^[0-9]{6}$/;
+      const YouBian = /^[0-9]{6}$/
       if (YouBian.test(value)) {
-        return callback();
+        return callback()
       }
-      callback(new Error("请输入邮编"));
-    };
+      callback(new Error('请输入邮编'))
+    }
     var checkBanGongDianHua = (rule, value, callback) => {
-      const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/;
+      const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/
       if (BanGongDianHua.test(value)) {
-        return callback();
+        return callback()
       }
-      callback(new Error("请输入办公电话"));
-    };
+      callback(new Error('请输入办公电话'))
+    }
     var checkContenTel = (rule, value, callback) => {
-      const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/;
+      const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/
       if (value) {
         // 如果没有通过验证！！
         if (!BanGongDianHua.test(value)) {
-          callback(new Error("请输入正确的办公电话格式"));
+          callback(new Error('请输入正确的办公电话格式'))
         }
-        callback();
+        callback()
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     var checkChuanzhen = (rule, value, callback) => {
-      const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/;
+      const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/
       if (value) {
         // 如果没有通过验证！！
         if (!BanGongDianHua.test(value)) {
-          callback(new Error("请输入正确的传真格式"));
+          callback(new Error('请输入正确的传真格式'))
         }
-        callback();
+        callback()
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     var checkSubmit = (rule, value, callback) => {
-      const Submit = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      const Submit = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
       if (Submit.test(value)) {
-        return callback();
+        return callback()
       }
-      callback(new Error("请输入手机号"));
-    };
+      callback(new Error('请输入手机号'))
+    }
     return {
       // --按钮菜单-------
       menuState: {
@@ -578,7 +576,7 @@ export default {
       },
       temp1: {
         settlementCurrency: '',
-        settlementCurrencyValue: '',
+        settlementCurrencyValue: ''
       },
       temp2: {},// 添加和修改
       list: [],
@@ -588,8 +586,8 @@ export default {
       settlementCurrency: 'settlementCurrency',
       templook: {}, // 查看实体
       textMap: {
-        update: "修改",
-        create: "新增"
+        update: '修改',
+        create: '新增'
       },
       modelValue: [],
       modelValue2: [],
@@ -597,25 +595,25 @@ export default {
       modelValue4: [],
       stateId: 0,
       infoe: 3,
-      lookid: "",
+      lookid: '',
       dialogFormVisible: false, // 添加修改对话框状态
       dialogFormShowVisible: false, // 查看对话框默认关闭状态
-      dialogStatus: "", // 对话框状态
+      dialogStatus: '', // 对话框状态
       options: [],
       props: {
-        value: "sid",
-        label: "name",
-        children: "children",
+        value: 'sid',
+        label: 'name',
+        children: 'children',
         multiple: true
       },
       deCode: [],
       fenzuOptions: [{
-        value: "1",
-        label: "单位"
+        value: '1',
+        label: '单位'
       },
         {
-          value: "2",
-          label: "个人"
+          value: '2',
+          label: '个人'
         }
       ],
       useOrgArry: [],
@@ -623,15 +621,15 @@ export default {
       inputCityList: [],
       inputCountyList: [],
       countId: 0,
-      supplierType: "supplierType",
-      supplierGroup: "supplierGroup",
-      supplyType: "supplyType",
-      industrytype: "industrytype",
+      supplierType: 'supplierType',
+      supplierGroup: 'supplierGroup',
+      supplyType: 'supplyType',
+      industrytype: 'industrytype',
       typeOptions: [],
       industryons: [],
       supplier: [],
       grouping: [],
-      supplierType_list:[], //分类
+      supplierType_list: [], // 分类
       rules: {
         // email: [{
         //   required: true,
@@ -697,15 +695,13 @@ export default {
         useOrgValue: [{
           required: true,
           validator: validCascader,
-          trigger: "change"
+          trigger: 'change'
         }]
       },
       tempDate: {}
     }
   },
-  computed: {
-
-  },
+  computed: {},
   created() {
     // this.tempDate.sid = this.$route.params.id;
     // console.log("查看传过来的sid", this.tempDate.sid);
@@ -719,9 +715,9 @@ export default {
   methods: {
     // 输入数字正则
     oninput(val, limit = 0) {
-      val = val.replace(/[^\d.]/g, ""); //保留数字
-      val = val.replace(/\.{2,}/g, "."); //两个以上的小数点转换成一个
-      val = val.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); //只保留一个小数点
+      val = val.replace(/[^\d.]/g, '') // 保留数字
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点
       const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
       const reg = new RegExp(str)
       if (limit === 0) {
@@ -734,62 +730,45 @@ export default {
       return val
     },
     setDetaList() {
-      typeValues({
-        type: this.supplierType
-      }).then((res) => {
-        if (res.code === "200") {
-          this.supplier = res.data;
+      typeValues({ type: this.supplierType }).then((res) => {
+        if (res.code === '200') {
+          this.supplier = res.data
         }
-      });
-      typeValues({
-        type: this.supplierGroup
-      }).then((res) => {
-        if (res.code === "200") {
-          this.grouping = res.data;
+      })
+      typeValues({ type: this.supplierGroup }).then((res) => {
+        if (res.code === '200') {
+          this.grouping = res.data
         }
-      });
-      typeValues({
-        type: this.supplyType
-      }).then((res) => {
-        if (res.code === "200") {
-          this.typeOptions = res.data;
+      })
+      typeValues({ type: this.supplyType }).then((res) => {
+        if (res.code === '200') {
+          this.typeOptions = res.data
         }
-      });
-      typeValues({
-        type: this.industrytype
-      }).then((res) => {
-        if (res.code === "200") {
-          this.industryons = res.data;
+      })
+      typeValues({ type: this.industrytype }).then((res) => {
+        if (res.code === '200') {
+          this.industryons = res.data
         }
-      });
-
-      typeValues({
-        type: this.settlementCurrency
-      }).then((res) => {
+      })
+      typeValues({ type: this.settlementCurrency }).then((res) => {
         if (res.code === '200') {
           this.Currency = res.data
           console.log('结算币种', this.Currency)
         }
       })
-      typeValues({
-        type: this.settlementWay
-      }).then((res) => {
+      typeValues({ type: this.settlementWay }).then((res) => {
         if (res.code === '200') {
           this.tWay = res.data
           console.log('结算方式', this.tWay)
         }
       })
-      typeValues({
-        type: 'supplierType'
-      }).then((res) => {
+      typeValues({ type: 'supplierType' }).then((res) => {
         if (res.code === '200') {
           this.supplierType_list = res.data
           console.log('厂商分类', this.supplierType_list)
         }
       })
-      typeValues({
-        type: this.taxClassification
-      }).then((res) => {
+      typeValues({ type: this.taxClassification }).then((res) => {
         if (res.code === '200') {
           this.fication = res.data
           console.log('税分类', this.fication)
@@ -797,10 +776,10 @@ export default {
       })
     },
     // 厂商分类
-    getSupplierType(value){
+    getSupplierType(value) {
       let bb = null
       this.supplierType_list.forEach((e) => {
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             name: e.dictValue,
             vaule: e.dictKey
@@ -808,13 +787,13 @@ export default {
         }
       })
       this.temp.supplierTypeValue = bb.name
-      console.log('厂商分类',this.temp.supplierTypeValue,this.temp.supplierType)
+      console.log('厂商分类', this.temp.supplierTypeValue, this.temp.supplierType)
     },
     // 结算币种
     getBiZhong(value) {
       let bb = null
       this.Currency.forEach((e) => {
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: 'settlementCurrency',
             name: e.dictValue,
@@ -827,7 +806,7 @@ export default {
     getFangShi(value) {
       let bb = null
       this.tWay.forEach((e) => {
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: 'settlementWay',
             name: e.dictValue,
@@ -840,7 +819,7 @@ export default {
     getShuiFenLei(value) {
       let bb = null
       this.fication.forEach((e) => {
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: 'taxClassification',
             name: e.dictValue,
@@ -922,7 +901,9 @@ export default {
           paymentLines: info.paymentLines,
           swiftCode: info.swiftCode,
           currency: info.currency,
-          remarks: info.remarks
+          remarks: info.remarks,
+          actualPay: info.actualPay,
+          actualPayKey: info.actualPayKey
         })
         console.log('ADD开户行info', info, index)
         return
@@ -941,7 +922,9 @@ export default {
           paymentLines: info.paymentLines,
           swiftCode: info.swiftCode,
           currency: info.currency,
-          remarks: info.remarks
+          remarks: info.remarks,
+          actualPay: info.actualPay,
+          actualPayKey: info.actualPayKey
         }
         return
       }
@@ -966,25 +949,25 @@ export default {
       this.viewTitle = '新增厂商详细信息'
       this.stateId = 0
       this.setDetaList()
-      this.getZuZhi();
+      this.getZuZhi()
       this.huoquSheng()
       this.getListOrgAll()
       // this.getPathSid()
     },
 
     init() {
-      this.countId = this.$store.state.counter;
+      this.countId = this.$store.state.counter
       // ----------------------------------------------------------
-      this.stateId = this.$route.params.id;
+      this.stateId = this.$route.params.id
       // ----------------------------------------------------------
-      var Xiusid = getXiu();
-      this.manufacturerSid = Xiusid[0];
+      var Xiusid = getXiu()
+      this.manufacturerSid = Xiusid[0]
       // ----------------------------------------------------------
       // 修改回显
-      var sid=this.$route.query.sid;
+      var sid = this.$route.query.sid
       if (this.countId != 0 && this.countId != 3) {
         details(this.manufacturerSid).then((response) => {
-          if (response.code === "200") {
+          if (response.code === '200') {
             if (response.data.baseManufacturerDto.useOrg) {
               this.useOrgArry = response.data.baseManufacturerDto.useOrg
             }
@@ -992,16 +975,16 @@ export default {
             this.temp1 = response.data.baseManufacturerFinanceDto
             this.temp2 = response.data.baseManufacturerBankDto
             if (this.temp.useOrg.search(',') == '-1') {
-              this.useOrgValue = this.temp.useOrg.split(" ")
+              this.useOrgValue = this.temp.useOrg.split(' ')
             } else {
-              this.useOrgValue = this.temp.useOrg.split(",")
+              this.useOrgValue = this.temp.useOrg.split(',')
             }
           }
         })
-      }else if(typeof(sid) != "undefined"){
-        this.countId=0
+      } else if (typeof (sid) != 'undefined') {
+        this.countId = 0
         details(sid).then((response) => {
-          if (response.code === "200") {
+          if (response.code === '200') {
             if (response.data.baseManufacturerDto.useOrg) {
               this.useOrgArry = response.data.baseManufacturerDto.useOrg
             }
@@ -1013,11 +996,11 @@ export default {
       }
       // ----------------------------------------------------------
       // 查看回显
-      var Chasid = getLook();
-      this.lookid = Chasid;
+      var Chasid = getLook()
+      this.lookid = Chasid
       if (this.countId === 3) {
         details(this.lookid).then((response) => {
-          if (response.code === "200") {
+          if (response.code === '200') {
             if (response.data.baseManufacturerDto.useOrg) {
               this.useOrgArry = response.data.baseManufacturerDto.useOrg
             }
@@ -1026,14 +1009,14 @@ export default {
             this.temp2 = response.data.baseManufacturerBankDto
           } else {
             this.$notify({
-              title: "失败",
-              message: "查询失败",
-              type: "error"
+              title: '失败',
+              message: '查询失败',
+              type: 'error'
             })
           }
         })
       }
-        this.setDetaList()
+      this.setDetaList()
     },
     // ----------------------------------方法--------------------
     huoquSheng() {
@@ -1041,7 +1024,6 @@ export default {
         if (res.code === '200') {
           this.inputProvinceList = res.data
         }
-
       })
     },
     getShen(value) {
@@ -1117,7 +1099,7 @@ export default {
       this.sid = sid
       this.stateId = 1
       details(sid).then((response) => {
-        if (response.code === "200") {
+        if (response.code === '200') {
           if (response.data.baseManufacturerDto.useOrg) {
             this.useOrgArry = response.data.baseManufacturerDto.useOrg
           }
@@ -1133,7 +1115,7 @@ export default {
         }
       })
       this.setDetaList()
-      this.getZuZhi();
+      this.getZuZhi()
       this.huoquSheng()
       this.getListOrgAll()
       // this.getPathSid()
@@ -1188,7 +1170,7 @@ export default {
     // 组织
     getZuZhi() {
       selectListOrg().then((res) => {
-        if (res.code === "200") {
+        if (res.code === '200') {
           this.options = res.data
           this.zuzhi0(this.options)
         }
@@ -1210,15 +1192,15 @@ export default {
     // 添加前数据初始化
     resetTemp() {
       this.temp = {
-        useOrg: ""
+        useOrg: ''
       }
     },
     // 添加数据
     handleCreate() {
-      this.$refs["dataForm"].validate((valid) => {
+      this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.FormLoading = true;
-          this.dialogStatus = "create";
+          this.FormLoading = true
+          this.dialogStatus = 'create'
           if (this.stateId == 0) {
             // if (this.useOrgArry) {
             //   var abc = []
@@ -1230,27 +1212,27 @@ export default {
             var Codese = this.deCode.join(',')
             this.temp.orgAddress = Codese
             var data = {
-              "baseManufacturerDto": this.temp,
-              "baseManufacturerFinanceDto": this.temp1,
-              "baseManufacturerBankDto": this.list
-            };
+              'baseManufacturerDto': this.temp,
+              'baseManufacturerFinanceDto': this.temp1,
+              'baseManufacturerBankDto': this.list
+            }
             SaveList(data).then((response) => {
-              this.FormLoading = false;
-              if (response.code === "200") {
-                setuser(response.data);
-                var jisid = response.data;
+              this.FormLoading = false
+              if (response.code === '200') {
+                setuser(response.data)
+                var jisid = response.data
                 this.$notify({
-                  title: "提示",
-                  message: "添加成功",
-                  type: "success",
+                  title: '提示',
+                  message: '添加成功',
+                  type: 'success',
                   duration: 2000
                 })
                 this.handleReturn('true')
               } else {
                 this.$notify({
-                  title: "提示",
-                  message: "添加失败",
-                  type: "error",
+                  title: '提示',
+                  message: '添加失败',
+                  type: 'error',
                   duration: 2000
                 })
               }
@@ -1264,33 +1246,33 @@ export default {
             //   this.temp.useOrg = abc.toString()
             // }
             var data = {
-              "sid": this.sid,
-              "baseManufacturerDto": this.temp,
-              "baseManufacturerFinanceDto": this.temp1,
-              "baseManufacturerBankDto": this.list
-            };
+              'sid': this.sid,
+              'baseManufacturerDto': this.temp,
+              'baseManufacturerFinanceDto': this.temp1,
+              'baseManufacturerBankDto': this.list
+            }
             Update(data).then((response) => {
-              this.dialogStatus = "update";
-              this.FormLoading = false;
-              if (response.code === "200") {
+              this.dialogStatus = 'update'
+              this.FormLoading = false
+              if (response.code === '200') {
                 this.$notify({
-                  title: "提示",
-                  message: "修改成功",
-                  type: "success",
+                  title: '提示',
+                  message: '修改成功',
+                  type: 'success',
                   duration: 2000
                 })
                 this.handleReturn('true')
               } else {
                 this.$notify({
-                  title: "失败",
-                  message: "修改失败",
-                  type: "error"
+                  title: '失败',
+                  message: '修改失败',
+                  type: 'error'
                 })
               }
             })
           }
         }
-      });
+      })
     },
     handleSubmit() {
 
@@ -1298,7 +1280,7 @@ export default {
     getHangYe(value) {
       let bb = null
       this.industryons.forEach((e) => {
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: 'industry',
             name: e.dictValue,
@@ -1311,7 +1293,7 @@ export default {
     getGong(value) {
       let bb = null
       this.supplier.forEach((e) => {
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: 'supplierType',
             name: e.dictValue,
@@ -1324,7 +1306,7 @@ export default {
     getFen(value) {
       let bb = null
       this.typeOptions.forEach((e) => {
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: 'supplyType',
             name: e.dictValue,
@@ -1337,7 +1319,7 @@ export default {
     getShang(value) {
       let bb = null
       this.grouping.forEach((e) => {
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: 'supplierGroup',
             name: e.dictValue,
@@ -1347,17 +1329,19 @@ export default {
       })
       this.temp.supplierGroupValue = bb.name
     }
-  },
-};
+  }
+}
 </script>
 <style scoped>
 .filter-item_province, .filter-item {
   width: 27%;
   padding-right: 10px;
 }
-.addinputw01{
+
+.addinputw01 {
   width: 92% !important;
 }
+
 /deep/ .el-col-3 {
   text-align: right;
   float: left;
@@ -1365,6 +1349,7 @@ export default {
   line-height: 42px !important;
   /*font-weight: 600;*/
 }
+
 /deep/ .el-col-4 {
   text-align: right;
   float: left;
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 0146daf2b5..a48332a1b0 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
@@ -3,11 +3,10 @@
     <div class="tab-header webtop">
       <div>厂商管理详情</div>
       <div>
-        <!-- <el-button type="primary" size="small" @click="dialogStatus==='create'?handleCreate():updateData()">保存</el-button> -->
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>
-    <div  class="listconadd">
+    <div class="listconadd">
       <el-form ref="dataForm" :title="textMap[dialogStatus]" :model="temp" class="formadd" :rules="rules">
         <div class="title">基本信息</div>
         <el-row>
@@ -15,8 +14,8 @@
             <span>厂商名称</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="manufacturerName">
-              <span>{{temp.manufacturerName}}</span>
+            <el-form-item>
+              <span>{{ temp.manufacturerName }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -24,7 +23,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{temp.manufacturerAs}}</span>
+              <span>{{ temp.manufacturerAs }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -34,15 +33,15 @@
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{temp.manufacturerCode}}</span>
+              <span>{{ temp.manufacturerCode }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
             <span>分类</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="supplierTypeValue">
-              <span>{{temp.supplierTypeValue}}</span>
+            <el-form-item>
+              <span>{{ temp.supplierTypeValue }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -51,8 +50,8 @@
             <span>通讯地址</span>
           </el-col>
           <el-col :span="21">
-            <el-form-item prop="manufacturerAddress">
-              <span>{{temp.manufacturerAddress}}</span>
+            <el-form-item>
+              <span>{{ temp.manufacturerAddress }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -61,16 +60,16 @@
             <span>厂商办公电话</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="manufacturerTelePhone">
-              <span>{{temp.manufacturerTelePhone}}</span>
+            <el-form-item>
+              <span>{{ temp.manufacturerTelePhone }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
             <span>传真</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="manufacturerFax">
-              <span>{{temp.manufacturerFax}}</span>
+            <el-form-item>
+              <span>{{ temp.manufacturerFax }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,16 +78,16 @@
             <span>联系人姓名</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="contactName">
-              <span>{{temp.contactName}}</span>
+            <el-form-item>
+              <span>{{ temp.contactName }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
             <span>联系人手机号</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="contactMobile">
-              <span>{{temp.contactMobile}}</span>
+            <el-form-item>
+              <span>{{ temp.contactMobile }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -97,16 +96,16 @@
             <span>联系人办公电话</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="contactTelePhone">
-              <span>{{temp.contactTelePhone}}</span>
+            <el-form-item>
+              <span>{{ temp.contactTelePhone }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
             <span>微信号</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="weChatID">
-              <span>{{temp.weChatID}}</span>
+            <el-form-item>
+              <span>{{ temp.weChatID }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -115,16 +114,16 @@
             <span>邮编</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="">
-              <span>{{temp.zipCode}}</span>
+            <el-form-item>
+              <span>{{ temp.zipCode }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
             <span>邮箱</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="">
-              <span>{{temp.email}}</span>
+            <el-form-item>
+              <span>{{ temp.email }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -311,6 +310,7 @@
           <el-table-column prop="swiftCode" width="200px" label="swiftcode(银行代码)" align="center"/>
           <el-table-column prop="currency" width="130px" label="币种" align="center"/>
           <el-table-column prop="remarks" width="240px" label="描述" align="center"/>
+          <el-table-column prop="actualPay" width="240px" label="厂家销售通路" align="center"/>
         </el-table>
       </el-form>
     </div>
@@ -318,14 +318,13 @@
 </template>
 
 <script>
-import changshang from "../changshang.vue";
-import {mapGetters} from "vuex";
-import {details} from "@/api/jichuxinxi/basemanufacturer";
+import changshang from '../changshang.vue'
+import { details } from '@/api/jichuxinxi/basemanufacturer'
 // import { getFileType, parseDate, parseTime, ConvertMenuState } from "@/utils";
 // import { findButtonByUserId } from '@/api/sys/permission'
 export default {
-  name: "ChangshangguanliAdd",
-  components: {changshang},
+  name: 'ChangshangguanliAdd',
+  components: { changshang },
   data() {
     return {
       // --按钮菜单-------
@@ -338,92 +337,34 @@ export default {
         input: false, // 导入
         output: false, // 导出
         upload: false, // 同步
-        release: false, // 下发
+        release: false // 下发
       },
       FormLoading: false,
       listLoading: false,
-      templook: {}, // 查看实体
       textMap: {
-        update: "修改",
-        create: "创建",
+        update: '修改',
+        create: '创建'
       },
       tableKey: 0,
       index: 0,
-      list:[],
-      temp:{},
-      temp1:{},
-      temp2:{},
-      dialogFormVisible: false, // 添加修改对话框状态
-      dialogFormShowVisible: false, // 查看对话框默认关闭状态
-      dialogStatus: "", // 对话框状态
-      fenzuOptions: [
-        { value: "1", label: "单位" },
-        { value: "2", label: "个人" },
-      ],
-      rules: {
-        manufacturerName: [
-          { required: true, message: "请填写厂商名称", trigger: "blur" },
-        ],
-        manufacturerAddress: [
-          { required: true, message: "请填写厂商通讯地址", trigger: "blur" },
-        ],
-        manufacturerTelePhone: [
-          { required: true, message: "请填写厂商办公电话", trigger: "blur" },
-        ],
-        contactName: [
-          { required: true, message: "请填写联系人名字", trigger: "blur" },
-        ],
-        contactMobile: [
-          { required: true, message: "请填写联系人手机号", trigger: "blur" },
-        ],
-        supplyType: [
-          { required: true, message: "请填写供应类别", trigger: "blur" },
-        ],
-        createOrg: [
-          { required: true, message: "请填写创建组织", trigger: "blur" },
-        ],
-        useOrg: [
-          { required: true, message: "请填写使用组织", trigger: "blur" },
-        ],
-      },
-      tempDate: {},
-      // ------------------------------------
-    };
-  },
-  computed: {
-    ...mapGetters([
-      "id",
-      "roles",
-      "rolesIds",
-      "departmentId",
-      "departmentCode",
-    ]),
-  },
-  created() {
-
+      list: [],
+      temp: {},
+      temp1: {},
+      temp2: {},
+      dialogStatus: '', // 对话框状态
+      rules: {}
+    }
   },
   methods: {
-    init() {},
     // ----------------------------------方法--------------------
     // 返回
     handleReturn() {
       this.$emit('doback')
     },
-    // 添加前数据初始化
-    resetTemp() {
-      this.temp = {
-        jc: "", //			false	string
-        organizationId: "", //			false	string
-        qc: "", //			false	string
-        remark: "", //			false
-        string: "", //
-        state: "", //	状态
-      };
-    },
-    showInfo(sid){
+    showInfo(sid) {
       this.sid = sid
       details(sid).then((response) => {
-        if (response.code === "200") {
+        if (response.code === '200') {
           if (response.data.baseManufacturerDto.useOrg) {
             this.useOrgArry = response.data.baseManufacturerDto.useOrg
           }
@@ -438,26 +379,9 @@ export default {
           }
         }
       })
-    },
-    // 打开修改
-    handleCheck() {
-      this.FormLoading = true;
-      details(this.tempDate.sid).then((response) => {
-        this.FormLoading = false;
-        if (response.code === "200") {
-          this.temp = response.data;
-          console.log("查询1", this.temp);
-        } else {
-          this.$notify({
-            title: "失败",
-            message: "查询失败",
-            type: "error",
-          });
-        }
-      });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style scoped>
 /deep/ .el-col-3 {
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue
index 5d3da1a419..22d15fe3ed 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue
@@ -24,10 +24,9 @@
             <span>账户类型</span>
           </el-col>
           <el-col :span="8">
-            <el-form-item prop="dueBank"> <!--dueBankKey   dueBankValue-->
+            <el-form-item prop="dueBank">
               <el-select v-model="bankInfo.dueBankKey" class="addinputw" placeholder="" @change="receiptBankChange">
-                <el-option v-for="item in receiptBank_list" :key="item.dictKey" :label="item.dictValue"
-                           :value="item.dictKey"/>
+                <el-option v-for="item in receiptBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -46,9 +45,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="bankAccount">
-              <!--@keyup.native="bankInfo.bankAccount = oninput(bankInfo.bankAccount,2)"-->
-              <el-input v-model="bankInfo.bankAccount" maxlength="125" placeholder="" class="addinputw" clearable
-                        onkeyup="value=value.replace(/[^\d]/g,'')"/>
+              <el-input v-model="bankInfo.bankAccount" maxlength="125" placeholder="" class="addinputw" clearable onkeyup="value=value.replace(/[^\d]/g,'')"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -84,8 +81,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="paymentLines">
-              <el-input v-model="bankInfo.paymentLines" maxlength="125" placeholder="" class="addinputw" clearable
-                        onkeyup="value=value.replace(/[^\d]/g,'')"/>
+              <el-input v-model="bankInfo.paymentLines" maxlength="125" placeholder="" class="addinputw" clearable onkeyup="value=value.replace(/[^\d]/g,'')"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -116,7 +112,16 @@
               <el-input v-model="bankInfo.remarks" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="12"/>
+          <el-col :span="4">
+            <span>厂家销售通路</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-select v-model="bankInfo.actualPay" class="addinputw" placeholder="" @change="actualPayChange">
+                <el-option v-for="item in actualPay_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </div>
@@ -125,16 +130,17 @@
 </template>
 
 <script>
-import {typeValues} from "@/api/jichuxinxi/dictcommons";
+import { typeValues } from '@/api/jichuxinxi/dictcommons'
 
 export default {
-  name: "changshangBankInfo",
+  name: 'changshangBankInfo',
   data() {
     return {
       bankInfo_index: '',
       viewState: '',
       dialogStatus: '',
       receiptBank_list: [],
+      actualPay_list: [],
       bankInfo: {
         country: '中国',
         dueBankValue: '',
@@ -147,31 +153,41 @@ export default {
         swiftCode: '',
         currency: '人民币',
         remarks: '',
+        actualPay: '',
+        actualPayKey: ''
       },
       rules: {
         manufacturerName: [{
           required: true,
           message: '请填写厂商名称',
           trigger: 'blur'
-        }],
-      },
+        }]
+      }
     }
   },
   methods: {
     getType() { //
-      typeValues({
-        type: 'dueBank'
-      }).then((res) => {
+      typeValues({ type: 'dueBank' }).then((res) => {
         if (res.success) {
           this.receiptBank_list = res.data
         }
       })
+      typeValues({ type: 'sellChannel' }).then((res) => {
+        if (res.success) {
+          this.actualPay_list = res.data
+        }
+      })
     },
     receiptBankChange(val) {
       if (val) {
-        const choosetItem = this.receiptBank_list.filter((item) => item.dictKey == val)
+        const choosetItem = this.receiptBank_list.filter((item) => item.dictKey === val)
         this.bankInfo.dueBankValue = choosetItem[0].dictValue
-        console.log('name:', this.bankInfo.dueBankValue, 'key:', this.bankInfo.dueBankKey)
+      }
+    },
+    actualPayChange(value) {
+      if (value) {
+        const choosetItem = this.actualPay_list.filter((item) => item.dictValue === value)
+        this.bankInfo.actualPayKey = choosetItem[0].dictKey
       }
     },
     showAdd() {
@@ -186,7 +202,9 @@ export default {
         paymentLines: '',
         swiftCode: '',
         currency: '人民币',
-        remarks: ''
+        remarks: '',
+        actualPay: '',
+        actualPayKey: ''
       }
       this.bankInfo_index = ''
       this.dialogStatus = 'add'
@@ -201,7 +219,7 @@ export default {
       this.getType()
     },
     handleCreate() {
-      if (this.dialogStatus == 'add') {
+      if (this.dialogStatus === 'add') {
         if (JSON.stringify(this.bankInfo) !== '{}') {
           this.$emit('handleBankInfo', this.bankInfo, this.bankInfo_index)
         } else {
@@ -209,10 +227,10 @@ export default {
             showClose: true,
             message: '请填写开户行信息！',
             type: 'error'
-          });
+          })
         }
       }
-      if (this.dialogStatus == 'edit') {
+      if (this.dialogStatus === 'edit') {
         this.$emit('handleBankInfo', this.bankInfo, this.bankInfo_index)
       }
     },
@@ -229,11 +247,12 @@ export default {
         paymentLines: '',
         swiftCode: '',
         currency: '人民币',
-        remarks: ''
+        remarks: '',
+        actualPay: ''
       }
       this.bankInfo_index = ''
       this.$emit('doback')
-    },
+    }
   }
 }
 </script>