Selaa lähdekoodia

Merge commit '2189866a68ba81216411dbedb74b4159ee5b9417' into HEAD

gitadmin 3 vuotta sitten
vanhempi
commit
dfd89e7006

+ 1 - 2
package-lock.json

@@ -14535,8 +14535,7 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
       "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",

+ 1 - 1
src/components/GlobalHeader/GlobalHeader.vue

@@ -21,7 +21,7 @@
           </div>
         </div>
       </a-layout-header>
-      <!-- <multi-tab :class="[fixedHeader ? 'ant-header-fixedMultiTab' : 'ant-header-multiTab',sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',]" v-if="multiTab"></multi-tab> -->
+      <multi-tab :class="[fixedHeader ? 'ant-header-fixedMultiTab' : 'ant-header-multiTab',sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',]" v-if="multiTab"></multi-tab>
     </div>
   </transition>
 </template>

+ 4 - 2
src/config/router.config.js

@@ -88,7 +88,8 @@ export const asyncRouterMap = [
                 component: () => import('@/views/numsGoodsShelves/goodsShelvesAdministration/goodsAllocationSet.vue'),
                 meta: {
                   title: '货位设置',
-                  hidden: true
+                  hidden: true,
+                  replaceTab: true
                   // permission: 'M_salesNew'
                 }
               },
@@ -98,7 +99,8 @@ export const asyncRouterMap = [
                 component: () => import('@/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue'),
                 meta: {
                   title: '结算设置',
-                  hidden: true
+                  hidden: true,
+                  replaceTab: true
                   // permission: 'M_salesNew'
                 }
               }

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

@@ -201,10 +201,6 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = Object.assign({}, _this.form)
-          if (params.creditWarnLimit >= params.creditLimit) {
-            _this.$message.warning('结算提醒金额需要小于授信额度')
-            return
-          }
           if (this.shelfInfo) {
             console.log(this.shelfInfo, 'this.nowData')
             params.shelfSn = this.shelfInfo.shelfSn
@@ -216,6 +212,10 @@ export default {
             params.bondFlag = this.settleInfo.bondFlag
             params.id = this.settleInfo.id
           }
+          if (params.creditWarnLimit >= params.creditLimit) {
+            _this.$message.warning('结算提醒金额需要小于授信额度')
+            return
+          }
           _this.spinning = true
           shelfSettleRuleSave(params).then(res => {
             if (res.status == 200) {

+ 4 - 5
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue

@@ -95,12 +95,11 @@
                       id="settlementSet-creditLimit"
                       v-model="form.creditLimit"
                       :precision="2"
-                      :min="0.01"
+                      :min="0"
                       :max="999999"
                       placeholder="请输入正数(最多允许两位小数)"
                       style="width: 100%;display: inline-block;" />
                   </a-form-model-item>
-
                 </a-col>
                 <a-col :span="1"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
                 <a-col :span="1">
@@ -147,7 +146,7 @@
                       id="settlementSet-creditWarnLimit"
                       v-model="form.creditWarnLimit"
                       :precision="2"
-                      :min="0.01"
+                      :min="0"
                       :max="999999"
                       placeholder="请输入正数(最多允许两位小数)"
                       style="width: 100%;display: inline-block;" />
@@ -272,7 +271,6 @@ export default {
         labelCol: { span: 13 },
         wrapperCol: { span: 11 }
       },
-      loadData: [],
       settleInfo: null, // 结算详情
       // shelfInfo: null, // 数字货架详情
       settlementType: '', // 结算方式
@@ -305,7 +303,8 @@ export default {
         { title: '保证金金额', dataIndex: 'bondAmount', width: '30%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '支付时间', width: '20%', align: 'center', dataIndex: 'payDate' }
-      ]
+      ],
+      loadData: []
     }
   },
   methods: {

+ 2 - 2
vue.config.js

@@ -108,8 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://p.xprh.360arrow.com/xprh-admin',
-        target: 'http://192.168.16.151:8701/xprh-admin',
+        target: 'http://p.xprh.360arrow.com/xprh-admin',
+        // target: 'http://192.168.16.151:8701/xprh-admin',
         // ws: false,
         ws: true,
         changeOrigin: true,