Kaynağa Gözat

订单管理、商品管理

liuyifan 5 yıl önce
ebeveyn
işleme
3365260ac4

+ 6 - 1
CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/addOrEdit.vue

@@ -13,12 +13,12 @@
13 13
               v-model="parentids"
14 14
               :options="commodityTypeLists"
15 15
               :props="typeDropProps"
16
-              placeholder="请选择商品分类"
17 16
               clearable
18 17
               filterable
19 18
               change-on-select
20 19
               @change="commodityTypeChange"
21 20
               ref="myCascader"
21
+              :placeholder="updateForm.categoriesPlaceholder"
22 22
               style="width: 100%;"/>
23 23
           </el-form-item>
24 24
         </el-col>
@@ -242,6 +242,9 @@ export default {
242 242
           message: '请输入拼音简写',
243 243
         }],
244 244
       },
245
+      updateForm: {
246
+        categoriesPlaceholder: "请选择商品分类"
247
+      },
245 248
       loading: false,
246 249
       addEditJudgment: false, //商品id编辑不能修改
247 250
     }
@@ -306,10 +309,12 @@ export default {
306 309
       }
307 310
       getCommodityList(params).then(response => {
308 311
         if (response.state.toLowerCase() === 'success') {
312
+          let parentidsArray = []
309 313
           const res = response.data.Rows[0];
310 314
           this.ruleForm.ProductId = res.F_ProductId //商品id
311 315
           this.ruleForm.ClassId = res.F_ClassId //商品类型id
312 316
           this.ruleForm.ClassName = res.F_ClassName //商品类型名称
317
+          this.updateForm.categoriesPlaceholder = res.F_ClassName
313 318
           this.ruleForm.ProductName = res.F_ProductName //商品名称
314 319
           this.ruleForm.ProductShortName = res.F_ProductShortName //副标题
315 320
           this.ruleForm.ProductNumber = res.F_ProductNumber //款号

+ 9 - 11
CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/searchFilter.vue

@@ -1,14 +1,7 @@
1 1
 <template>
2 2
     <div class="filter-container">
3 3
       <el-input v-model="searchDatas.productId" placeholder="商品id" class="filter-item"></el-input>
4
-      <el-select v-model="searchDatas.className" placeholder="请选择商品类型" class="filter-item" clearable value-key="F_ClassId" @change="commodityTypeChange">
5
-        <el-option
6
-          v-for="item in commodityTypeLists"
7
-          :key="item.F_ClassId"
8
-          :label="item.F_ClassName"
9
-          :value="item">
10
-        </el-option>
11
-      </el-select>
4
+      <el-cascader v-model="parentids" :options="commodityTypeLists" :props="typeDropProps" clearable filterable change-on-select @change="commodityTypeChange" ref="myCascader" placeholder="请选择商品分类"></el-cascader>
12 5
       <el-input v-model="searchDatas.productName" placeholder="商品名称" class="filter-item"></el-input>
13 6
       <el-input v-model="searchDatas.pinyinShort" placeholder="拼音缩写" class="filter-item"></el-input>
14 7
       <el-input v-model="searchDatas.productNumber" placeholder="商品编码" class="filter-item"></el-input>
@@ -63,7 +56,12 @@ export default {
63 56
   },
64 57
   data() {
65 58
     return {
66
-      provinceCityDatas: [], // 省市下拉数据
59
+      parentids:[],
60
+      // 自定义菜单下拉数据的key值
61
+      typeDropProps: {
62
+        value: 'id',
63
+        label: 'text'
64
+      },
67 65
       props: {
68 66
         // 自定义省市下拉数据的key值
69 67
         value: 'code',
@@ -175,8 +173,8 @@ export default {
175 173
       })
176 174
     },
177 175
     commodityTypeChange(item) {
178
-      this.searchDatas.classId = item.F_ClassId
179
-      this.searchDatas.className = item.F_ClassName
176
+      this.searchDatas.classId = this.parentids[this.parentids.length - 1]
177
+      this.searchDatas.className = this.$refs['myCascader'].currentLabels[this.parentids.length - 1]
180 178
     },
181 179
   }
182 180
 }

+ 4 - 3
CallCenterWeb.UI/src/views/commodityManagement/commodityList/index.vue

@@ -5,8 +5,8 @@
5 5
       <el-table-column type="selection" width="40"></el-table-column>
6 6
       <el-table-column prop="F_ClassName" label="商品类型" align="center" fixed width=""></el-table-column>
7 7
       <el-table-column prop="F_ProductName" label="商品名称" align="center" fixed width=""></el-table-column>
8
-      <el-table-column prop="F_Stock" label="商品数量(仓库一)" align="center" fixed width=""></el-table-column>
9
-      <el-table-column prop="F_Stock1" label="商品数量(仓库二)" align="center" fixed width=""></el-table-column>
8
+      <el-table-column prop="F_ProductNumber" label="款号" align="center" fixed width=""></el-table-column>
9
+      <el-table-column prop="F_Tag" label="商品标签" align="center" fixed width=""></el-table-column>
10 10
       <el-table-column prop="F_OnSaleBegin" label="上架时间" align="center" fixed width=""></el-table-column>
11 11
       <el-table-column prop="F_OnSaleEnd" label="下架时间" align="center" fixed width=""></el-table-column>
12 12
       <el-table-column label="操作" width="" align="center" class-name="oparate_btn" fixed="right">
@@ -92,6 +92,7 @@ export default {
92 92
           ProductShortName: this.searchDatas.productShortName,
93 93
           tag: this.searchDatas.tag,
94 94
           issale: -1,
95
+          Stock: 0, //是否显示库存 0-不显示 1-显示
95 96
         }
96 97
         getCommodityList(params).then(response => {
97 98
           this.loading = false
@@ -162,7 +163,7 @@ export default {
162 163
         getCommodityType(data).then(response => {
163 164
           this.loading = false
164 165
           if (response.state.toLowerCase() === 'success') {
165
-            this.commodityTypeLists = response.data.Rows
166
+            this.commodityTypeLists = response.data
166 167
           }
167 168
         })
168 169
         resolve()

+ 83 - 0
CallCenterWeb.UI/src/views/commodityManagement/commodityStock/components/searchFilter.vue

@@ -0,0 +1,83 @@
1
+<template>
2
+    <div class="filter-container">
3
+      <el-input v-model="searchDatas.productId" placeholder="商品id" class="filter-item"></el-input>
4
+      <el-cascader v-model="parentids" :options="commodityTypeLists" :props="typeDropProps" clearable filterable @change="commodityTypeChange" ref="myCascader" placeholder="请选择商品分类"></el-cascader>
5
+      <el-input v-model="searchDatas.productName" placeholder="商品名称" class="filter-item"></el-input>
6
+      <el-input v-model="searchDatas.pinyinShort" placeholder="拼音缩写" class="filter-item"></el-input>
7
+      <el-input v-model="searchDatas.productNumber" placeholder="商品编码" class="filter-item"></el-input>
8
+      <el-input v-model="searchDatas.productShortName" placeholder="商品副标题" class="filter-item"></el-input>
9
+      <el-input v-model="searchDatas.tag" placeholder="商品标签" class="filter-item"></el-input>
10
+      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
11
+    </div>
12
+</template>
13
+
14
+<script>
15
+import { pickerOptions } from '@/utils'
16
+
17
+export default {
18
+  name: 'SearchFilter',
19
+  props: {
20
+    searchDatas: {
21
+      required: true,
22
+      type: Object,
23
+      default() {
24
+        return {
25
+          productId: '', //商品id
26
+          classId: '', //商品类型id
27
+          className: '', //商品类型
28
+          productName: '', //商品名称
29
+          pinyinShort: '', //拼音缩写
30
+          productNumber: '', //商品编码
31
+          productShortName: '', //商品副标题
32
+          tag: '', //商品标签
33
+        }
34
+      }
35
+    },
36
+    selectedId: Array,
37
+    commodityTypeLists: Array,
38
+  },
39
+  data() {
40
+    return {
41
+      parentids:[],
42
+      // 自定义菜单下拉数据的key值
43
+      typeDropProps: {
44
+        value: 'id',
45
+        label: 'text'
46
+      },
47
+      props: {
48
+        // 自定义省市下拉数据的key值
49
+        value: 'code',
50
+        label: 'name',
51
+        children: 'entityJson'
52
+      },
53
+      pickerOptions // 日期数据
54
+    }
55
+  },
56
+  created() {
57
+  },
58
+  methods: {
59
+    btn_search() {
60
+      this.$emit('search', this.searchDatas)
61
+    },
62
+    btn_export() {
63
+      this.$emit('export', this.searchDatas)
64
+    },
65
+    btn_deletes() {
66
+      this.$emit('delorders')
67
+    },
68
+    commodityTypeChange(item) {
69
+      this.searchDatas.classId = this.parentids[this.parentids.length - 1]
70
+      this.searchDatas.className = this.$refs['myCascader'].currentLabels[this.parentids.length - 1]
71
+    },
72
+  }
73
+}
74
+</script>
75
+
76
+<style rel="stylesheet/scss" scoped>
77
+.filter-container .filter-item.el-select{
78
+  margin-right: 10px;
79
+}
80
+.filter-container .filter-item.el-date-editor{
81
+  margin-right: 10px;
82
+}
83
+</style>

+ 133 - 0
CallCenterWeb.UI/src/views/commodityManagement/commodityStock/index.vue

@@ -0,0 +1,133 @@
1
+<template>
2
+  <div class="app-container">
3
+    <search-filter :search-datas.sync="searchDatas" :selectedId="selectedId" :commodityTypeLists="commodityTypeLists" showadd @search="btn_search" @delorders="btn_search"></search-filter>
4
+    <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
5
+      <el-table-column type="selection" width="40"></el-table-column>
6
+      <el-table-column prop="F_ClassName" label="商品类型" align="center" fixed width=""></el-table-column>
7
+      <el-table-column prop="F_ProductName" label="商品名称" align="center" fixed width=""></el-table-column>
8
+      <el-table-column prop="F_Stock" label="商品数量(仓库一)" align="center" fixed width=""></el-table-column>
9
+      <el-table-column prop="F_Stock1" label="商品数量(仓库二)" align="center" fixed width=""></el-table-column>
10
+      <el-table-column prop="F_OnSaleBegin" label="上架时间" align="center" fixed width=""></el-table-column>
11
+      <el-table-column prop="F_OnSaleEnd" label="下架时间" align="center" fixed width=""></el-table-column>
12
+    </el-table>
13
+    <pagination
14
+      v-show="pageParams.total > 0"
15
+      :total="pageParams.total"
16
+      :pageindex.sync="pageParams.pageindex"
17
+      :pagesize.sync="pageParams.pagesize"
18
+      class="pagination"
19
+      @pagination="getList" />
20
+  </div>
21
+</template>
22
+
23
+<script>
24
+
25
+import { getCommodityList, deleteCommodityList } from '@/api/commodityManagement/commodityList'
26
+import { getCommodityType } from '@/api/commodityManagement/commodityType'
27
+import SearchFilter from './components/searchFilter'
28
+import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
29
+
30
+export default {
31
+  name: 'CommodityStock',
32
+  components: {
33
+    Pagination,
34
+    SearchFilter,
35
+  },
36
+  data() {
37
+    return {
38
+      loading: false,
39
+      label_name: '',//标签名
40
+      pageParams: {
41
+        pageindex: 1, // 当前第几页
42
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
43
+        total: 0 // 总共多少数据
44
+      },
45
+      dataLists: [], // 列表数据
46
+      searchDatas: {
47
+        productId: '', //商品id
48
+        classId: '', //商品类型id
49
+        className: '', //商品类型
50
+        productName: '', //商品名称
51
+        pinyinShort: '', //拼音缩写
52
+        productNumber: '', //商品编码
53
+        productShortName: '', //商品副标题
54
+        tag: '', //商品标签
55
+      },
56
+      multipleSelection: [], // 选中的数据
57
+      selectedId: [], //选中的id
58
+      commodityTypeLists: [], //商品类型下拉
59
+    }
60
+  },
61
+  created() {
62
+    this.getList()
63
+    this.getCommodityTypeSelect()
64
+    document.onkeyup = (e) => {
65
+      if (e.keyCode === 13) {
66
+        this.getList()
67
+      }
68
+    }
69
+  },
70
+  methods: {
71
+    getList() {
72
+      this.loading = true
73
+      return new Promise(resolve => {
74
+        const params = {
75
+          pageindex: this.pageParams.pageindex, // int 第几页,
76
+          pagesize: this.pageParams.pagesize, // int 每页几条信息,
77
+          ProductId: this.searchDatas.productId == '' ? '' : this.searchDatas.productId,
78
+          ClassId: this.searchDatas.classId == '' ? 0 : this.searchDatas.classId,
79
+          ClassName: this.searchDatas.className,
80
+          ProductName: this.searchDatas.productName,
81
+          PinyinShort: this.searchDatas.pinyinShort,
82
+          ProductNumber: this.searchDatas.productNumber,
83
+          ProductShortName: this.searchDatas.productShortName,
84
+          tag: this.searchDatas.tag,
85
+          issale: -1,
86
+          Stock: 1, //是否显示库存 0-不显示 1-显示
87
+        }
88
+        getCommodityList(params).then(response => {
89
+          this.loading = false
90
+          if (response.state.toLowerCase() === 'success') {
91
+            this.pageParams.total = response.data.Totals
92
+            this.dataLists = response.data.Rows
93
+          }
94
+        })
95
+        resolve()
96
+      })
97
+    },
98
+    btn_search() {
99
+      this.pageParams.pageindex = 1
100
+      this.getList()
101
+    },
102
+    changeSelects(selection) {
103
+      const ids = []
104
+      this.multipleSelection = selection
105
+      for (let i=0; i<this.multipleSelection.length; i++) {
106
+        ids.push(this.multipleSelection[i].id)
107
+      }
108
+      this.selectedId = ids;
109
+    },
110
+    getCommodityTypeSelect() {
111
+      this.loading = true
112
+      return new Promise(resolve => {
113
+        const data = {
114
+          pageindex: 1, // int 第几页
115
+          pagesize: 300, // int 每页几条信息
116
+          ParentId: 0,
117
+        }
118
+        getCommodityType(data).then(response => {
119
+          this.loading = false
120
+          if (response.state.toLowerCase() === 'success') {
121
+            this.commodityTypeLists = response.data
122
+          }
123
+        })
124
+        resolve()
125
+      })
126
+    },
127
+  }
128
+}
129
+</script>
130
+
131
+<style rel="stylesheet/scss" lang="scss" scoped>
132
+
133
+</style>

+ 49 - 5
CallCenterWeb.UI/src/views/custodianManagement/orderListCustodian/index.vue

@@ -11,8 +11,8 @@
11 11
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
12 12
       <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
13 13
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
14
-      <el-button v-permission="'HY_sorting'" type="primary" class="filter-item" @click="btn_export">批量分拣</el-button>
15
-      <el-button v-permission="'HY_ship'" type="primary" class="filter-item" @click="btn_export">批量发货</el-button>
14
+      <el-button v-permission="'HY_sorting'" type="primary" class="filter-item" @click="btn_batch_sorting">批量分拣</el-button>
15
+      <el-button v-permission="'HY_ship'" type="primary" class="filter-item" @click="btn_bulk_shipping">批量发货</el-button>
16 16
     </div>
17 17
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
18 18
       <el-tab-pane label="全部" name="-2"></el-tab-pane>
@@ -124,7 +124,7 @@ export default {
124 124
       },
125 125
       dataLists: [], // 列表数据
126 126
       multipleSelection: [], // 选中的数据
127
-      selectedId: [], // 选中的数据的id
127
+      selectedIds: [], // 选中的数据的id
128 128
       orderType: [],//订单类型
129 129
     };
130 130
   },
@@ -270,14 +270,58 @@ export default {
270 270
           });          
271 271
       });
