|
@@ -23,6 +23,7 @@ $(function () {
|
|
|
{label: '商户名称', name: 'merch', index: 'merch', width: 80, align: 'center'},
|
|
|
{label: '门店id', name: 'storeId', index: 'store_id', width: 80, align: 'center'},
|
|
|
{label: '门店名称', name: 'store', index: 'store', width: 80, align: 'center'},
|
|
|
+ {label: '商品名称', name: 'product', index: 'product', width: 80, align: 'center'},
|
|
|
{label: '第三方商户', name: 'thirdMerchSn', index: 'third_merch_sn', width: 80, align: 'center'},
|
|
|
{label: '审核状态', name: 'audit', index: 'audit', width: 80, align: 'center', formatter: function (value) {
|
|
|
if (value == '0') {
|
|
@@ -41,7 +42,9 @@ $(function () {
|
|
|
{label: '修改人', name: 'modifyBy', index: 'modify_by', width: 80, align: 'center'},
|
|
|
{label: '修改时间', name: 'modifyTime', index: 'modify_time', width: 80, align: 'center'},
|
|
|
{label: '审核人', name: 'auditBy', index: 'audit_by', width: 80, align: 'center'},
|
|
|
- {label: '审核时间', name: 'auditTime', index: 'audit_time', width: 80, align: 'center'}],
|
|
|
+ {label: '审核时间', name: 'auditTime', index: 'audit_time', width: 80, align: 'center'},
|
|
|
+ {label: '规格', name: 'specification', index: 'specification', width: 80, align: 'center'},
|
|
|
+ ],
|
|
|
viewrecords: true,
|
|
|
height: 550,
|
|
|
rowNum: 10,
|
|
@@ -80,9 +83,17 @@ let vm = new Vue({
|
|
|
]
|
|
|
},
|
|
|
q: {
|
|
|
- name: ''
|
|
|
+ name: '',
|
|
|
+ orderId:'',
|
|
|
+ type:'',
|
|
|
+ time:'',
|
|
|
+ audit:'',
|
|
|
+ storeId:''
|
|
|
},
|
|
|
uploadData:[],
|
|
|
+ stores:[],
|
|
|
+ stockChangeTypes:[],
|
|
|
+ stockChangeAudits:[]
|
|
|
},
|
|
|
methods: {
|
|
|
query: function () {
|
|
@@ -201,7 +212,7 @@ let vm = new Vue({
|
|
|
vm.showList = true;
|
|
|
let page = $("#jqGrid").jqGrid('getGridParam', 'page');
|
|
|
$("#jqGrid").jqGrid('setGridParam', {
|
|
|
- postData: {'name': vm.q.name},
|
|
|
+ postData: {'name': vm.q.name,'orderId':vm.q.orderId,'type':vm.q.type,'time':vm.q.time,'audit':vm.q.audit,"storeId":vm.q.storeId},
|
|
|
page: page
|
|
|
}).trigger("reloadGrid");
|
|
|
vm.handleReset('formValidate');
|
|
@@ -244,5 +255,23 @@ let vm = new Vue({
|
|
|
return promise; //通过返回一个promis对象解决
|
|
|
|
|
|
}
|
|
|
+ },
|
|
|
+ mounted() {
|
|
|
+ // this.uploadList = this.$refs.upload.fileList;
|
|
|
+ /*$.get("../category/getCategorySelect", function (r) {
|
|
|
+ vm.queryCategories = r.list;
|
|
|
+ });*/
|
|
|
+ $.get("../sys/macro/queryMacrosByValue?value=stockChangeType", function (r) {
|
|
|
+ vm.stockChangeTypes = r.list;
|
|
|
+ });
|
|
|
+ $.get("../sys/macro/queryMacrosByValue?value=stockChangeAudit", function (r) {
|
|
|
+ vm.stockChangeAudits = r.list;
|
|
|
+ });
|
|
|
+ $.get("../store/queryAll", function (r) {
|
|
|
+ vm.stores = r.list;
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
});
|