Browse Source

Merge commit '99b5cd14c5bb79bcdf8dc7a12d97474b79ec5510' into HEAD

gitadmin 3 years ago
parent
commit
3c15e6cddd

+ 13 - 7
src/views/numsGoodsShelves/goodsShelvesAdministration/addGoodsShelve.vue

@@ -43,7 +43,7 @@
             <!-- 状态 -->
             <a-col :span="12">
               <a-form-model-item label="货架归属" prop="ownerType">
-                <a-radio-group name="radioGroup" v-model="form.ownerType" @change="changeRadio" id="addGoodsShelve-changeRadio">
+                <a-radio-group name="radioGroup" v-model="form.ownerType" id="addGoodsShelve-ownerType">
                   <a-radio :value="1">平台</a-radio>
                   <a-radio :value="0">自有</a-radio>
                 </a-radio-group>
@@ -146,10 +146,10 @@ export default {
       this.form.images = file
     },
     // 改变货架归属
-    changeRadio (e) {
-      this.form.ownerType = e.target.value
-      console.log(e.target.value, '=========')
-    },
+    // changeRadio (e) {
+    //   this.form.ownerType = e.target.value
+    //   console.log(e.target.value, '=========')
+    // },
     // 查询货架详情
     getShelfDetail () {
       this.spinning = true
@@ -205,8 +205,14 @@ export default {
     },
     isshow (newValue, oldValue) {
       if (!newValue) {
-        this.form = {}
-        this.form.ownerType = 1
+        this.form = {
+          dealerSn: undefined, // 经销商sn
+          ownerType: 1, // 平台
+          storeSn: undefined, // 汽车修理厂sn
+          shelfName: '', // 货架名称
+          images: '', // 图片
+          remarks: ''// 备注
+        }
         if (!this.nowData) {
           this.$refs.storeList.resetForm()
           this.$refs.dealerList.resetForm()

+ 1 - 1
src/views/numsGoodsShelves/goodsShelvesAdministration/addHWModal.vue

@@ -69,7 +69,7 @@ export default {
         shelfPlaceCode: '' // 货位号
       },
       rules: {
-        shelfPlaceCode: [ { required: true, message: '请输入货位号', trigger: 'blur' }]
+        shelfPlaceCode: [ { required: true, message: '请输入货位号', trigger: 'blur' }, { pattern: '^[^\u4e00-\u9fa5]{0,}$', message: '货位号不支持汉字' }]
       }
     }
   },

+ 4 - 4
src/views/numsGoodsShelves/goodsShelvesAdministration/goodsAllocationSet.vue

@@ -15,8 +15,8 @@
             <a-descriptions size="small" :column="3">
               <a-descriptions-item label="配件经销商">{{ pageInfo&&pageInfo.dealerName?pageInfo.dealerName:'--' }}</a-descriptions-item>
               <a-descriptions-item label="汽车修理厂">{{ pageInfo&&pageInfo.storeName?pageInfo.storeName:'--' }}</a-descriptions-item>
-              <a-descriptions-item label="货架归属">{{ pageInfo&&pageInfo.ownerType==1?'自有':'平台' }}</a-descriptions-item>
-              <a-descriptions-item label="货架图片" v-if="pageInfo&&pageInfo.ownerType==1">
+              <a-descriptions-item label="货架归属">{{ pageInfo&&pageInfo.ownerType==0?'自有':'平台' }}</a-descriptions-item>
+              <a-descriptions-item label="货架图片" v-if="pageInfo&&pageInfo.ownerType==0">
                 <div v-if="pageInfo && pageInfo.images&&pageInfo.images.length>0">
                   <img :src="pageInfo.images[0]|| ''" width="30" height="30" class="imageUrl" @click="inited(pageInfo.images)" /> {{ '共'+pageInfo?pageInfo.images.length+'张':'' }}
                 </div>
@@ -200,7 +200,7 @@ export default {
       if (type == 0) {
         this.openModal = true
       } else {
-        this.itemData=null
+        this.itemData = null
         this.openHWModal = true
       }
     },
@@ -239,7 +239,7 @@ export default {
     handleEdit (row) {
       // this.shelfPlaceSn = row.shelfPlaceSn
       this.shelfSn = row.shelfSn
-      this.itemData=row
+      this.itemData = row
       this.openHWModal = true
     },
     // 货架详情

+ 12 - 11
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue

@@ -15,8 +15,8 @@
             <a-descriptions size="small" :column="3">
               <a-descriptions-item label="配件经销商">{{ pageInfo&&pageInfo.dealerName?pageInfo.dealerName:'--' }}</a-descriptions-item>
               <a-descriptions-item label="汽车修理厂">{{ pageInfo&&pageInfo.storeName?pageInfo.storeName:'--' }}</a-descriptions-item>
-              <a-descriptions-item label="货架归属">{{ pageInfo&&pageInfo.ownerType==1?'自有':'平台' }}</a-descriptions-item>
-              <a-descriptions-item label="货架图片" v-if="pageInfo&&pageInfo.ownerType==1">
+              <a-descriptions-item label="货架归属">{{ pageInfo&&pageInfo.ownerType==1?'平台':'自有' }}</a-descriptions-item>
+              <a-descriptions-item label="货架图片" v-if="pageInfo&&pageInfo.ownerType==0">
                 <div v-if="pageInfo && pageInfo.images&&pageInfo.images.length>0">
                   <img :src="pageInfo.images[0]|| ''" width="30" height="30" class="imageUrl" @click="inited(pageInfo.images)" /> {{ '共'+pageInfo.images.length+'张' }}
                 </div>
@@ -242,10 +242,18 @@ export default {
   methods: {
     handleBack () {
       this.isEdit = false
-      this.form = {}
+      this.form = {
+        settleType: undefined, // 结算方式
+        creditLimit: '', // 授信额度
+        creditWarnLimit: '', // 结算提醒金额
+        settleDay: undefined, // 每月结算日
+        warnBeforeDays: undefined, // 结算提醒提前天数
+        limitFlag: 0, // 是否限制使用
+        bondFlag: '', // 是否缴纳保证金
+        bondAmount: '' // 保证金金额
+      }
       this.$refs.ruleForm.resetFields()
       this.$router.push({ path: '/numsGoodsShelves/goodsShelvesAdministration/list' })
-      // this.$router.go(-1)
     },
     // 查看图片
     inited (viewer) {
@@ -261,7 +269,6 @@ export default {
     },
     changeSettleType (value, option) {
       this.form.settleType = value
-      console.log(value, this.form.settleType, 'this.form.settleType')
     },
     onChange (e) {
       console.log(e.target.checked)
@@ -270,12 +277,10 @@ export default {
       } else {
         this.form.limitFlag = 0
       }
-      console.log(this.form.limitFlag, 'this.form.limitFlag')
     },
     //
     changeRadio (e) {
       console.log(e.target.value, 'e.target.value')
-      // this.isEdit = e.target.value
       this.isEdit = e.target.value == 1
     },
     getbondRecordList () {
@@ -346,10 +351,6 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = Object.assign({}, _this.form)
-          console.log(params, 'params', _this.form)
-          // if (params.limitFlag == '') {
-          //   params.limitFlag = 0
-          // }
           if (this.pageInfo) {
             params.shelfSn = this.pageInfo.shelfSn
             params.storeSn = this.pageInfo.storeSn

+ 4 - 5
src/views/numsGoodsShelves/partsDealerManagement/list.vue

@@ -26,7 +26,6 @@
         ref="table"
         :style="{ height: tableHeight+84.5+'px', wordBreak: 'break-all' }"
         size="small"
-        rowKey="id"
         :columns="columns"
         :data="loadData"
         :scroll="{ y: tableHeight }"
@@ -67,10 +66,10 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '配件经销商(商户名称)', dataIndex: 'dealerEntity.dealerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '联系人', dataIndex: 'dealerEntity.contact', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '联系电话', dataIndex: 'dealerEntity.dealerTelephone', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '合作状态', dataIndex: 'dealerEntity.cooperateFlagDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '配件经销商(商户名称)', dataIndex: 'dealerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '联系人', dataIndex: 'contact', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '联系电话', dataIndex: 'contactMobile', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '合作状态', dataIndex: 'cooperateFlagDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '平台商户号', dataIndex: 'merchantNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', width: '10%', align: 'left', scopedSlots: { customRender: 'action' } }
       ],

+ 5 - 9
src/views/numsGoodsShelves/partsDealerManagement/setSHModal.vue

@@ -20,7 +20,7 @@
           :wrapperCol="{span:16}"
         >
           <a-form-model-item label="配件经销商" >
-            <span>{{ form.dealerEntity?form.dealerEntity.dealerName:'--' }}</span>
+            <span>{{ form.dealerName||'--' }}</span>
           </a-form-model-item>
           <a-form-model-item label="平台商户号" prop="merchantNo" >
             <a-input id="setSHModal-merchantNo" allowClear v-model.trim="form.merchantNo" placeholder="请输入平台商户号"/>
@@ -68,9 +68,7 @@ export default {
       message: '以下结算账户信息需要与进件时填写的资料保持一直否则将无法体现成功',
       pageInfo: null,
       form: {
-        dealerEntity: {
-          dealerName: ''
-        },
+        dealerName: '',
         bankName: '', // 开户行
         bankAccount: '', // 账户名
         bankCard: '', // 账户号
@@ -87,9 +85,7 @@ export default {
   methods: {
     close (e) {
       this.form = {
-        dealerEntity: {
-          dealerName: ''
-        },
+        dealerName: '',
         bankName: '', // 开户行
         bankAccount: '', // 账户名
         bankCard: '', // 账户号
@@ -104,7 +100,7 @@ export default {
       merchantAccountDetail({ merchantSn: this.nowData.merchantSn, merchantType: this.nowData.merchantType }).then(res => {
         if (res.status == 200) {
           this.form.merchantNo = res.data.merchantNo
-          this.form.dealerEntity.dealerName = res.data.dealerEntity.dealerName
+          this.form.dealerName = res.data.dealerName
           this.form.bankName = res.data.merchantBankAccountEntity.bankName
           this.form.bankAccount = res.data.merchantBankAccountEntity.bankAccount
           this.form.bankCard = res.data.merchantBankAccountEntity.bankCard
@@ -127,7 +123,7 @@ export default {
             params.merchantBankAccountEntity.bankName = _this.form.bankName
             params.merchantBankAccountEntity.bankAccount = _this.form.bankAccount
             params.merchantBankAccountEntity.bankCard = _this.form.bankCard
-            params.dealerEntity.dealerName = _this.form.dealerEntity.dealerName
+            // params.dealerEntity.dealerName = _this.form.dealerEntity.dealerName
             params.merchantNo = _this.form.merchantNo
           }
           console.log(params, 'params')