diff --git a/components/searchselect.vue b/components/searchselect.vue
index 59e57da..1025a45 100644
--- a/components/searchselect.vue
+++ b/components/searchselect.vue
@@ -138,8 +138,11 @@ export default {
toggleSelector() {
if (this.disabled) return
this.showSelector = !this.showSelector
- this.$emit(this.showSelector ? 'open' : 'close')
+ if(this.showSelector && this.filterSelectData.length === 0) {
+ this.resetAndLoad()
}
+ this.$emit(this.showSelector ? 'open' : 'close')
+ },
}
}
diff --git a/pages.json b/pages.json
index f201fab..03ab3d8 100644
--- a/pages.json
+++ b/pages.json
@@ -124,6 +124,20 @@
"navigationBarTitleText" : "供应商审批"
}
},
+ {
+ "path" : "pages/pum/quotation_form",
+ "style" :
+ {
+ "navigationBarTitleText" : "报价单审批"
+ }
+ },
+ {
+ "path" : "pages/asm/assetlogin_form",
+ "style" :
+ {
+ "navigationBarTitleText" : "固定资产审批"
+ }
+ },
{
"path" : "pages/em/repair_form",
"style" :
diff --git a/pages/asm/assetlogin_form.vue b/pages/asm/assetlogin_form.vue
new file mode 100644
index 0000000..e72fede
--- /dev/null
+++ b/pages/asm/assetlogin_form.vue
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+ {{form.keeper_name}}
+
+
+
+
+ {{form.keeper_name}}
+
+
+
+
+
+
+
+
+
+
+ {{ index + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/hrm/empjoin_form.vue b/pages/hrm/empjoin_form.vue
index 2390f59..234920b 100644
--- a/pages/hrm/empjoin_form.vue
+++ b/pages/hrm/empjoin_form.vue
@@ -79,7 +79,6 @@
>
删除
-
diff --git a/pages/pum/quotation_form.vue b/pages/pum/quotation_form.vue
new file mode 100644
index 0000000..7c9e481
--- /dev/null
+++ b/pages/pum/quotation_form.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/utils/api.js b/utils/api.js
index 006890f..db34903 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -102,13 +102,27 @@ export default {
empjoinDelete:(id) => http(`/hrm/empjoin/${id}/`, 'DELETE'),
empjoinUpdate:(id,data) => http(`/hrm/empjoin/${id}/`, 'PUT', data),
//供应商审核
+ supplierauditfList:(data) => http(`/pum/supplieraudit/`, 'GET' , data),
supplierauditCreate:(data) => http(`/pum/supplieraudit/`, 'POST' , data),
supplierauditItem:(id,data) => http(`/pum/supplieraudit/${id}/`, 'GET', data),
supplierauditUpdate:(id,data) => http(`/pum/supplieraudit/${id}/`, 'PUT', data),
+ supplierList:(data) => http(`/pum/supplier/`, 'GET' , data),
+ //报价单审核
+ quotationCreate:(data) => http(`/pum/quotation/`, 'POST' , data),
+ quotationItem:(id,data) => http(`/pum/quotation/${id}/`, 'GET', data),
+ quotationUpdate:(id,data) => http(`/pum/quotation/${id}/`, 'PUT', data),
+ quotationDelete:(id) => http(`/hrm/quotation/${id}/`, 'DELETE'),
//维修申请
repairCreate:(data) => http(`/em/repair/`, 'POST' , data),
repairItem:(id,data) => http(`/em/repair/${id}/`, 'GET', data),
repairDelete:(id) => http(`/em/repair/${id}/`, 'DELETE'),
+ //固定资产申请
+ assetCreate:(data) => http(`/asm/assetlog/`, 'POST' , data),
+ assetItem:(id,data) => http(`/asm/assetlog/${id}/`, 'GET', data),
+ assetDelete:(id) => http(`/asm/assetlog/${id}/`, 'DELETE'),
+ assetUpdate:(id,data) => http(`/asm/assetlog/${id}/`, 'PUT', data),
+ // 固定资产类别
+ assetCateList:(data) => http(`/asm/assetcate/`, 'GET' , data),
//部门列表
deptList:(data) => http(`/system/dept/`, 'GET' , data),
//岗位列表