auto commit

src/views/oms/order/index.vue

@@ -114,15 +114,15 @@
               size="mini"
               @click="handleDeliveryOrder(scope.$index, scope.row)"
               v-show="scope.row.status===1">订单发货</el-button>
-            <el-button
+            <!-- <el-button
               size="mini"
               @click="handleViewLogistics(scope.$index, scope.row)"
-              v-show="scope.row.status===2||scope.row.status===3">订单跟踪</el-button>
-            <el-button
+              v-show="scope.row.status===2||scope.row.status===3">订单跟踪</el-button> -->
+            <!-- <el-button
               size="mini"
               type="danger"
               @click="handleDeleteOrder(scope.$index, scope.row)"
-              v-show="scope.row.status===4">删除订单</el-button>
+              v-show="scope.row.status===4">删除订单</el-button> -->
           </template>
         </el-table-column>
       </el-table>

src/views/oms/order/orderDetail.vue

@@ -6,7 +6,7 @@
         <el-step title="支付订单" :description="formatTime(order.paymentTime)"></el-step>
         <el-step title="平台发货" :description="formatTime(order.deliveryTime)"></el-step>
         <el-step title="确认收货" :description="formatTime(order.receiveTime)"></el-step>
-        <el-step title="完成评价" :description="formatTime(order.commentTime)"></el-step>
+        <!-- <el-step title="完成评价" :description="formatTime(order.commentTime)"></el-step> -->
       </el-steps>
     </div>
     <el-card shadow="never" style="margin-top: 15px">
@@ -17,23 +17,23 @@
           <el-button size="mini" @click="showUpdateReceiverDialog">修改收货人信息</el-button>
           <el-button size="mini">修改商品信息</el-button>
           <el-button size="mini" @click="showUpdateMoneyDialog">修改费用信息</el-button>
-          <el-button size="mini" @click="showMessageDialog">发送站内信</el-button>
+          <!-- <el-button size="mini" @click="showMessageDialog">发送站内信</el-button> -->
           <el-button size="mini" @click="showCloseOrderDialog">关闭订单</el-button>
           <el-button size="mini" @click="showMarkOrderDialog">备注订单</el-button>
         </div>
         <div class="operate-button-container" v-show="order.status===1">
           <el-button size="mini" @click="showUpdateReceiverDialog">修改收货人信息</el-button>
-          <el-button size="mini" @click="showMessageDialog">发送站内信</el-button>
+          <!-- <el-button size="mini" @click="showMessageDialog">发送站内信</el-button> -->
           <el-button size="mini">取消订单</el-button>
           <el-button size="mini" @click="showMarkOrderDialog">备注订单</el-button>
         </div>
         <div class="operate-button-container" v-show="order.status===2||order.status===3">
-          <el-button size="mini" @click="showLogisticsDialog">订单跟踪</el-button>
-          <el-button size="mini" @click="showMessageDialog">发送站内信</el-button>
+          <!-- <el-button size="mini" @click="showLogisticsDialog">订单跟踪</el-button> -->
+          <!-- <el-button size="mini" @click="showMessageDialog">发送站内信</el-button> -->
           <el-button size="mini" @click="showMarkOrderDialog">备注订单</el-button>
         </div>
         <div class="operate-button-container" v-show="order.status===4">
-          <el-button size="mini" @click="handleDeleteOrder">删除订单</el-button>
+          <!-- <el-button size="mini" @click="handleDeleteOrder">删除订单</el-button> -->
           <el-button size="mini" @click="showMarkOrderDialog">备注订单</el-button>
         </div>
       </div>

src/views/oms/order/setting.vue

@@ -4,36 +4,36 @@
              ref="orderSettingForm"
              :rules="rules"
              label-width="150px">
-      <el-form-item label="秒杀订单超过：" prop="flashOrderOvertime">
+      <!-- <el-form-item label="秒杀订单超过：" prop="flashOrderOvertime">
         <el-input v-model="orderSetting.flashOrderOvertime" class="input-width">
           <template slot="append">分</template>
         </el-input>
         <span class="note-margin">未付款，订单自动关闭</span>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="正常订单超过：" prop="normalOrderOvertime">
         <el-input v-model="orderSetting.normalOrderOvertime" class="input-width">
           <template slot="append">分</template>
         </el-input>
         <span class="note-margin">未付款，订单自动关闭</span>
       </el-form-item>
-      <el-form-item label="发货超过：" prop="confirmOvertime">
+      <!-- <el-form-item label="发货超过：" prop="confirmOvertime">
         <el-input v-model="orderSetting.confirmOvertime" class="input-width">
           <template slot="append">天</template>
         </el-input>
         <span class="note-margin">未收货，订单自动完成</span>
-      </el-form-item>
-      <el-form-item label="订单完成超过：" prop="finishOvertime">
+      </el-form-item> -->
+      <!-- <el-form-item label="订单完成超过：" prop="finishOvertime">
         <el-input v-model="orderSetting.finishOvertime" class="input-width">
           <template slot="append">天</template>
         </el-input>
         <span class="note-margin">自动结束交易，不能申请售后</span>
