Browse Source

Merge remote-tracking branch 'origin/master'

大大的豆芽 1 month ago
parent
commit
534c7e5146

+ 4 - 4
admin-ui/.env.development

@@ -7,10 +7,10 @@ ENV = 'development'
 
 # VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
 # VUE_APP_BASE_API = 'http://127.0.0.1:9801'
-# VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
-# VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
-VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'
-VUE_APP_BASE_API = 'http://192.168.5.247:9801/'
+VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
+VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
+# VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'
+# VUE_APP_BASE_API = 'http://192.168.5.247:9801/'
 
 
 # 路由懒加载

+ 4 - 4
admin-ui/src/components/GoodsSkuDialog/index.vue

@@ -44,7 +44,7 @@
                             @change="handlePriceStockChange(scope.row)" />
                     </template>
                 </el-table-column>
-                <el-table-column label="采购价(元)" align="center" width="180">
+                <el-table-column :label="userInfoVO.userType == '00' ? '批发价(元)' : '采购价(元)'" align="center" width="180">
                     <template slot-scope="scope">
                         <el-input-number
                             v-model="scope.row.purchasePrice"
@@ -129,8 +129,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="采购价(元)" prop="purchasePrice">
-                                <el-input-number v-model="form.purchasePrice" placeholder="请输入采购价" :precision="2" :step="0.1" :min="0" :max="9999999" :disabled="userInfoVO.userType != '00'" style="width: 100%" />
+                            <el-form-item label="批发价(元)" prop="purchasePrice">
+                                <el-input-number v-model="form.purchasePrice" placeholder="请输入批发价" :precision="2" :step="0.1" :min="0" :max="9999999" :disabled="userInfoVO.userType != '00'" style="width: 100%" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -188,7 +188,7 @@ export default {
             rules: {
                 salePrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }],
                 costPrice: [{ required: true, message: '成本价不能为空', trigger: 'blur' }],
-                purchasePrice: [{ required: true, message: '采购价不能为空', trigger: 'blur' }]
+                purchasePrice: [{ required: true, message: '批发价不能为空', trigger: 'blur' }]
             },
             specVoList: [
                 {

+ 8 - 3
admin-ui/src/views/app/user/index.vue

@@ -22,7 +22,7 @@
         <!-- 操作按钮区域 -->
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['app:user:add']" v-if="userInfoVO.userType == '02'">新增会员</el-button>
+                <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['app:user:add']" v-if="userInfoVO.userType == '00' || userInfoVO.userType == '02'">新增会员</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -104,7 +104,7 @@
 
             <el-table-column label="操作" align="center" width="180" fixed="right">
                 <template slot-scope="scope">
-                    <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['app:user:edit']" v-if="userInfoVO.userType == '02'">编辑</el-button>
+                    <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['app:user:edit']" v-if="userInfoVO.userType == '00' || userInfoVO.userType == '02'">编辑</el-button>
                     <el-button type="text" icon="el-icon-view" @click="handleView(scope.row)">详情</el-button>
                 </template>
             </el-table-column>
@@ -496,7 +496,12 @@ export default {
                 console.log("AAAA")
                 this.form = response.data
                 this.open = true
-                this.isDisabled = true
+                if (this.userInfoVO.userType == '00') {
+                    this.isDisabled = false
+                } else {
+                    this.isDisabled = true
+                }
+               
                 this.title = '修改用户'
             })
         },

+ 2 - 2
admin-ui/src/views/goods/commonGoods/index.vue

@@ -185,7 +185,7 @@
               <el-form-item label="成本价格" prop="singleSkuCostPrice">
                 <el-input-number v-model="form.singleSkuCostPrice" :precision="2" :step="0.1" :min="0" />
               </el-form-item>
-              <el-form-item label="采购价格" prop="singleSkuPurchasePrice">
+              <el-form-item label="批发价格" prop="singleSkuPurchasePrice">
                 <el-input-number v-model="form.singleSkuPurchasePrice" :precision="2" :step="0.1" :min="0" />
               </el-form-item>
               <el-form-item label="库存数量" prop="singleSkuStock">
@@ -247,7 +247,7 @@
                     <el-input-number v-model="scope.row.costPrice" :precision="2" :step="0.1" :min="0" controls-position="right" size="mini" />
                   </template>
                 </el-table-column>
-                <el-table-column label="采购价格" align="center" width="150">
+                <el-table-column label="批发价格" align="center" width="150">
                   <template slot-scope="scope">
                     <el-input-number v-model="scope.row.purchasePrice" :precision="2" :step="0.1" :min="0" controls-position="right" size="mini" />
                   </template>

+ 1 - 1
admin-ui/src/views/goods/commonGoods/setSku.vue

@@ -20,7 +20,7 @@
             </el-table-column>
             <el-table-column label="零售价(元)" align="center" prop="salePrice" />
             <el-table-column label="成本价(元)" align="center" prop="costPrice"  v-if="userInfoVO.userType == '00'" />
-            <el-table-column label="采购价(元)" align="center" prop="purchasePrice" v-if="userInfoVO.userType != '02'"/>
+            <el-table-column label="采购价(元)1" align="center" prop="purchasePrice" v-if="userInfoVO.userType != '02'"/>
             <el-table-column label="库存" align="center" prop="stock" />
             <el-table-column label="启用状态" align="center" prop="status">
                 <template slot-scope="scope">

+ 33 - 1
admin-ui/src/views/order/cloth/collectCloth.vue