272 272
     },
273
+    //批量分拣
274
+    btn_batch_sorting() {
275
+      if (this.selectedIds.length <= 0) {
276
+        this.$message({
277
+          message: '请选中数据!',
278
+          type: 'warning'
279
+        });
280
+      }
281
+      for (let i = 0; i <  this.selectedIds.length; i++) {
282
+        const data = {
283
+          orderid: this.selectedIds[i],
284
+          state: 5, //订单状态 —— 6 分拣
285
+          remark: '', //备注
286
+        }
287
+        checkOrderCustodian(data).then(response => {
288
+          if (response.state.toLowerCase() === 'success') {
289
+            this.getList()
290
+            this.$message.success('发货成功!')
291
+          }
292
+        })
293
+      }
294
+    },
295
+    //批量发货
296
+    btn_bulk_shipping() {
297
+      if (this.selectedIds.length <= 0) {
298
+        this.$message({
299
+          message: '请选中数据!',
300
+          type: 'warning'
301
+        });
302
+      }
303
+      for (let i = 0; i <  this.selectedIds.length; i++) {
304
+        const data = {
305
+          orderid: this.selectedIds[i],
306
+          state: 6, //订单状态 —— 6 发货
307
+          remark: '', //备注
308
+        }
309
+        checkOrderCustodian(data).then(response => {
310
+          if (response.state.toLowerCase() === 'success') {
311
+            this.getList()
312
+            this.$message.success('发货成功!')
313
+          }
314
+        })
315
+      }
316
+    },
273 317
     //选择多个
