" +
""+printDate+""+
@@ -67,11 +69,11 @@
"
物资名称:"+printObj['zichanmingcheng']+"
"+
"规格:"+guige+"
"+
"型号:"+xinghao+"
"+
- "批次:"+printObj['rukupici']+"数量:"+printObj['total_num']+"
"+
- "批内序号:"+shunxuhao+"
"+
+ "批次:"+printObj['rukupici']+""+(printObj['wuzileixing']==='一物一码'?'同批数量:':'数量:')+""+printObj['total_num']+jiliangdanwei+"
"+
+ ""+(printObj['wuzileixing']==='一物一码'?'批内序号:'+shunxuhao:'')+"
"+
""+
""+
- ""+(gudingzichanbianma?'固定资产编码：'+gudingzichanbianma:'')+"
"+
+ ""+(gudingzichanbianma?'固定资产编码:'+gudingzichanbianma:'')+"
"+
"")
// createCode("#page" + index, printObj)
diff --git a/src/api/stocks-item.js b/src/api/stocks-item.js
index 77faeac..20a4657 100644
--- a/src/api/stocks-item.js
+++ b/src/api/stocks-item.js
@@ -1,5 +1,21 @@
import request from '@/utils/request'
+function customParamsSerializer(params) {
+ let result = ''
+ for (const key in params) {
+ if (params.hasOwnProperty(key)) {
+ if (Array.isArray(params[key])) {
+ params[key].forEach((item, index) => {
+ result += `${key}[${index}][key]=${item.key}&${key}[${index}][op]=${item.op}&${key}[${index}][value]=${item.value}&`
+ })
+ } else {
+ result += `${key}=${params[key]}&`
+ }
+ }
+ }
+ return result.slice(0, -1)
+}
+
// 绑定/更新物资与运维规则的关系
export function saveStocksItem(data) {
return request({
@@ -8,3 +24,39 @@ export function saveStocksItem(data) {
data
})
}
+
+export function index(params, isLoading = false) {
+ return request({
+ method: 'get',
+ url: '/api/admin/stocks-item/index',
+ params,
+ paramsSerializer: customParamsSerializer,
+ isLoading
+ })
+}
+
+export function show(params, isLoading = true) {
+ return request({
+ method: 'get',
+ url: '/api/admin/stocks-item/show',
+ params,
+ isLoading
+ })
+}
+
+export function save(data) {
+ return request({
+ method: 'post',
+ url: '/api/admin/stocks-item/save',
+ data
+ })
+}
+
+export function destroy(params) {
+ return request({
+ method: 'get',
+ url: '/api/admin/stocks-item/destroy',
+ params
+ })
+}
+
diff --git a/src/views/component/inventorysSelect.vue b/src/views/component/inventorysSelect.vue
index a6fafcd..fb414b4 100644
--- a/src/views/component/inventorysSelect.vue
+++ b/src/views/component/inventorysSelect.vue
@@ -158,7 +158,9 @@ export default {
methods: {
async getFenlei() {
const res = await getFenleilist({
- tree: 1
+ tree: 1,
+ sort_type:'ASC',
+ sort_name:'sort'
})
this.fenleiList = this.removeEmptyChildren(res)
},
diff --git a/src/views/component/materialsSelect.vue b/src/views/component/materialsSelect.vue
index d7dbe5f..d3bb036 100644
--- a/src/views/component/materialsSelect.vue
+++ b/src/views/component/materialsSelect.vue
@@ -117,7 +117,9 @@
methods: {
async getFenlei() {
const res = await getFenleilist({
- tree: 1
+ tree: 1,
+ sort_type:'ASC',
+ sort_name:'sort'
})
this.fenleiList = this.removeEmptyChildren(res)
},
diff --git a/src/views/inventorys/components/editStockItem.vue b/src/views/inventorys/components/editStockItem.vue
new file mode 100644
index 0000000..ef8ac7e
--- /dev/null
+++ b/src/views/inventorys/components/editStockItem.vue
@@ -0,0 +1,307 @@
+