纸品账期价格

4 years ago · 02b68e742e
11 changed files with 101 additions and 64 deletions
--- a/App.vue
+++ b/App.vue
@ -46,7 +46,9 @@ export default {
  },
  onShow: function () {
    // 先默认进入应用就清除所有消息
+    // #ifdef APP-PLUS
    plus.runtime.setBadgeNumber(0)
+    // #endif
  },
  data() {
    return {
--- a/apis/clientCreditApi.js
+++ b/apis/clientCreditApi.js
@ -41,6 +41,17 @@ export function makeFsCreditInfo(data) {
  })
 }

+/**
+ * 获取账期类型列表
+ * @param {*} data
+ */
+export function getCreditType(data) {
+  return http.get({
+    url: '/yyt-uec/credit/get/monthly/invoicing/period/type',
+    data
+  })
+}
+
 /**
 * 获取飞算授信客户列表
 * @param {*} data
--- a/enums/index.js
+++ b/enums/index.js
@ -57,32 +57,29 @@ export const uploadUrl = {
  file: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/file`
 }
 /**
- * 结算周期：1：月结30（飞算1期），2：月结45，3：月结60（飞算2期），4：月结75，5：月结90（飞算3期）
+ * 结算周期：2：月结30 4：月结69
 */
 export const settlementPeriodEnum = [
-  {
-    value: 1,
-    label: '月结30'
-  },
  {
    value: 2,
-    label: '月结45'
-  },
-  {
-    value: 3,
-    label: '月结60'
+    label: '月结30'
  },
  {
    value: 4,
-    label: '月结75'
-  },
-  {
-    value: 5,
-    label: '月结90'
+    label: '月结60'
  }
 ]