-      </el-form-item>
-      <el-form-item label="订单完成超过：" prop="commentOvertime">
+      </el-form-item> -->
+      <!-- <el-form-item label="订单完成超过：" prop="commentOvertime">
         <el-input v-model="orderSetting.commentOvertime" class="input-width">
           <template slot="append">天</template>
         </el-input>
         <span class="note-margin">自动五星好评</span>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           @click="confirm('orderSettingForm')"

src/views/pms/brand/components/BrandDetail.vue

@@ -1,6 +1,21 @@
 <template> 
   <el-card class="form-container" shadow="never">
     <el-form :model="brand" :rules="rules" ref="brandFrom" label-width="150px">
+      <el-form-item label="供应商：" prop="compId">
+        <el-select
+          filterable
+          v-model="brand.compId"
+          @change="handleSupplierChange"
+          placeholder="请选择供应商"
+        >
+          <el-option
+            v-for="item in supplierOptList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="品牌名称：" prop="name">
         <el-input v-model="brand.name"></el-input>
       </el-form-item>
@@ -34,22 +49,7 @@
           <el-radio :label="1">是</el-radio>
           <el-radio :label="0">否</el-radio>
         </el-radio-group>
-      </el-form-item>
-      <el-form-item label="供应商：" prop="compId">
-        <el-select
-          filterable
-          v-model="brand.compId"
-          @change="handleSupplierChange"
-          placeholder="请选择供应商"
-        >
-          <el-option
-            v-for="item in supplierOptList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
+      </el-form-item>      
       <el-form-item>
         <el-button type="primary" @click="onSubmit('brandFrom')">提交</el-button>
         <el-button v-if="!isEdit" @click="resetForm('brandFrom')">重置</el-button>

src/views/pms/brand/index.vue

@@ -23,6 +23,17 @@
             <el-form-item label="输入搜索：">
               <el-input style="width: 203px" v-model="listQuery.keyword" placeholder="品牌名称/关键字"></el-input>
             </el-form-item>
+            <el-form-item label="供应商：">
+            <el-select v-model="listQuery.compId" placeholder="全部" clearable>
+              <el-option
+                v-for="item in compList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+            
           </el-form>
         </div>
     </el-card>
@@ -145,13 +156,15 @@
   </div>
 </template>
 <script>
