diff --git a/src/api/sunVillage_info/registration.js b/src/api/sunVillage_info/registration.js
new file mode 100644
index 00000000..e0099133
--- /dev/null
+++ b/src/api/sunVillage_info/registration.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询零工事项列表
+export function listRegistration(query) {
+ return request({
+ url: '/subcontract/registration/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询零工事项详细
+export function getRegistration(id) {
+ return request({
+ url: '/subcontract/registration/get/' + id,
+ method: 'get',
+ params: arguments[1] || {}
+ })
+}
+
+// 新增零工事项
+export function addRegistration(data) {
+ return request({
+ url: '/subcontract/registration/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改零工事项
+export function updateRegistration(data) {
+ return request({
+ url: '/subcontract/registration/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除零工事项
+export function delRegistration(id) {
+ return request({
+ url: '/subcontract/registration/remove/' + id,
+ method: 'get'
+ })
+}
+
diff --git a/src/api/yinnong/yinnongApproval.js b/src/api/yinnong/yinnongApproval.js
new file mode 100644
index 00000000..025a2738
--- /dev/null
+++ b/src/api/yinnong/yinnongApproval.js
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+
+// 查询用章申请详细
+export function getSeal(id) {
+ return request({
+ url: '/yinnong/seal/get/' + id,
+ method: 'get',
+ params: arguments[1] || {}
+ })
+}
+
+// 查询资产处置详细
+export function getAsset(id) {
+ return request({
+ url: '/yinnong/asset/get/' + id,
+ method: 'get',
+ params: arguments[1] || {}
+ })
+}
+
+// 查询合同签订详细
+export function getContraction(id) {
+ return request({
+ url: '/yinnong/contraction/get/' + id,
+ method: 'get',
+ params: arguments[1] || {}
+ })
+}
+
diff --git a/src/assets/images/sunVillage_info/icon_registration.png b/src/assets/images/sunVillage_info/icon_registration.png
new file mode 100644
index 00000000..c28fbff0
Binary files /dev/null and b/src/assets/images/sunVillage_info/icon_registration.png differ
diff --git a/src/components/common/PagedList.vue b/src/components/common/PagedList.vue
index 9c467bb6..fb997fcc 100644
--- a/src/components/common/PagedList.vue
+++ b/src/components/common/PagedList.vue
@@ -123,6 +123,8 @@ export default {
{
this.setupFinished(true);
}
+ }).catch((err) => {
+ this.setupError(err);
}).finally(() => {
this.setupLoading(false);
this.setupRefreshing(false);
@@ -157,6 +159,13 @@ export default {
if(ok)
this.$emit('finished', this.stateTotal);
},
+ setupError(err) {
+ this.log(`error -> ${err}`);
+ this.stateFinished = true;
+ if(this.stateFinished != this.finished)
+ this.$emit('update:finished', this.stateFinished);
+ this.$emit('error', err);
+ },
setupRefreshing(ok) {
this.log(`refreshing -> ${ok}`);
this.stateRefreshing = ok;
diff --git a/src/components/form/FieldDatePicker.vue b/src/components/form/FieldDatePicker.vue
index f1c76d61..ce2bc5eb 100644
--- a/src/components/form/FieldDatePicker.vue
+++ b/src/components/form/FieldDatePicker.vue
@@ -15,6 +15,7 @@
:required="required"
:label-width="labelWidth || 'auto'"
:input-align="inputAlign || 'left'"
+ :size="size || ''"
>
+
+
+
+
+
+
+
+
diff --git a/src/views/yinnong/bankAgriculture/approval/assetApproval.vue b/src/views/yinnong/bankAgriculture/approval/assetApproval.vue
new file mode 100644
index 00000000..b1a579be
--- /dev/null
+++ b/src/views/yinnong/bankAgriculture/approval/assetApproval.vue
@@ -0,0 +1,236 @@
+
+
+
+
+ 资产处置申请审批
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看附件
+
+
+
+
+
+ 附件
+
+
+
+
+
+
+
+
+ 审批
意见
+
+
+ 同意
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/yinnong/bankAgriculture/approval/contractionApproval.vue b/src/views/yinnong/bankAgriculture/approval/contractionApproval.vue
new file mode 100644
index 00000000..43de6a18
--- /dev/null
+++ b/src/views/yinnong/bankAgriculture/approval/contractionApproval.vue
@@ -0,0 +1,251 @@
+
+
+
+
+ 合同签订申请审批
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看附件
+
+
+
+
+
+ 附件
+
+
+
+
+
+
+
+
+ 审批
意见
+
+
+ 同意
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/yinnong/bankAgriculture/approval/sealApproval.vue b/src/views/yinnong/bankAgriculture/approval/sealApproval.vue
new file mode 100644
index 00000000..68f00b7a
--- /dev/null
+++ b/src/views/yinnong/bankAgriculture/approval/sealApproval.vue
@@ -0,0 +1,240 @@
+
+
+
+
+ 用章事项申请审批
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看附件
+
+
+
+
+
+ 附件
+
+
+
+
+
+
+
+
+ 审批
意见
+
+
+ 同意
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval13.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval13.vue
index 183cd60a..18111186 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval13.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval13.vue
@@ -271,13 +271,11 @@
getFileList(){
let oData= {
tableId: this.$route.query.id,
- tableName: "t_yinnong_majorevent",
+ tableName: 't_yinnong_majorevent',
bizPath: "yinnong",
fileType: "",
}
attachmentList(oData).then(res => {
- console.log(res)
- console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
res.rows.map(r => {
let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
// this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue
index 6792a38b..d2f643b6 100644
--- a/src/views/yinnong/doneCompleted/completedNew.vue
+++ b/src/views/yinnong/doneCompleted/completedNew.vue
@@ -66,7 +66,6 @@
import { getInfo } from "../../../api/login/index";
import {A_myTodoList} from "../../../api/audit/aauditpipeline";
import Cookies from "js-cookie";
- import {registrationList} from "@/api/sunVillage_info/subcontract";
import PagedList from "@/components/common/PagedList.vue";
export default {
@@ -243,6 +242,15 @@
query: { id: item.data.id, taskId: item.id, auditbatchNo: item.auditbatchNo, type: "todo" }
});
break;
+ case 't_sys_seal':
+ this.$router.push({name:'sealApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"todo"}})
+ break;
+ case 't_sys_asset':
+ this.$router.push({name:'assetApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"todo"}})
+ break;
+ case 't_sys_contraction':
+ this.$router.push({name:'contractionApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"todo"}})
+ break;
}
}
},
diff --git a/src/views/yinnong/doneCompleted/doneNew.vue b/src/views/yinnong/doneCompleted/doneNew.vue
index 99e6bab9..fed8262b 100644
--- a/src/views/yinnong/doneCompleted/doneNew.vue
+++ b/src/views/yinnong/doneCompleted/doneNew.vue
@@ -224,6 +224,15 @@
query: { id: item.data.id, taskId: item.id, auditbatchNo: item.auditbatchNo, type: "done" }
});
break;
+ case 't_sys_seal':
+ this.$router.push({name:'sealApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"done"}})
+ break;
+ case 't_sys_asset':
+ this.$router.push({name:'assetApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"done"}})
+ break;
+ case 't_sys_contraction':
+ this.$router.push({name:'contractionApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"done"}})
+ break;
}
}
},
diff --git a/src/views/yinnong/homestead/homeApplication/applicationGsList.vue b/src/views/yinnong/homestead/homeApplication/applicationGsList.vue
index 60e0b048..f55ae03e 100644
--- a/src/views/yinnong/homestead/homeApplication/applicationGsList.vue
+++ b/src/views/yinnong/homestead/homeApplication/applicationGsList.vue
@@ -143,6 +143,8 @@
}
this.total += response.rows.length;
this.finished = this.total >= response.total;
+ }).catch(() => {
+ this.finished = true;
}).finally(() => {
this.loading = false;
this.refreshing = false;
diff --git a/src/views/yinnong/homestead/homeApplication/applicationList.vue b/src/views/yinnong/homestead/homeApplication/applicationList.vue
index 8bcc46f2..f89883d0 100644
--- a/src/views/yinnong/homestead/homeApplication/applicationList.vue
+++ b/src/views/yinnong/homestead/homeApplication/applicationList.vue
@@ -158,6 +158,8 @@ export default {
}
this.total += response.rows.length;
this.finished = this.total >= response.total;
+ }).catch(() => {
+ this.finished = true;
}).finally(() => {
this.loading = false;
this.refreshing = false;