+
 /**
- * 结算周期：1：1期，2：2期，3：3期
+ * 授信方式 0:飞算 1:月结
+ */
+export const creditTypeEnum = {
+  MONTHLY_PAYMENT: 1,
+  FS_PAYMENT: 0
+}
+
+/**
+ * 结算周期：1：1期，3：2期，5：3期
 */
 export const fsSettlementPeriodEnum = [
  {
@ -90,11 +87,11 @@ export const fsSettlementPeriodEnum = [
    label: '1期'
  },
  {
-    value: 2,
+    value: 3,
    label: '2期'
  },
  {
-    value: 3,
+    value: 5,
    label: '3期'
  }
 ]
--- a/env/index.js
+++ b/env/index.js
@ -1,8 +1,8 @@
 /**
 * @description 唯一环境变量
 */
-// const env = 'test'
+const env = 'test'
 // const env = 'dev'
-const env = 'production'
+// const env = 'production'

 export default env
--- a/pages/add-paper/index.vue
+++ b/pages/add-paper/index.vue
@ -86,7 +86,7 @@
        <view><uni-data-checkbox v-model="form.isMainProductRep" :localdata="range"></uni-data-checkbox></view>
      </view>
    </view>
-    <uGap></uGap>
+    <u-gap></u-gap>
    <view class="paper-price">
      <view class="paper-price-main">
        <text class="paper-price-title">纸品售价</text>
@ -153,6 +153,40 @@
            <view class="paper-price-title text-left">元/{{ item.stockUnit === 1 ? '张' : '吨' }}</view>
          </view>
        </view>
+        <view class="paper-price-item">
+          <view class="label">
+            <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
+            <text class="label_text">三十天账期单价：</text>
+          </view>
+          <view class="label_value flex">
+            <qn-easyinput
+              type="digit"
+              :styles="{ disableColor: '#F7F8FA', borderBottom: '1px solid red' }"
+              v-model="item.thirtyPeriodUnitPrice"
+              :inputBorder="false"
+              text="right"
+              placeholder="请输入现款单价"
+            ></qn-easyinput>
+            <view class="paper-price-title text-left">元/{{ item.stockUnit === 1 ? '张' : '吨' }}</view>
+          </view>
+        </view>
+        <view class="paper-price-item">
+          <view class="label">
+            <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
+            <text class="label_text">六十天账期单价：</text>
+          </view>
+          <view class="label_value flex">
+            <qn-easyinput
+              type="digit"
+              :styles="{ disableColor: '#F7F8FA', borderBottom: '1px solid red' }"
+              v-model="item.sixtyPeriodUnitPrice"
+              :inputBorder="false"
+              text="right"
+              placeholder="请输入现款单价"
+            ></qn-easyinput>
+            <view class="paper-price-title text-left">元/{{ item.stockUnit === 1 ? '张' : '吨' }}</view>
+          </view>
+        </view>
        <view class="paper-price-item">
          <view class="label">
            <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
@ -191,7 +225,7 @@
      </view>
      <button type="primary" class="add-Btn" plain="true" @click="addPriceClick()">＋ 新增售价</button>
    </view>
-    <uGap></uGap>
+    <u-gap></u-gap>
    <view class="paper-price">
      <view class="paper-price-image-title"><text class="paper-price-title">纸品图片</text></view>
      <view class="paper-price-image">
@ -207,7 +241,7 @@
        </view>
      </view>
    </view>
-    <uGap></uGap>
+    <u-gap></u-gap>
    <view class="paper-price">
      <view class="paper-price-image-title"><text class="paper-price-title">商品卖点</text></view>
      <view class="paper-price-image">
@ -223,7 +257,7 @@
      </view>
    </view>

-    <uGap></uGap>
+    <u-gap></u-gap>
    <view class="paper-price">
      <view class="paper-price-image-title"><text class="paper-price-title">商品描述</text></view>
      <view class="paper-price-image">
@ -238,7 +272,7 @@
        ></qn-easyinput>
      </view>
    </view>
-    <uGap></uGap>
+    <u-gap></u-gap>
    <view class="paper-price">
      <view class="paper-price-image-title"><text class="paper-price-title">送货说明</text></view>
      <view class="paper-price-image">
@ -253,7 +287,7 @@
        ></qn-easyinput>
      </view>
    </view>
-    <uGap></uGap>
+    <u-gap></u-gap>
    <view class="paper-price">
      <view class="paper-price-image-title"><text class="paper-price-title">其他说明</text></view>
      <view class="paper-price-image">
@ -268,14 +302,14 @@
        ></qn-easyinput>
      </view>
    </view>
-    <uGap></uGap>
+    <u-gap></u-gap>
    <view class="upload-btn">
      <view><button type="primary" class="btn-class" plain="true" @click="addPriceClick()">取消</button></view>
      <view><button type="primary" class="btn-class-upload" @click="uploadPrice()">上架出售</button></view>
    </view>
    <uni-popup ref="popup" type="bottom">
      <view class="popup_modal">
-        <slot name="title"><view class="popup_modal-title">可选择已录入公司</view></slot>
+        <slot name="title"><view class="popup_modal-title">可选择库存单位</view></slot>
        <scroll-view scroll-y="true" class="popup_modal-scroll">
          <view @click="selectValue(item)" class="popup_modal-scroll-item" v-for="item in searchList" :key="item.id">{{ item.name }}</view>
        </scroll-view>
@ -294,16 +328,10 @@

 <script>
 import { back, uploadFile, uploadImage } from '@/utils/hook.js'
-import qnEasyinput from '@/components/qn-easyinput/qn-easyinput.vue'
-import uGap from '@/components/u-gap/u-gap.vue'
 import { getCategoryList, createProduct, getSupplierDetail, updateProduct } from '@/apis/add-paper.js'
 const validateFields = ['name', 'isMainProductRep', 'manufacturerName', 'brandName', 'categoryName']
-const validatePriceFields = ['isPromoting', 'listPrice', 'minimum', 'stock', 'stockUnit', 'weight']
+const validatePriceFields = ['isPromoting', 'listPrice', 'minimum', 'stock', 'stockUnit', 'weight', 'thirtyPeriodUnitPrice', 'sixtyPeriodUnitPrice']
 export default {
-  components: {
-    uGap,
-    qnEasyinput
-  },
  data() {
    return {
      title: '添加纸品',
@ -417,7 +445,6 @@ export default {
            }
          }
          this.imgList = res.imgList
-          console.log('this.imgList', this.imgList)
        }
      })
    },