-  import {fetchList, updateShowStatus, updateFactoryStatus, deleteBrand} from '@/api/brand'
-  import {createbrand,updatebrand,deletebrand} from '@/api/permissions'
+  import {fetchList, updateShowStatus, updateFactoryStatus, deleteBrand} from '@/api/brand';
+  import {selectCompList} from '@/api/product';
+  import {createbrand,updatebrand,deletebrand} from '@/api/permissions';
 
   const defaultListQuery = {
-    pageNo: 1,
+    pageNum: 1,
     pageSize: 10,
-    keyword: null
+    keyword: null,
+    compId:null,
   };
 
   export default {
@@ -161,6 +174,7 @@
         createbrand,
         updatebrand,
         deletebrand,
+        compList:[],
         operates: [
           {
             label: "显示品牌",
@@ -176,13 +190,21 @@
         list: null,
         total: null,
         listLoading: true,
-        multipleSelection: []
+        multipleSelection: []        
       }
     },
     created() {
       this.getList();
+      this.getcompList();
     },
     methods: {
+       /** 获取供应商下拉列表 */
+      getcompList() {
+        selectCompList().then(response => {
+          // console.log("获取供应商下拉列表",response);
+          this.compList = response.data;
+        });
+      },
       getList() {
         this.listLoading = true;
         fetchList(this.listQuery).then(response => {
@@ -198,6 +220,7 @@
       },
       handleResetSearch() {
         this.listQuery = Object.assign({},defaultListQuery);
+        this.getList();
         console.log('this.listQuery',this.listQuery);
       },
       handleUpdate(index, row) {

src/views/pms/intention/index.vue

@@ -23,6 +23,16 @@
           <el-form-item label="输入搜索：">
             <el-input v-model="listQuery.productName" class="input-width" placeholder="产品名称" clearable></el-input>
           </el-form-item>
+          <el-form-item label="供应商：">
+            <el-select v-model="listQuery.compId" placeholder="全部" clearable>
+              <el-option
+                v-for="item in compList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
     </el-card>
@@ -86,11 +96,13 @@
 <script>
   import {fetchList} from '@/api/intention';
   import {formatDate} from '@/utils/date';
+  import {selectCompList} from '@/api/product';
 
   const defaultListQuery = {
     pageNo: 1,
     pageSize: 10,
-    productName: null
+    productName: null,
+    compId:null,
   };
 
   export default {
@@ -102,11 +114,13 @@
         total: null,
         listLoading: false,
         dialogVisible: false,
-        isEdit: false
+        isEdit: false,
+        compList:[],
       }
     },
     created() {
       this.getList();
+      this.getcompList();
     },
     filters: {
       formatDateTime(time) {
@@ -118,8 +132,16 @@
       }
     },
     methods: {
+      /** 获取供应商下拉列表 */
+      getcompList() {
+        selectCompList().then(response => {
+          // console.log("获取供应商下拉列表",response);
+          this.compList = response.data;
+        });
+      },
       handleResetSearch() {
         this.listQuery = Object.assign({}, defaultListQuery);
+        this.getList();
       },
       handleSearchList() {
         this.listQuery.pageNo = 1;

src/views/pms/origin/index.vue

@@ -23,6 +23,16 @@
           <el-form-item label="输入搜索：">
             <el-input v-model="listQuery.keyword" class="input-width" placeholder="生产地名称" clearable></el-input>
           </el-form-item>
+          <el-form-item label="供应商：">
+            <el-select v-model="listQuery.compId" placeholder="全部" clearable>
+              <el-option
+                v-for="item in compList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
     </el-card>
@@ -152,12 +162,14 @@
 <script>
   import {fetchList,createorigin,deleteOrigin,getorigin,updateorigin} from '@/api/origin';
   import {formatDate} from '@/utils/date';
+  import {selectCompList} from '@/api/product';
   import {originsave,originupdate,origindelete} from '@/api/permissions'
 
   const defaultListQuery = {
     pageNo: 1,
     pageSize: 5,
-    keyword: null
+    keyword: null,
+    compId:null,
   };
 
   export default {
@@ -167,6 +179,7 @@
         originsave,
         originupdate,
         origindelete,
+        compList:[],
         listQuery: Object.assign({}, defaultListQuery),
         list: null,
         total: null,
@@ -177,6 +190,7 @@
     },
     created() {
       this.getList();
+      this.getcompList();
     },
     filters: {
       formatDateTime(time) {
@@ -188,8 +202,16 @@
       }
     },
     methods: {
+      /** 获取供应商下拉列表 */
+      getcompList() {
+        selectCompList().then(response => {
+          // console.log("获取供应商下拉列表",response);
+          this.compList = response.data;
+        });
+      },
       handleResetSearch() {
         this.listQuery = Object.assign({}, defaultListQuery);
+        this.getList();
       },
       handleSearchList() {
         this.listQuery.pageNo = 1;

src/views/pms/product/index.vue

@@ -63,6 +63,16 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="供应商：">
+            <el-select v-model="listQuery.compId" placeholder="全部" clearable>
+              <el-option
+                v-for="item in compList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
     </el-card>
@@ -293,12 +303,13 @@
     updateRecommendStatus,
     updatePublishStatus,
     updateVerifyStatus,
-  } from '@/api/product'
-  import {fetchList as fetchSkuStockList,update as updateSkuStockList} from '@/api/skuStock'
-  import {fetchList as fetchProductAttrList} from '@/api/productAttr'
-  import {fetchList as fetchBrandList} from '@/api/brand'
-  import {fetchListWithChildren} from '@/api/productCate'
-  import {verifyproduct,delproduct,updateproduct,createproduct} from '@/api/permissions'
+  } from '@/api/product';
+  import {fetchList as fetchSkuStockList,update as updateSkuStockList} from '@/api/skuStock';
+  import {fetchList as fetchProductAttrList} from '@/api/productAttr';
+  import {fetchList as fetchBrandList} from '@/api/brand';
+  import {fetchListWithChildren} from '@/api/productCate';
+  import {selectCompList} from '@/api/product';
+  import {verifyproduct,delproduct,updateproduct,createproduct} from '@/api/permissions';
   const defaultListQuery = {
     keyword: null,
     pageNum: 1,
@@ -307,7 +318,8 @@
     verifyStatus: null,
     productSn: null,
     productCategoryId: null,
-    brandId: null
+    brandId: null,
+    compId:null,
   };
   export default {
     name: "productList",
@@ -318,6 +330,7 @@
         updateproduct,
         delproduct,
         verifyproduct,
+        compList:[],
         editSkuInfo:{
           dialogVisible:false,
           productId:null,
@@ -391,6 +404,7 @@
       this.getList();
       this.getBrandList();
       this.getProductCateList();
+      this.getcompList();
     },
     watch: {
       selectProductCateValue: function (newValue) {
@@ -412,6 +426,13 @@
       }
     },
     methods: {
+      /** 获取供应商下拉列表 */
+      getcompList() {
+        selectCompList().then(response => {
+          // console.log("获取供应商下拉列表",response);
+          this.compList = response.data;
+        });
+      },
       getProductSkuSp(row, index) {
         let spData = JSON.parse(row.spData);
         if(spData!=null&&index<spData.length){
@@ -589,6 +610,7 @@
       handleResetSearch() {
         this.selectProductCateValue = [];
         this.listQuery = Object.assign({}, defaultListQuery);
+        this.getList();
       },
       handleDelete(index, row){
         this.$confirm('是否要进行删除操作?', '提示', {