@@ -253,6 +253,7 @@
                         <el-input v-model="defaultList.item" placeholder="请输入要搜索的衣服类型" style="width: 300px" clearable>
                             <el-button slot="append" icon="el-icon-search" @click="searchCloth('item', 'clothItems')"></el-button>
                         </el-input>
+                        <el-button type="primary" @click="changeClothActiveTab(0)" style="margin-left: 10px">上一步</el-button>
                     </div>
                     <div style="margin-left: 40px">
                         <div class="horizontal-view" style="margin-left: 15px">
@@ -272,6 +273,7 @@
                         <el-input v-model="defaultList.color" placeholder="请输入要搜索的衣服颜色" style="width: 300px" clearable>
                             <el-button slot="append" icon="el-icon-search" @click="searchCloth('color', 'clothColors')"></el-button>
                         </el-input>
+                        <el-button type="primary" @click="changeClothActiveTab(1)" style="margin-left: 10px" v-if="!isUpdateClothItem">上一步</el-button>
                     </div>
                     <div style="margin-left: 40px; display: flex; flex-wrap: wrap">
                         <template v-for="(item, index) in clothColors">
@@ -292,6 +294,7 @@
                         <el-input v-model="defaultList.brand" placeholder="请输入要搜索的衣服品牌" style="width: 300px" clearable>
                             <el-button slot="append" icon="el-icon-search" @click="searchCloth('brand', 'clothBrands')"></el-button>
                         </el-input>
+                        <el-button type="primary" @click="changeClothActiveTab(2)" style="margin-left: 10px" v-if="!isUpdateClothItem">上一步</el-button>
                     </div>
                     <div style="margin-left: 40px">
                         <el-tag :key="item.id" type="info" v-for="item in clothBrands" style="margin-top: 15px; margin-left: 15px" size="medium" @click="onClothBrandSelect(item.id)">
@@ -306,6 +309,7 @@
                                 <el-input v-model="defaultList.flaw" placeholder="请输入要搜索的衣服瑕疵" style="width: 300px" clearable>
                                     <el-button slot="append" icon="el-icon-search" @click="searchCloth('flaw', 'clothFlaws')"></el-button>
                                 </el-input>
+                                <el-button type="primary" @click="changeClothActiveTab(3)" style="margin-left: 10px" v-if="!isUpdateClothItem">上一步</el-button>
                             </div>
                             <el-tag :key="item.id" :type="item.isSelect ? 'success' : 'info'" v-for="(item, index) in clothFlaws" style="margin-top: 15px; margin-left: 15px" size="medium" @click="onClothFlawSelect(index)">
                                 {{ item.name }}
@@ -330,9 +334,10 @@
                         <el-col :span="8">
                             <div>选择附件</div>
                             <div style="margin-left: 15px; margin-top: 10px">
-                                <el-input v-model="defaultList.adjunct" placeholder="请输入要搜索的衣服附件" style="width: 300px" clearable>
+                                <el-input v-model="defaultList.adjunct" placeholder="请输入要搜索的衣服附件" style="width: 200px" clearable>
                                     <el-button slot="append" icon="el-icon-search" @click="searchCloth('adjunct', 'clothAdjuncts')"></el-button>
                                 </el-input>
+                                <el-button type="primary" @click="changeClothActiveTab(4)" style="margin-left: 10px" v-if="!isUpdateClothItem">上一步</el-button>
                             </div>
                             <el-tag :key="item.id" type="info" v-for="item in clothAdjuncts" style="margin-top: 15px; margin-left: 15px" @click="onClothAdjunctSelect(item)">
                                 {{ item.name }}
@@ -952,6 +957,33 @@ export default {
                 this.addClothActiveTab = 1
             })
         },
+        changeClothActiveTab(index) {
+            this.addClothActiveTab = index
+            switch (index) {
+                case 0:
+                    this.form.clothTypeKeys = []
+                    this.form.orderClothTypeDTOS = []
+                    this.form.clothWashModeId = ''
+                    this.form.clothWashModeName = ''
+                    break
+                case 1:
+                    this.clothColors.forEach((item) => {
+                        item.isSelect = false
+                    })
+                    this.form.orderClothColorDTOS = []
+                    break
+                case 2:
+                    this.form.clothBrandId = ''
+                    this.form.clothBrandName = ''
+                    break
+                case 3:
+                    this.form.orderClothFlawDTOS = []
+                    break 
+                 case 4:
+                   
+                    break 
+            }
+        },
         onClothItemSelect(index) {
             this.form.orderClothTypeDTOS = []
             for (let i = 0; i < this.form.clothTypeKeys.length; i++) {

+ 2 - 2
admin-ui/src/views/systemSet/purchaseGoods/platform.vue

@@ -105,7 +105,7 @@
                                         />
                                     </template>
                                 </el-table-column>
-                              <el-table-column label="采购价格" align="center" width="120">
+                              <el-table-column label="批发价格" align="center" width="120">
                                 <template slot-scope="scope">
                                   <el-input
                                     v-if="scope.row.goodsSkuStoreId == vo.goodsSkuStoreId"
@@ -154,7 +154,7 @@
                                         {{formatSpec(scope.row.specValLists)}}
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="采购价格" align="center" prop="costPrice" width="100" />
+                                <el-table-column label="批发价格" align="center" prop="costPrice" width="100" />
                                 <el-table-column label="库存" align="center" width="120">
                                     <template slot-scope="scope">
                                         <span :class="{'low-stock': scope.row.stock <= 5}">{{ scope.row.stock }}</span>