Página Principal Explorar Ajuda
Registe-se Iniciar Sessão
frontend
/
opt_web
2
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

Merge branch 'cheney' into dev

WanGxC há 6 meses atrás
pai
fe078c5e69 5bb51c084c
commit
11817dcc4f
6 ficheiros alterados com 30 adições e 13 exclusões
Visão Dividida Mostrar Estatísticas Diff
  1. 2 2
      index.html
  2. 1 1
      src/layout/navBars/breadcrumb/user.vue
  3. 5 1
      src/views/product-manage/product-list/component/EditDrawer.vue
  4. 5 3
      src/views/sku-manage/product-category/component/DataTable.vue
  5. 4 3
      src/views/sku-manage/product-category/component/MainAttr.vue
  6. 13 3
      src/views/sku-manage/product-category/index.vue

+ 2 - 2
index.html
Ver Ficheiro 

@@ -6,14 +6,14 @@
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 		<meta
 
 			name="keywords"
 
-			content="django-vue3-admin"
 
+			content="Ansjer运营平台"
 
 		/>
 
 		<meta
 
 			name="description"
 
 			content="django-vue-admin 基于RBAC模型的权限控制的一整套基础开发平台，权限粒度达到列级别，前后端分离，后端采用django + django-rest-framework，前端采用基于 vue3 + CompositionAPI + typescript + vite + element plus"
 
 		/>
 
 		<link rel="icon" href="/favicon.ico" />
 
-		<title>django-vue-admin</title>
 
+		<title>Ansjer 运营平台</title>
 
 	</head>
 
 	<body>
 
     <div id="app"></div>

+ 1 - 1
src/layout/navBars/breadcrumb/user.vue
Ver Ficheiro 

@@ -93,7 +93,7 @@
 
 				<el-dropdown-menu>
 
 					<el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
 
 					<el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
 
-					<el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
 
+					<!--<el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
 
 					<el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
 
 				</el-dropdown-menu>
 
 			</template>

+ 5 - 1
src/views/product-manage/product-list/component/EditDrawer.vue
Ver Ficheiro 

@@ -86,6 +86,10 @@ const submitForm = async (formEl: FormInstance | undefined) => {
 
 function closeDrawer() {
 
   editDrawer.value.handleClose();
 
 }
 
+
 
+function mappingShopId(val: any) {
 
+  ruleForm.shop_id = val;
 
+}
 
 </script>
 
 
 <template>
 
@@ -109,7 +113,7 @@ function closeDrawer() {
 
           <el-input v-model="ruleForm.sku" />
 
         </el-form-item>
 
         <el-form-item class="font-medium" label="店 铺：" prop="shop_name">
 
-          <el-select v-model="ruleForm.shop_name">
 
+          <el-select v-model="ruleForm.shop_name" @change="mappingShopId">
 
             <el-option v-for="item in shopOptions" :key="item.id" :label="item.name" :value="item.id" />
 
           </el-select>
 
         </el-form-item>

+ 5 - 3
src/views/sku-manage/product-category/component/DataTable.vue
Ver Ficheiro 

@@ -21,6 +21,7 @@ import CreateDialog from '/@/views/sku-manage/product-category/component/CreateD
 
 
 interface Parameter {
 
   name: string;
 
+  status: string;
 
 }
 
 
 const queryParameter: Parameter | undefined = inject('query-parameter');
 
@@ -75,7 +76,7 @@ const dialogVisible = ref(false);
 
 
 onBeforeMount(() => {
 
   gridOptions.pagerConfig.limit = 20;
 
-})
 
+});
 
 
 onMounted(() => {
 
   fetchList();
 
@@ -85,12 +86,13 @@ async function fetchList(isQuery = false) {
 
   if (isQuery) {
 
     gridOptions.pagerConfig.page = 1;
 
   }
 
-  
+
 
   gridOptions.data = [];
 
   gridOptions.columns = [];
 
 
   const query = {
 
-    brand_name: queryParameter?.name
 
+    name: queryParameter?.name,
 
+    status: queryParameter?.status
 
   };
 
 
   await useTableData(api.getTableData, query, gridOptions);

+ 4 - 3
src/views/sku-manage/product-category/component/MainAttr.vue
Ver Ficheiro 

@@ -42,15 +42,16 @@ const groupedAttrs = computed(() => {
 
             :key="item.id"
 
             :type="item.description? 'warning': ''"
 
             disable-transitions
 
-            effect="dark"
 
-            plain
 
+            effect="plain"
 
+            round
 
             size="small"
 
+            class="ml-1"
 
         >
 
           {{ item.attr.name }}
 
         </el-tag>
 
         <!--</el-tooltip>-->
 
       </div>
 
-      <span class="line-separator">——</span>
 
+      <span class="line-separator ml-1">——</span>
 
     </template>
 
   </div>

+ 13 - 3
src/views/sku-manage/product-category/index.vue
Ver Ficheiro 

@@ -21,6 +21,7 @@ const btnLoading = ref(false);
 
 
 const formInline = reactive<any>({
 
   name: '',
 
+  status: '',
 
 });
 
 provide('query-parameter', formInline);
 
 
@@ -47,10 +48,19 @@ function resetParameter() {
 
         <div class="flex flex-1">
 
           <div class="w-full whitespace-nowrap">
 
             <el-row :gutter="20" style="margin-bottom: 5px;">
 
-              <el-col :span="5">
 
+              <el-col :span="6">
 
                 <div class="flex items-center">
 
-                  <span class="mr-2">品牌名称</span>
 
-                  <el-input v-model="formInline.name" clearable placeholder="请输入品牌名称" />
 
+                  <span class="mr-2">种类名称</span>
 
+                  <el-input v-model="formInline.name" clearable placeholder="请输入种类名称" />
 
+                </div>
 
+              </el-col>
 
+              <el-col :span="4">
 
+                <div class="flex items-center">
 
+                  <span class="mr-2">状 态</span>
 
+                  <el-select v-model="formInline.status" clearable placeholder="请选择">
 
+                    <el-option label="草稿" value="1" />
 
+                    <el-option label="已发布" value="3" />
 
+                  </el-select>
 
                 </div>
 
               </el-col>
 
             </el-row>