浏览代码

增加提示文字

zhangdan 3 年之前
父节点
当前提交
cab61f239d

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

@@ -109,7 +109,7 @@ export default {
         { title: '汽车修理厂', dataIndex: 'storeName', width: '17%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '货位数量', dataIndex: 'shelfPlaceNum', width: '7%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '结算方式', dataIndex: 'settleTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: <div>货架状态&nbsp;<a-tooltip placement='top' title='货架状态'><a-icon type="question-circle" /></a-tooltip></div>, width: '7%', align: 'center', scopedSlots: { customRender: 'state' } },
+        { title: <div>货架状态&nbsp;<a-tooltip placement='top' title='货架状态包括:未启用、已启用、已暂停、已关闭。货架状态只能按照这个过程向前流转,不能后退'><a-icon type="question-circle" /></a-tooltip></div>, width: '7%', align: 'center', scopedSlots: { customRender: 'state' } },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', width: '15%', align: 'left', scopedSlots: { customRender: 'action' } }
       ],

+ 116 - 49
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue

@@ -71,6 +71,15 @@
                     </v-select>
                   </a-form-model-item>
                 </a-col>
+                <a-col :span="1">
+                  <a-tooltip placement="right">
+                    <template slot="title">
+                      <p>1.授信结算:客户(即汽修厂)在一定授信额度范围内,可从数字货架上取用配件,一旦超过额度,就要进行结算</p>
+                      <p>2.按月结算:客户的结算不是按照授信额度,而是按照自然月,即需要对某个月内取用的配件结算</p>
+                    </template>
+                    <a-icon type="question-circle" style="display: inline-block;margin: 12px 0 0 12px;"/>
+                  </a-tooltip>
+                </a-col>
                 <a-col :span="1"><a-button
                   size="small"
                   type="link"
@@ -93,25 +102,43 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :span="1"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
+                <a-col :span="1">
+                  <a-tooltip placement="right">
+                    <template slot="title">
+                      <p>在授信额度范围内,客户取用数字货架上的配件,无需实时结算</p>
+                    </template>
+                    <a-icon type="question-circle" style="display: inline-block;margin: 12px 0 0 12px;"/>
+                  </a-tooltip>
+                </a-col>
+              </a-row>
+              <a-row v-if="form.settleType=='MONTH'">
+                <a-col :span="15">
+                  <a-form-model-item label="结算日期" prop="settleDay" >
+                    <div style="display: flex;padding: 0;align-items: center;">
+                      <span style="display: inline-block;margin-right: 10px;">每月</span>
+                      <a-select
+                        style="background-color: none;width: 65%;"
+                        placeholder="请选择结算日期"
+                        id="settlementSet-settleDay"
+                        allowClear
+                        v-model="form.settleDay"
+                      >
+                        <a-select-option v-for="item in dateList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+                      </a-select>
+                      <span style="display: inline-block;margin-left: 10px;">号</span>
+                    </div>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :span="1">
+                  <a-tooltip placement="right">
+                    <template slot="title">
+                      <p>比如设置的结算日期是5号,那么客户在每个月的5号,需要支付上个月的待结算款项</p>
+                    </template>
+                    <a-icon type="question-circle" style="display: inline-block;margin: 12px 0 0 12px;"/>
+                  </a-tooltip>
+                </a-col>
               </a-row>
-              <a-col :span="15">
-                <a-form-model-item label="结算日期" prop="settleDay" v-if="form.settleType=='MONTH'">
-                  <div style="display: flex;padding: 0;align-items: center;">
-                    <span style="display: inline-block;margin-right: 10px;">每月</span>
-                    <a-select
-                      style="background-color: none;width: 65%;"
-                      placeholder="请选择结算日期"
-                      id="settlementSet-settleDay"
-                      allowClear
-                      v-model="form.settleDay"
-                    >
-                      <a-select-option v-for="item in dateList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-                    </a-select>
-                    <span style="display: inline-block;margin-left: 10px;">号</span>
-                  </div>
 
-                </a-form-model-item>
-              </a-col>
               <a-row v-if="form.settleType=='CREDIT'">
                 <a-col :span="15">
                   <a-form-model-item label="结算提醒金额" prop="creditWarnLimit" >
@@ -126,39 +153,79 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :span="1"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
+                <a-col :span="1">
+                  <a-tooltip placement="right">
+                    <template slot="title">
+                      <p>比如您给客户的授信额度是2000元,结算提醒金额是1900元,而且客户已经从货架上拿了1900元的配件,以后客户每次使用系统从APP上取用配件时,系统都会提示客户需尽快结算,即超过1900元的部分都会提示。/p>
+                      </p></template>
+                    <a-icon type="question-circle" style="display: inline-block;margin: 12px 0 0 12px;"/>
+                  </a-tooltip>
+                </a-col>
+              </a-row>
+              <a-row v-if="form.settleType=='MONTH'">
+                <a-col :span="15">
+                  <a-form-model-item label="结算提醒" prop="warnBeforeDays" >
+                    <div style="display: flex;padding: 0;align-items: center;">
+                      <span style="display: inline-block;margin-right: 10px;">提前</span>
+                      <a-select
+                        style="background-color: none;width: 65%;"
+                        placeholder="请选择结算提醒日期"
+                        id="settlementSet-warnBeforeDays"
+                        allowClear
+                        v-model="form.warnBeforeDays"
+                      >
+                        <a-select-option v-for="item in dateTXList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+                      </a-select>
+                      <span style="display: inline-block;margin-left: 10px;">天开始提醒</span>
+                    </div>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :span="1">
+                  <a-tooltip placement="right">
+                    <template slot="title">
+                      <p>比如数字货架设置的结算日期是5号,提前3天开始提醒,那么从2号开始,客户每次通过APP从数字货架取用配件时,系统都会提示客户尽快结算。</p>
+                    </template>
+                    <a-icon type="question-circle" style="display: inline-block;margin: 12px 0 0 12px;"/>
+                  </a-tooltip>
+                </a-col>
+              </a-row>
+
+              <a-row v-if="form.settleType">
+                <a-col :span="15" >
+                  <a-form-model-item :label="form.settleType=='CREDIT'?'超过授信额度':'超期未结算'">
+                    <a-checkbox @change="onChange" id="settlementSet-limitFlag" :checked="form.limitFlag==1">
+                      限制汽车修理厂无法使用数字货架
+                    </a-checkbox>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :span="1">
+                  <a-tooltip placement="right">
+                    <template slot="title">
+                      <p v-if="form.settleType=='CREDIT'">如果客户已经超过授信额度,但仍然没有结算,那么是否允许客户继续通过APP在数字货架上拿取配件。如果勾选上,则表示不允许。</p>
+                      <p v-else>如果客户已经超过结算日期,但仍然没有结算,那么是否允许客户继续通过APP在数字货架上拿取配件。如果勾选上,则表示不允许。</p>
+                    </template>
+                    <a-icon type="question-circle" style="display: inline-block;margin: 12px 0 0 12px;"/>
+                  </a-tooltip>
+                </a-col>
+              </a-row>
+              <a-row v-if="pageInfo&&!pageInfo.settleType &&form.settleType ">
+                <a-col :span="15" >
+                  <a-form-model-item label="是否需要缴纳保证金" prop="bondFlag" >
+                    <a-radio-group name="radioGroup" v-model="form.bondFlag" @change="changeRadio" id="settlementSet-bondFlag">
+                      <a-radio :value="1">是</a-radio>
+                      <a-radio :value="0">否</a-radio>
+                    </a-radio-group>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :span="1">
+                  <a-tooltip placement="right">
+                    <template slot="title">
+                      <p>如果客户需要缴纳保证金,请选择是。客户支付的保证金进入到您的账户中,可提现。</p>
+                    </template>
+                    <a-icon type="question-circle" style="display: inline-block;margin: 12px 0 0 12px;"/>
+                  </a-tooltip>
+                </a-col>
               </a-row>
-              <a-col :span="15">
-                <a-form-model-item label="结算提醒" prop="warnBeforeDays" v-if="form.settleType=='MONTH'">
-                  <div style="display: flex;padding: 0;align-items: center;">
-                    <span style="display: inline-block;margin-right: 10px;">提前</span>
-                    <a-select
-                      style="background-color: none;width: 65%;"
-                      placeholder="请选择结算提醒日期"
-                      id="settlementSet-warnBeforeDays"
-                      allowClear
-                      v-model="form.warnBeforeDays"
-                    >
-                      <a-select-option v-for="item in dateTXList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-                    </a-select>
-                    <span style="display: inline-block;margin-left: 10px;">天开始提醒</span>
-                  </div>
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="15" v-if="form.settleType">
-                <a-form-model-item :label="form.settleType=='CREDIT'?'超过授信额度':'超期未结算'">
-                  <a-checkbox @change="onChange" id="settlementSet-limitFlag" :checked="form.limitFlag==1">
-                    限制汽车修理厂无法使用数字货架
-                  </a-checkbox>
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="15" v-if="pageInfo&&!pageInfo.settleType &&form.settleType ">
-                <a-form-model-item label="是否需要缴纳保证金" prop="bondFlag" >
-                  <a-radio-group name="radioGroup" v-model="form.bondFlag" @change="changeRadio" id="settlementSet-bondFlag">
-                    <a-radio :value="1">是</a-radio>
-                    <a-radio :value="0">否</a-radio>
-                  </a-radio-group>
-                </a-form-model-item>
-              </a-col>
               <a-row v-if="form.settleType&&form.bondFlag&&isEdit">
                 <a-col :span="15">
                   <a-form-model-item label="保证金缴纳金额" prop="bondAmount" >