@ -471,13 +498,11 @@ export default {
    },
    // 删除图片
    deleteImage(item) {
-      console.log('deleteImage', item)
      for (let i = 0; i < this.imgList.length; i++) {
        if (this.imgList[i].uuid === item.tempFile.uuid) {
          this.imgList.splice(i, 1)
        }
      }
-      console.log(this.imgList)
    },
    deleteVoucher(index) {
      this.imgList.splice(index, 1)
@ -501,7 +526,7 @@ export default {
      }
      for (let validatePriceField of validatePriceFields) {
        for (let sku of this.skuList) {
-          if (sku[validatePriceField] === null || sku[validatePriceField] === '') {
+          if (sku[validatePriceField] == null || sku[validatePriceField] === '') {
            uni.showToast({
              title: '请完善纸品售价信息',
              icon: 'none'
@ -555,7 +580,6 @@ export default {
      getCategoryList().then((res) => {
        if (res) {
          this.paperList = res
-          console.log(res)
        }
      })
    }
--- a/pages/client-detail/basic-information.vue
+++ b/pages/client-detail/basic-information.vue
@ -11,7 +11,7 @@
            <image class="image" src="/static/imgs/client/client-default.png" mode=""></image>
            <view class="content">
              <view class="title">
-                <text class="text">{{ info.name }}</text>
+                <text class="text" style="max-width: 410rpx">{{ info.name }}</text>
                <image
                  class="icon"
                  :src="info.cooperation == 1 ? '/static/imgs/general/cooperation-icon.png' : '/static/imgs/general/no-cooperation-icon.png'"
--- a/pages/client-list/index.vue
+++ b/pages/client-list/index.vue
@ -18,7 +18,7 @@
    <view class="content">
      <scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback">
        <packingStationItem style="margin-bottom: 20rpx" v-for="item in list" :key="item.enterpriseId" :info="item">
-          <view class="tax-area flex-row-center-center">
+          <view class="tax-area flex-row-center-center" v-if="item.whetherCooperation == 1">
            <view class="tax-button flex-row-center-center" @click="showModal(item)">
              <text class="text">设置税点</text>
            </view>
--- a/pages/fs-credit/index.vue
+++ b/pages/fs-credit/index.vue
@ -28,7 +28,7 @@
        :border="false"
        placeholder="请选择结算周期"
        popup-title="请选择结算周期"
-        :map="{ text: 'label', value: 'value' }"
+        :map="{ text: 'desc', value: 'value' }"
        :clear-icon="false"
        :localdata="fsSettlementPeriodEnum"
      ></qn-data-picker>
@ -48,8 +48,8 @@

 <script>
 import { back, go2 } from '@/utils/hook.js'
-import { fsSettlementPeriodEnum, fsSettlementMethodEnum } from '@/enums/index.js'
-import { makeFsCreditInfo } from '@/apis/clientCreditApi.js'
+import { fsSettlementMethodEnum, creditTypeEnum } from '@/enums/index.js'
+import { makeFsCreditInfo, getCreditType } from '@/apis/clientCreditApi.js'
 export default {
  data() {
    return {
@ -62,7 +62,7 @@ export default {
        settlementMethod: 1,
        mallSupplierId: null
      },
-      fsSettlementPeriodEnum: Object.freeze(fsSettlementPeriodEnum),
+      fsSettlementPeriodEnum: [],
      fsSettlementMethodEnum: Object.freeze(fsSettlementMethodEnum),
      canSubmit: false
    }
@ -104,6 +104,12 @@ export default {
          back()
        }
      })
+    } else {
+      getCreditType({ creditType: creditTypeEnum.FS_PAYMENT }).then((res) => {
+        if (res) {
+          this.fsSettlementPeriodEnum = res
+        }
+      })
    }
  },
  watch: {
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@ -5,7 +5,7 @@
        <image class="bg" src="/static/imgs/mine/mine-top-bg.png"></image>
        <view class="operation-area">
          <view class="user">
-            <image class="avatar" @click="test" :src="curAvatar"></image>
+            <image class="avatar" :src="curAvatar"></image>
            <view v-if="!hasLogin" @click="go2('login')">
              <view>
                <text style="font-size: 40rpx; color: #fff; font-weight: 600">点击登录</text>
@ -133,17 +133,17 @@
          <image class="icon" src="/static/imgs/mine/my-receipt-code.png"></image>
          <text class="label">收款码</text>
        </view>
-        <view
+        <!-- <view
          class="icon-item"
          @click="
            go2('page-view', {
-              url: 'https://open.ys7.com/ezopen/h5/live?autoplay=1&audio=1&accessToken=at.4nv4ymoc4yq53ccu8ush1hjh1j4c37ot-709ap3yupk-0kyskdp-deriddgbs&hd=1&deviceSerial=C03531425&channelNo=1'
+              url: 'http://192.168.12.58:5500/'
            })
          "
        >
          <image class="icon" src="/static/imgs/mine/my-receipt-code.png"></image>
          <text class="label">收款码</text>
-        </view>
+        </view> -->
      </view>
    </view>
  </view>
@ -202,9 +202,6 @@ export default {
  },

  methods: {
-    test() {
-      loginGo2('client')
-    },
    // 企业法大大实名认证
    certifyCompany() {
      if (!this.hasCompany) {
--- a/pages/month-credit/index.vue
+++ b/pages/month-credit/index.vue
@ -18,7 +18,7 @@
        :border="false"
        placeholder="请选择结算周期"
        popup-title="请选择结算周期"
-        :map="{ text: 'label', value: 'value' }"
+        :map="{ text: 'desc', value: 'value' }"
        :clear-icon="false"
        :localdata="settlementPeriodEnum"
      ></qn-data-picker>
@ -35,15 +35,9 @@

 <script>
 import { back, go2 } from '@/utils/hook.js'
-import qnDataPicker from '@/components/qn-data-picker/qn-data-picker.vue'
-import qnEasyinput from '@/components/qn-easyinput/qn-easyinput.vue'
-import { settlementPeriodEnum } from '@/enums/index.js'
-import { makeMonthlyCreditInfo } from '@/apis/clientCreditApi.js'
+import { creditTypeEnum } from '@/enums/index.js'
+import { makeMonthlyCreditInfo, getCreditType } from '@/apis/clientCreditApi.js'
 export default {
-  components: {
-    qnDataPicker,
-    qnEasyinput
-  },
  data() {
    return {
      form: {
@ -51,10 +45,10 @@ export default {
        legalPersonName: null,
        enterpriseName: null,
        creditLine: null,
-        settlementPeriod: 1,
+        settlementPeriod: null,
        mallSupplierId: null
      },
-      settlementPeriodEnum: Object.freeze(settlementPeriodEnum),
+      settlementPeriodEnum: [],
      canSubmit: false
    }
  },
@ -96,6 +90,12 @@ export default {
          back()
        }
      })
+    } else {
+      getCreditType({ creditType: creditTypeEnum.MONTHLY_PAYMENT }).then((res) => {
+        if (res) {
+          this.settlementPeriodEnum = res
+        }
+      })
    }
  },
  watch: {
--- a/static/imgs/.DS_Store
+++ b/static/imgs/.DS_Store