Merge branch 'linwenxin_dev' into moss_dev

* linwenxin_dev:
  no message
  no message
  no message
  no message
  no message

package-lock.json

@@ -4716,9 +4716,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.13.23",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.13.23.tgz",
-      "integrity": "sha512-8Bff1dAUbYJsyNkm3GXNei+7UTCIi6DOl7NfwY2Kwjv6LOpNA2HN06avJukbrr71Bclh65mHv10YfXU7xgazNA==",
+      "version": "2.14.0",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.14.0.tgz",
+      "integrity": "sha512-NN3xVPTNCjOASXZBHFJGs2gtJT4cGWWoesNA1ddf+JUAn66JUxXLUPKt4LzT1rU9O/0akKMlzkpPTqkFuGJ+mw==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

package.json

@@ -18,7 +18,7 @@
     "@turf/turf": "^6.5.0",
     "@vue-office/excel": "^1.3.0",
     "@vue/composition-api": "^1.7.1",
-    "@zjlib/element-plugins": "^2.13.23",
+    "@zjlib/element-plugins": "^2.14.0",
     "@zjlib/element-ui2": "^1.0.3",
     "axios": "0.18.1",
     "chatgpt": "^4.1.2",

src/components/template/operation_mixin.js

@@ -29,7 +29,6 @@ export default {
   methods: {
     optionsEvensAuth(key, obj) {
       var roleItems = this.$route.meta.roleItems
-      console.log(roleItems)
       if (!roleItems || !roleItems.length) {
         return { isRole: false }
       }

src/layout/components/Navbar.vue

@@ -18,14 +18,14 @@
       </div>
       <!-- 右侧 -->
       <div class="right-menu">
-        <!-- <div class="right-menu-item">
+        <div class="right-menu-item">
           <el-autocomplete
             v-model="pathurl"
             :fetch-suggestions="querySearchAsync"
             placeholder="搜索菜单"
             @select="handleSelect"
           ></el-autocomplete>
-        </div> -->
+        </div>
         <div style="margin-right: 20px; cursor: pointer" @click="
           getList()
         isShow = true
@@ -333,9 +333,8 @@ export default {
       }
       window.open(link)
     },
-
     querySearchAsync(queryString, cb) {
-      var data = pages.filter(item => ~item.meta.title.indexOf(queryString))
+      var data = pages.filter(item => !~item.path.indexOf(":pageName?/:pageType?/:pageCode?/:pagePam?") && !!~item.meta.title.indexOf(queryString))
       cb(
         data.map(item => ({
           value: item.meta.title,

src/views/mallManagement/order/order_detail/index.vue

@@ -716,7 +716,7 @@ export default {
 	  },
 	  isEdit1: 0,
 	  isEdit2: 0,
-	  joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
+	  joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
 	  orderDetailId: '',
 
     printList: [],

src/views/mallManagement/order/order_list/index.vue

@@ -761,7 +761,7 @@ export default {
 		},
 		isEdit1: 0,
 		isEdit2: 0,
-		joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
+		joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
 		orderDetailId: '',
 
     printOrderId: '',

src/views/mallManagement/order/order_refund/index.vue

@@ -519,7 +519,7 @@ export default {
       },
       isEdit1: 0,
       isEdit2: 0,
-      joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
+      joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
       orderDetailId: '',
       returnGoodsFormRules: {
         // refundMessage: [{ required: true, message: '请填写卖家留言', trigger: 'blur' }],

src/views/mallManagement/order/order_refund_detail/index.vue

@@ -388,7 +388,7 @@ export default {
 	  },
 	  isEdit1: 0,
 	  isEdit2: 0,
-	  joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
+	  joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
 	  orderDetailId: '',
 	  returnGoodsFormRules: {
 	  	// refundMessage: [{ required: true, message: '请填写卖家留言', trigger: 'blur' }],

src/views/mallManagement/order/sales_return_order_list/index.vue

@@ -627,7 +627,7 @@ export default {
       orderList: [],
       waitChooseOrder: [],
 
-      joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
+      joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
     }
   },
   computed: {

src/views/salesPurchasing/goodsInventory/index.vue

@@ -83,7 +83,7 @@ export default {
 			return this.operationBtn({
 				detail: {
 					conditions: ({ row, index, column }) => {
-						return JSON.parse(localStorage.getItem('greemall_user')).joinCode
+						return JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE"
 					},
 					click: ({ row, index, column }) => {
 						this.$router.push({

src/views/salesPurchasing/goodsPurchasedStored/index.vue

@@ -123,7 +123,7 @@ export default {
                 click: () => {
                   this.openForm()
                   this.formDialog = true
-                  this.joinCode = JSON.parse(localStorage.getItem('greemall_user')).joinCode
+                  this.joinCode = JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE"
                 }
               })
             ]
@@ -215,7 +215,7 @@ export default {
           fileUrl: res.data.fileUrl ? [{ url: res.data.fileUrl }] : [],
           items: res.data.items.map(item => ({ ...item, details: {} }))
         })
-        this.joinCode = res.data.joinCode
+        this.joinCode = res.data.joinCode === "CODE"
         this.formDialogType = type
         this.openForm()
         this.formDialog = true

src/views/salesPurchasing/mixins/common_form.js

@@ -112,7 +112,7 @@ export default {
                               this.formData.items = []
                               if (val) {
                                 goodsPurchaseDetail({ id: val, isQuery: true }).then(res => {
-                                  this.joinCode = res.data.joinCode
+                                  this.joinCode = res.data.joinCode === "CODE"
                                   this.formData.items = res.data.items.map(item => ({
                                     brandId: item.brandId,
                                     brandName: item.brandName,
@@ -261,7 +261,7 @@ export default {
           this.cgrkOrder = res.data.records
           if (this.formData.goodsPurchaseId) {
             goodsPurchaseDetail({ id: this.formData.goodsPurchaseId, isQuery: true }).then(res => {
-              this.joinCode = res.data.joinCode
+              this.joinCode = res.data.joinCode === "CODE"
             })
           }
         })

src/views/setting/departmentManage/index.vue

@@ -158,7 +158,7 @@ export default {
         address: '',
         status: true,
         isIncre: true,
-        joinCode: true,
+        joinCode: "",
         type: ""
       },
       mainFormRules: {

src/views/setting/organizationManagement/settledManagement/index.vue

@@ -111,10 +111,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="商品出入库" prop="joinCode">
+              <el-form-item label="库存管理方式" prop="joinCode">
                 <el-radio-group v-model="step1Form.joinCode">
-                  <el-radio :label="true">关联条码</el-radio>
-                  <el-radio :label="false">不关联条码</el-radio>
+                  <el-radio label="NO">不管理</el-radio>
+                  <el-radio label="CODE">管条码</el-radio>
+                  <el-radio label="NUM">管数量</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>

src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -96,10 +96,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="商品出入库" prop="joinCode">
+              <el-form-item label="库存管理方式" prop="joinCode">
                 <el-radio-group v-model="step1Form.joinCode">
-                  <el-radio :label="true">关联条码</el-radio>
-                  <el-radio :label="false">不关联条码</el-radio>
+                  <el-radio label="NO">不管理</el-radio>
+                  <el-radio label="CODE">管条码</el-radio>
+                  <el-radio label="NUM">管数量</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>