Преглед изворни кода

更新商品组合有问题

lex-xin пре 4 година
родитељ
комит
0ec8983fbf

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/index.html


+ 0 - 0
dist/static/css/chunk-e60d0406.5ce51240.css → dist/static/css/chunk-2ed70ae6.5ce51240.css


+ 0 - 0
dist/static/css/chunk-6197363f.8ee77068.css → dist/static/css/chunk-6605bc01.6d894868.css


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/app.a9f55314.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/chunk-2ed70ae6.bf9489e9.js


+ 1 - 1
dist/static/js/chunk-6197363f.3da4a6c7.js → dist/static/js/chunk-6605bc01.27930294.js

@@ -1,4 +1,4 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6197363f"],{"14e1":function(t,e,n){},"262e":function(t,e,n){"use strict";function r(t,e){return r=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t},r(t,e)}function o(t,e){if("function"!==typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&r(t,e)}n.d(e,"a",(function(){return o}))},"2caf8":function(t,e,n){"use strict";var r=n("7e84");function o(){if("undefined"===typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"===typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}var i=n("53ca");function l(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}function a(t,e){return!e||"object"!==Object(i["a"])(e)&&"function"!==typeof e?l(t):e}function s(t){var e=o();return function(){var n,o=Object(r["a"])(t);if(e){var i=Object(r["a"])(this).constructor;n=Reflect.construct(o,arguments,i)}else n=o.apply(this,arguments);return a(this,n)}}n.d(e,"a",(function(){return s}))},"45eb":function(t,e,n){"use strict";var r=n("7e84");function o(t,e){while(!Object.prototype.hasOwnProperty.call(t,e))if(t=Object(r["a"])(t),null===t)break;return t}function i(t,e,n){return i="undefined"!==typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=o(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}},i(t,e,n||t)}n.d(e,"a",(function(){return i}))},"7e84":function(t,e,n){"use strict";function r(t){return r=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)},r(t)}n.d(e,"a",(function(){return r}))},8096:function(t,e,n){},9339:function(t,e,n){(function(e){
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6605bc01"],{"14e1":function(t,e,n){},"262e":function(t,e,n){"use strict";function r(t,e){return r=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t},r(t,e)}function o(t,e){if("function"!==typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&r(t,e)}n.d(e,"a",(function(){return o}))},"2caf8":function(t,e,n){"use strict";var r=n("7e84");function o(){if("undefined"===typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"===typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}var i=n("53ca");function l(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}function a(t,e){return!e||"object"!==Object(i["a"])(e)&&"function"!==typeof e?l(t):e}function s(t){var e=o();return function(){var n,o=Object(r["a"])(t);if(e){var i=Object(r["a"])(this).constructor;n=Reflect.construct(o,arguments,i)}else n=o.apply(this,arguments);return a(this,n)}}n.d(e,"a",(function(){return s}))},"45eb":function(t,e,n){"use strict";var r=n("7e84");function o(t,e){while(!Object.prototype.hasOwnProperty.call(t,e))if(t=Object(r["a"])(t),null===t)break;return t}function i(t,e,n){return i="undefined"!==typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=o(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}},i(t,e,n||t)}n.d(e,"a",(function(){return i}))},"7e84":function(t,e,n){"use strict";function r(t){return r=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)},r(t)}n.d(e,"a",(function(){return r}))},8096:function(t,e,n){},9339:function(t,e,n){(function(e){
 /*!
  * Quill Editor v1.3.7
  * https://quilljs.com/

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/chunk-e60d0406.2c1c8d9f.js


+ 15 - 13
src/views/businessManager/shopManager/shopList.vue

@@ -260,9 +260,8 @@
                            label="操作"
                            fixed="right">
             <template slot-scope="scope">
-              <!-- 组合商品没有进货清单按钮 -->
-              <el-button v-if="!scope.row.complementGoodsIdList"
-                         v-permission="'/purchaseLlist'"
+              <!-- 组合商品没有进货清单按钮 v-permission="'/purchaseLlist'" -->
+              <el-button v-if="!scope.row.complementGoodsIdList && permission('/purchaseLlist')"
                          @click="onPurchaseList(scope.row)"
                          type="text">进货清单</el-button>
               <!-- <el-popconfirm title="你是否上架该商品?"
@@ -272,16 +271,11 @@
                 <el-button slot="reference"
                            type="text">上架</el-button>
               </el-popconfirm> -->
-              <el-button v-if="scope.row.status == 0"
-                         v-permission="'goods/updateGoodsStatus'"
+              <!-- v-permission="'goods/updateGoodsStatus'" -->
+              <el-button v-if="scope.row.status == 0 && permission('goods/updateGoodsStatus')"
                          @click="onUpdate(scope.row, 0)"
                          type="text">上架</el-button>
-              <el-button v-if="scope.row.status == 0"
-                         v-permission="scope.row.complementGoodsIdList ? 'goods/update' : '/shopOperation'"
-                         @click="onShopOperation('update', scope.row)"
-                         type="text">修改</el-button>
-              <el-button v-if="scope.row.status == 1"
-                         v-permission="'goods/updateGoodsStatus'"
+              <el-button v-if="scope.row.status == 1 && permission('goods/updateGoodsStatus')"
                          @click="onUpdate(scope.row, 1)"
                          type="text">下架</el-button>
               <!-- <el-popconfirm title="你是否下架该商品?"
@@ -291,8 +285,12 @@
                 <el-button slot="reference"
                            type="text">下架</el-button>
               </el-popconfirm> -->
-              <el-button v-if="scope.row.status == 1"
-                         v-permission="scope.row.complementGoodsIdList ? 'goods/update' : '/shopOperation'"
+              <!-- {{ scope.row.status }} -->
+              <!-- v-permission="scope.row.complementGoodsIdList ? 'goods/update' : '/shopOperation'" -->
+              <el-button v-if="scope.row.status == 0 && permission(scope.row.complementGoodsIdList ? 'goods/update' : '/shopOperation')"
+                         @click="onShopOperation('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button v-if="scope.row.status == 1 && permission(scope.row.complementGoodsIdList ? 'goods/update' : '/shopOperation')"
                          @click="onShopOperation('look', scope.row)"
                          type="text">查看</el-button>
               <!-- <el-button v-if="scope.row.status == 0"
@@ -526,6 +524,7 @@ import {
   goodsType
 } from '@/utils/searchArray'
 import load from '@/utils/loading'
+import { permission } from "@/utils/directivePage";
 let validPrice = (rule, value, callback) => {
   if (value == '' && typeof value == 'string' || value == null) {
     callback(new Error('请输入金额'))
@@ -739,6 +738,9 @@ export default {
 
   },
   methods: {
+    permission (str) {
+      return permission(str);
+    },
     init () {
       if (this.$route.query.searchForm) {
         this.$route.query.searchForm instanceof Object ? this.searchForm = this.$route.query.searchForm : this.searchForm =

Неке датотеке нису приказане због велике количине промена