diff --git a/src/views/dev/DeptDeviceDetail.vue b/src/views/dev/DeptDeviceDetail.vue
index e2490c08..1d9ff99d 100644
--- a/src/views/dev/DeptDeviceDetail.vue
+++ b/src/views/dev/DeptDeviceDetail.vue
@@ -174,6 +174,22 @@
>
+
+
+
+
+
+
+
+
import deviceModifyDialog from "@/views/dev/devInfoEdit.vue";
+import deviceFinanceModifyDialog from "@/views/dev/deviceFinanceModifyDialog.vue";
+import deviceSubModifyDialog from "@/views/dev/deviceSubModifyDialog.vue";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getDeptListByUser} from "@/api/auth/authDept";
import {getDeptDeviceList, deleteDeptDevice, printOrder, verifyTemplateFile} from "@/api/dev/deptDevice";
@@ -590,10 +608,12 @@ export default {
inspectSetModifyDialog,
DeviceModelDetail,
deviceModifyDialog,
+ deviceFinanceModifyDialog,
invDeviceUserEditDialog,
invDeviceUsageEditDialog,
invDeviceInspectEditDialog,
invDeviceCheckEditDialog,
+ deviceSubModifyDialog
},
created() {
this.filterQuery = this.rowData
diff --git a/src/views/dev/devInfoEdit.vue b/src/views/dev/devInfoEdit.vue
index 342aee82..1008403a 100644
--- a/src/views/dev/devInfoEdit.vue
+++ b/src/views/dev/devInfoEdit.vue
@@ -1,7 +1,7 @@
-
+
-
+
@@ -29,7 +29,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
-->
-
+
@@ -66,13 +66,13 @@
-
+
-
+
@@ -80,21 +80,21 @@
-
-
+
+
-
-
+
+
-
-
+
+
-->
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -211,6 +215,7 @@ import {getDeptListByUser} from "@/api/auth/authDept";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {listDeptUser} from "@/api/system/deptUser";
import {genDeviceCode} from "@/api/dev/deviceInfoApi";
+import {getYbHcflDetail,disableUdi, removeDiRl, removeRl, thirdSysDetail, updatetSingleUdiInfo} from "@/api/basic/product/udiRelevance";
export default {
props: {
@@ -228,6 +233,7 @@ export default {
}
},
name: "deptDeviceModifyDialog",
+ dicts: ['device_source_type'],
data() {
return {
deptList: [],
@@ -251,6 +257,27 @@ export default {
};
},
methods: {
+ getYbHcData(){
+ let query = {
+ specificationCode: this.formData.ybbm
+ };
+ getYbHcflDetail(query).then((response) => {
+ if (response.code == 20000) {
+ this.ybHcflDetail = response.data
+ this.formData.catalogname1 = this.ybHcflDetail.catalogname1
+ this.formData.catalogname2 = this.ybHcflDetail.catalogname2
+ this.formData.catalogname3 = this.ybHcflDetail.catalogname3
+ this.$forceUpdate();
+ }else {
+ this.formData.catalogname1 = ""
+ this.formData.catalogname2 = ""
+ this.formData.catalogname3 = ""
+ this.$forceUpdate();
+ }
+ }).catch(() => {
+ })
+
+ },
supChange(val) {
this.formData.supName = this.maintainsList.find(item => item.id == val).name
this.formData.supId = val
@@ -311,6 +338,14 @@ export default {
this.rowData.supName = this.formData.supName;
this.rowData.supId = this.formData.supId;
this.rowData.remark = this.formData.remark;
+ this.rowData.ybbm = this.formData.ybbm;
+ this.rowData.catalogname1 = this.formData.catalogname1;
+ this.rowData.catalogname2 = this.formData.catalogname2;
+ this.rowData.catalogname3 = this.formData.catalogname3;
+ this.rowData.catalogCode = this.formData.catalogCode;
+ this.rowData.catalogCode1 = this.formData.catalogCode1;
+ this.rowData.catalogCode2 = this.formData.catalogCode2;
+ this.rowData.catalogCode3 = this.formData.catalogCode3;
this.editSaveDev();
}
})
@@ -334,6 +369,19 @@ export default {
})
},
},
+ directives: {
+ 'debounce-input': {
+ inserted(el, binding) {
+ let timeout
+ el.addEventListener('input', () => {
+ clearTimeout(timeout)
+ timeout = setTimeout(() => {
+ binding.value()
+ }, parseInt(binding.arg) || 300)
+ })
+ }
+ }
+ },
created() {
console.log(this.rowData);
console.log(this.maintainsList.length);
diff --git a/src/views/dev/deviceFinanceModifyDialog.vue b/src/views/dev/deviceFinanceModifyDialog.vue
new file mode 100644
index 00000000..1a3487f3
--- /dev/null
+++ b/src/views/dev/deviceFinanceModifyDialog.vue
@@ -0,0 +1,438 @@
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 非同级财政拨款:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+ {{ item.employeeName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dev/deviceSubModifyDialog.vue b/src/views/dev/deviceSubModifyDialog.vue
new file mode 100644
index 00000000..1a3487f3
--- /dev/null
+++ b/src/views/dev/deviceSubModifyDialog.vue
@@ -0,0 +1,438 @@
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 非同级财政拨款:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+ {{ item.employeeName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dev/js/deviceChangeOrder.js b/src/views/dev/js/deviceChangeOrder.js
index df505edd..3eb5aa64 100644
--- a/src/views/dev/js/deviceChangeOrder.js
+++ b/src/views/dev/js/deviceChangeOrder.js
@@ -292,6 +292,7 @@ export default {
editSaveDev(row) {
this.curDevRow = row;
this.deviceInfoFlag = false;
+ this.deviceInfoFlag = false;
},
copyRow(index) {