274 318
     handleSelectionChange(val) {
275 319
       const ids = []
276 320
       this.multipleSelection = val
277 321
       for (let i=0; i<this.multipleSelection.length; i++) {
278
-        ids.push(this.multipleSelection[i].id)
322
+        ids.push(this.multipleSelection[i].F_Id)
279 323
       }
280
-      this.selectedPhone = ids;
324
+      this.selectedIds = ids;
281 325
     }, 
282 326
   }
283 327
 };

+ 2 - 0
CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerService/index.vue

@@ -173,6 +173,8 @@ export default {
173 173
           F_TrackingNo: this.searchData.trackingNo, //运单号
174 174
           SearchStartTime: this.searchData.searchTime[0], //添加开始时间
175 175
           SearchEndTime: this.searchData.searchTime[1], //添加结束时间
176
+          F_IsExpress: -2, //-2全部 0客服未分配快递 1已分配
177
+          F_PayState: -2, //支付状态-2 全部0待回款 1已完成 2待退款 3已完成
176 178
         };
177 179
         getOrderListCustomerService(params).then(response => {
178 180
           this.loading = false;

+ 111 - 72
CallCenterWeb.UI/src/views/orderManagement/createOrder/index.vue

@@ -29,6 +29,92 @@
29 29
               </el-col>
30 30
             </el-row>
31 31
             <el-row>
32
+              <el-col :span='8'>
33
+                <el-form-item label="商品分类" prop="className">
34
+                  <el-cascader
35
+                    v-model="parentids"
36
+                    :options="commodityTypeLists"
37
+                    :props="typeDropProps"
38
+                    placeholder="请选择商品分类"
39
+                    clearable
40
+                    filterable
41
+                    change-on-select
42
+                    class="form_select"
43
+                    @change="commodityTypeChange">
44
+                  </el-cascader>
45
+                </el-form-item>
46
+              </el-col>
47
+              <el-col :span='8'>
48
+                <el-form-item label="商品" prop="productName" >
49
+                  <el-select v-model="commoditySearchData.productName" class="form_select" value-key="F_ProductId" clearable placeholder="请选择订单类型" @change="commodityListChange">
50
+                    <el-option
51
+                      v-for="item in commodityListLists"
52
+                      :key="item.F_ProductId"
53
+                      :label="item.F_ProductName"
54
+                      :value="item">
55
+                    </el-option>
56
+                  </el-select>
57
+                </el-form-item>
58
+              </el-col>
59
+              <el-col :span='4'>
60
+                <el-form-item label="商品数量" prop="num" >
61
+                  <el-input-number v-model="commoditySearchData.num" :min="1" label="描述文字"></el-input-number>
62
+                </el-form-item>
63
+              </el-col>
64
+            </el-row>
65
+            <el-row>
66
+              <el-col :span='8'>
67
+                <el-form-item label="库存(一)" prop="stockQuantity" >
68
+                  <el-input v-model="stockQuantity.stockOne" placeholder="库存(一)" disabled/>
69
+                </el-form-item>
70
+              </el-col>
71
+              <el-col :span='8'>
72
+                <el-form-item label="库存(二)" prop="stockQuantity" >
73
+                  <el-input v-model="stockQuantity.stockTwo" placeholder="库存(二)" disabled/>
74
+                </el-form-item>
75
+              </el-col>
76
+            </el-row>
77
+            <el-row>
78
+              <el-form-item>
79
+                <el-button type="primary" @click="addCommodity">添加商品</el-button>
80
+                <el-button type="primary" @click="getActivityAccountList">获取优惠</el-button>
81
+              </el-form-item>
82
+            </el-row>
83
+            <el-row>
84
+              <el-col :span='24'>
85
+                <el-form-item label="商品">
86
+                  <el-table :data="commodityTableData" stripe style="width: 100%">
87
+                    <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
88
+                    <el-table-column prop="F_Count" label="商品数量" align="center" ></el-table-column>
89
+                    <el-table-column label="操作" align="center">
90
+                      <template slot-scope="scope">
91
+                        <el-button type="text" @click="btn_deleteCommodity(scope.row)">删除</el-button>
92
+                      </template>
93
+                    </el-table-column>
94
+                  </el-table>
95
+                </el-form-item>
96
+              </el-col>
97
+            </el-row>
98
+            <el-row>
99
+            </el-row>
100
+            <el-row>
101
+              <el-col :span='24'>
102
+                <el-form-item label="优惠">
103
+                  <el-table :data="activityAccountData" stripe style="width: 100%" @selection-change="activityAccountSelectionChange">
104
+                    <el-table-column type="selection" width="55"></el-table-column>
105
+                    <el-table-column label="活动类型" align="center">
106
+                      <template slot-scope="scope">
107
+                        {{ scope.row.type | activityAccountTypeFilter }}
108
+                      </template>
109
+                    </el-table-column>
110
+                    <el-table-column prop="money" label="优惠金额" align="center"></el-table-column>
111
+                    <el-table-column prop="gift" label="赠品" align="center"></el-table-column>
112
+                  </el-table>
113
+                </el-form-item>
114
+              </el-col>
115
+            </el-row>
116
+
117
+            <el-row>
32 118
               <el-col :span='12'>
33 119
                 <el-form-item label="订单类型" prop="F_Type" >
34 120
                   <el-select v-model="ruleForm.F_Type" class="form_select" filterable clearable placeholder="请选择订单类型">
@@ -172,78 +258,6 @@
172 258
                 </el-form-item>
173 259
               </el-col>
174 260
             </el-row>
175
-            <el-row>
176
-              <el-col :span='8'>
177
-                <el-form-item label="商品分类" prop="className">
178
-                  <el-cascader
179
-                    v-model="parentids"
180
-                    :options="commodityTypeLists"
181
-                    :props="typeDropProps"
182
-                    placeholder="请选择商品分类"
183
-                    clearable
184
-                    filterable
185
-                    change-on-select
186
-                    @change="commodityTypeChange"
187
-                    style="width: 100%;"/>
188
-                </el-form-item>
189
-              </el-col>
190
-              <el-col :span='8'>
191
-                <el-form-item label="商品" prop="productName" >
192
-                  <el-select v-model="commoditySearchData.productName" class="filter-item" value-key="F_ProductId" clearable placeholder="请选择订单类型" @change="commodityListChange">
193
-                    <el-option
194
-                      v-for="item in commodityListLists"
195
-                      :key="item.F_ProductId"
196
-                      :label="item.F_ProductName"
197
-                      :value="item">
198
-                    </el-option>
199
-                  </el-select>
200
-                </el-form-item>
201
-              </el-col>
202
-              <el-col :span='8'>
203
-                <el-form-item label="商品数量" prop="num" >
204
-                  <el-input-number v-model="commoditySearchData.num" :min="1" label="描述文字"></el-input-number>
205
-                </el-form-item>
206
-              </el-col>
207
-            </el-row>
208
-            <el-row>
209
-              <el-form-item>
210
-                <el-button type="primary" @click="addCommodity">添加商品</el-button>
211
-                <el-button type="primary" @click="getActivityAccountList">获取优惠</el-button>
212
-              </el-form-item>
213
-            </el-row>
214
-            <el-row>
215
-              <el-col :span='24'>
216
-                <el-form-item label="商品">
217
-                  <el-table :data="commodityTableData" stripe style="width: 100%">
218
-                    <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
219
-                    <el-table-column prop="F_Count" label="商品数量" align="center" ></el-table-column>
220
-                    <el-table-column label="操作" align="center">
221
-                      <template slot-scope="scope">
222
-                        <el-button type="text" @click="btn_deleteCommodity(scope.row)">删除</el-button>
223
-                      </template>
224
-                    </el-table-column>
225
-                  </el-table>
226
-                </el-form-item>
227
-              </el-col>
228
-            </el-row>
229
-            <el-row>
230
-            </el-row>
231
-            <el-row>
232
-              <el-col :span='24'>
233
-                <el-form-item label="优惠">
234
-                  <el-table :data="activityAccountData" stripe style="width: 100%" @selection-change="activityAccountSelectionChange">
235
-                    <el-table-column type="selection" width="55"></el-table-column>
236
-                    <el-table-column label="活动类型" align="center">
237
-                      <template slot-scope="scope">
238
-                        {{ scope.row.type | activityAccountTypeFilter }}
239
-                      </template>
240
-                    </el-table-column>
241
-                    <el-table-column prop="money" label="优惠金额" align="center"></el-table-column>
242
-                    <el-table-column prop="gift" label="赠品" align="center"></el-table-column>
243
-                  </el-table>
244
-                </el-form-item>
245
-              </el-col>
246
-            </el-row>
247 261
             <el-form-item label="备注" prop="F_Remark">
248 262
               <el-input :autosize="{ minRows: 4}" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入备注"/>
249 263
             </el-form-item>
@@ -323,6 +337,10 @@ export default {
323 337
       activityAccountData: [], //活动核算数据
324 338
       orderType: [],//订单类型
325 339
       pickerOptions, // 日期数据
340
+      stockQuantity: { //库存数量
341
+        stockOne: '',
342
+        stockTwo: '',
343
+      },
326 344
       ruleForm: {
327 345
         F_Customer: '', //是 sring 客户姓名
328 346
         F_CustomerPhone: '', //是 sting 手机号码
@@ -675,6 +693,7 @@ export default {
675 693
           ProductShortName: '',
676 694
           tag: '',
677 695
           issale: 1,
696
+          Stock: 0, //0不显示库存
678 697
         }
679 698
         getCommodityList(params).then(response => {
680 699
           this.loading = false
@@ -689,9 +708,29 @@ export default {
689 708
       this.commoditySearchData.classId = this.parentids[this.parentids.length - 1]
690 709
       this.getCommodityListSelect()
691 710
     },
711
+    getCommodityDetail() {
712
+      // this.loading = true
713
+      return new Promise(resolve => {
714
+        const params = {
715
+          ProductId: this.commoditySearchData.productId,
716
+          tag: '',
717
+          issale: -1,
718
+          Stock: 1, //1显示库存
719
+        }
720
+        getCommodityList(params).then(response => {
721
+          // this.loading = false
722
+          if (response.state.toLowerCase() === 'success') {
723
+            this.stockQuantity.stockOne = response.data.Rows[0].F_Stock
724
+            this.stockQuantity.stockTwo = response.data.Rows[0].F_Stock1
725
+          }
726
+        })
727
+        resolve()
728
+      })
729
+    },
692 730
     commodityListChange(item) {
693 731
       this.commoditySearchData.productId = item.F_ProductId
694 732
       this.commoditySearchData.productName = item.F_ProductName
733
+      this.getCommodityDetail()
695 734
     },
696 735
     addCommodity() {
697 736
       if (this.commoditySearchData.productName === ''){

+ 1 - 0
CallCenterWeb.UI/src/views/orderManagement/orderList/edit.vue

@@ -384,6 +384,7 @@ export default {
384 384
           this.ruleForm.F_ExpressFee = this.ruleForm.F_ExpressFee == '' ? 0 : this.ruleForm.F_ExpressFee
385 385
           this.ruleForm.F_RealPrice = this.ruleForm.F_RealPrice == '' ? 0 : this.ruleForm.F_RealPrice
386 386
           this.ruleForm.F_Score = this.ruleForm.F_Score == '' ? 0 : this.ruleForm.F_Score
387
+          console.log("111", JSON.stringify(this.ruleForm))
387 388
           // 编辑
388 389
           editOrder(this.ruleForm)
389 390
             .then(response => {

BIN
CallCenterWeb.UI/static/xls/importProducts.xlsx