From f0a1d1428a7a258a5493ad5f6c36161ce377c7b0 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:11 +0800
Subject: [PATCH] 修改cnas
---
src/components/do/a8-measures_deal_risks_opportunities/list_risk_analysis_control_plans.vue | 1
src/components/caorui/ZTTable/index.vue | 18 ++++----
src/components/do/a7-Ensure-results-validity/detailFormDialog.vue | 6 ++
src/main.js | 6 +-
src/components/do/a8-file-handling/DistributionCollectionRecord.vue | 31 +++++++++++++--
src/components/view/a7-quality-control-plan.vue | 2
src/components/do/a8-file-handling/ControlledFileApplication.vue | 6 +-
src/components/do/a8-measures_deal_risks_opportunities/hazard_identification_risk_assessment.vue | 1
src/components/do/a7-method-verification/formDIa.vue | 2
src/assets/api/controller.js | 2
src/components/do/a7-changes-standard-methods/formDIaChange.vue | 2
src/components/view/a7-Ensure-results-validity.vue | 2
12 files changed, 53 insertions(+), 26 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 16b02be..84a6cad 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -867,7 +867,7 @@
getPageResults: "/manageRiskAssessmentResults/getPageResults", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鍒嗛〉
hazardIdentificationAndRiskApproval: "/manageRiskAssessmentResults/hazardIdentificationAndRiskApproval", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鎵瑰噯
dangerousRiskApproval: "/manageRiskAssessmentResults/dangerousRiskApproval", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀹℃壒
- riskAssessmentImport: "manageRiskAssessmentResults/riskAssessmentImport", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀵煎叆
+ riskAssessmentImport: "/manageRiskAssessmentResults/riskAssessmentImport", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀵煎叆
addNewRiskFactors: "/manageRiskAssessmentResults/addNewRiskFactors", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鏂板
removeRiskFactors: "/manageRiskAssessmentResults/removeRiskFactors", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鍒犻櫎
exportHazardFactorIdentification: "/manageRiskAssessmentResults/exportHazardFactorIdentification", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀵煎嚭
diff --git a/src/components/caorui/ZTTable/index.vue b/src/components/caorui/ZTTable/index.vue
index 17864dd..9e7374d 100644
--- a/src/components/caorui/ZTTable/index.vue
+++ b/src/components/caorui/ZTTable/index.vue
@@ -8,19 +8,19 @@
<template>
<div>
<!-- 琛ㄦ牸 -->
- <el-table
- ref="multipleTable"
- v-loading="tableLoading"
- :border="border"
+ <el-table
+ ref="multipleTable"
+ v-loading="tableLoading"
+ :border="border"
:data="tableData"
- :header-cell-style="{ background: '#0e3372', color: '#cccccc' }"
+ :header-cell-style="{ background: '#0e3372', color: '#cccccc' }"
:height="height"
- :highlight-current-row="highlightCurrentRow"
+ :highlight-current-row="highlightCurrentRow"
:row-class-name="rowClassName"
:row-style="rowStyle"
:row-key="rowKey"
stripe
- style="width: 100%; "
+ style="width: 100%; "
tooltip-effect="dark"
@row-click="rowClick"
@current-change="currentChange"
@@ -82,9 +82,9 @@
:disabled="o.disabled ? o.disabled(scope.row) : false"
:icon="o.icon | iconFn(scope.row)"
:plain="o.plain" :size="o.size"
- :style="{ 'color': o.color }"
+ :style="{ 'color': o.color }"
:type="o.type | typeFn(scope.row)"
- @click="o.clickFun(scope.row)">
+ @click.stop="o.clickFun(scope.row)">
{{ o.name }}
</el-button>
<el-upload
diff --git a/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue b/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue
index acac5d6..69ece8f 100644
--- a/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue
+++ b/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue
@@ -13,7 +13,7 @@
<el-col :span="12">
<el-form-item label="璁″垝寮�灞曟椂闂�" prop="plannedTime">
<!-- <el-input v-model="form.plannedTime" size="small" clearable></el-input> -->
- <el-date-picker v-model="form.plannedTime" class="date_box" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
+ <el-date-picker v-model="form.plannedTime" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
size="small" type="date" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -80,6 +80,9 @@
operationType: '',
};
},
+ mounted() {
+
+ },
// 鏂规硶闆嗗悎
methods: {
openDia(type, row) {
@@ -91,6 +94,7 @@
},
searchInfo (row) {
this.form = {...row}
+ console.log('this is current instance', this.form);
},
// 鎻愪氦琛ㄥ崟
submitForm () {
diff --git a/src/components/do/a7-changes-standard-methods/formDIaChange.vue b/src/components/do/a7-changes-standard-methods/formDIaChange.vue
index 23ffef9..46d97d5 100644
--- a/src/components/do/a7-changes-standard-methods/formDIaChange.vue
+++ b/src/components/do/a7-changes-standard-methods/formDIaChange.vue
@@ -216,7 +216,7 @@
<p>鍙傚姞纭浜虹鍚�:</p>
</td>
<td colspan="5">
- <el-select v-model="form.confirmUser" multiple placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-select v-model="form.confirmUser" multiple placeholder="璇烽�夋嫨" size="small" style="width: 100%" :multiple-limit="5">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</td>
diff --git a/src/components/do/a7-method-verification/formDIa.vue b/src/components/do/a7-method-verification/formDIa.vue
index 961d998..4638642 100644
--- a/src/components/do/a7-method-verification/formDIa.vue
+++ b/src/components/do/a7-method-verification/formDIa.vue
@@ -216,7 +216,7 @@
<p>鍙傚姞纭浜虹鍚�:</p>
</td>
<td colspan="5">
- <el-select v-model="form.confirmUser" multiple placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-select v-model="form.confirmUser" multiple placeholder="璇烽�夋嫨" size="small" style="width: 100%" :multiple-limit="5">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</td>
diff --git a/src/components/do/a8-file-handling/ControlledFileApplication.vue b/src/components/do/a8-file-handling/ControlledFileApplication.vue
index 8968abd..fbeddcc 100644
--- a/src/components/do/a8-file-handling/ControlledFileApplication.vue
+++ b/src/components/do/a8-file-handling/ControlledFileApplication.vue
@@ -7,11 +7,11 @@
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.documentCode"
@keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
+ <!-- <div class="search_thing">
<div class="search_label">鐢宠浜猴細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.createUserName"
@keyup.enter.native="refreshTable()"></el-input></div>
- </div>
+ </div> -->
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
@@ -188,7 +188,7 @@
componentData: {
entity: {
documentCode: null,
- createUserName: null,
+ // createUserName: null,
orderBy: {
field: 'createTime',
order: 'desc'
diff --git a/src/components/do/a8-file-handling/DistributionCollectionRecord.vue b/src/components/do/a8-file-handling/DistributionCollectionRecord.vue
index 11f38ad..b7b9d78 100644
--- a/src/components/do/a8-file-handling/DistributionCollectionRecord.vue
+++ b/src/components/do/a8-file-handling/DistributionCollectionRecord.vue
@@ -516,11 +516,32 @@
}else{
let {documentCode,id,issueUser,recycleUser,receiveUser,name,version,documentState,issueCode,recycleCode,issueDate,recycleDate,issueNote,recycleNote} = this.addInfo
// 娣诲姞鍥炴敹璁板綍
- this.$axios.post(this.$api.manageDocumentList.doManageDocumentIssueRecycle,{
- documentCode,id,issueUser,recycleUser,receiveUser,name,version,documentState,issueCode,recycleCode,issueDate,recycleDate,issueNote,recycleNote
- },{headers: {
- 'Content-Type': 'application/json'
- },noQS:true}).then(res=>{
+ let obj = {
+ documentCode,
+ id,
+ issueUser,
+ recycleUser,
+ receiveUser,
+ name,
+ version,
+ documentState,
+ issueCode,
+ recycleCode,
+ issueDate,
+ recycleDate,
+ issueNote,
+ recycleNote
+ }
+ let fd = new FormData();
+ for(let key in obj){
+ fd.append(key,obj[key])
+ }
+ this.$axios.post(this.$api.manageDocumentList.doManageDocumentIssueRecycle,fd,{
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ },
+ noQs:true
+ }).then(res=>{
this.addLoading = false;
if(res.code==200){
this.$message.success('鎻愪氦鎴愬姛')
diff --git a/src/components/do/a8-measures_deal_risks_opportunities/hazard_identification_risk_assessment.vue b/src/components/do/a8-measures_deal_risks_opportunities/hazard_identification_risk_assessment.vue
index bd5bf4b..361094e 100644
--- a/src/components/do/a8-measures_deal_risks_opportunities/hazard_identification_risk_assessment.vue
+++ b/src/components/do/a8-measures_deal_risks_opportunities/hazard_identification_risk_assessment.vue
@@ -272,6 +272,7 @@
});
},
addFun() {
+ this.form = {}
this.dialogVisible = true
},
// 鍒犻櫎
diff --git a/src/components/do/a8-measures_deal_risks_opportunities/list_risk_analysis_control_plans.vue b/src/components/do/a8-measures_deal_risks_opportunities/list_risk_analysis_control_plans.vue
index dfd1d35..3e8a3dc 100644
--- a/src/components/do/a8-measures_deal_risks_opportunities/list_risk_analysis_control_plans.vue
+++ b/src/components/do/a8-measures_deal_risks_opportunities/list_risk_analysis_control_plans.vue
@@ -240,6 +240,7 @@
});
},
addFun() {
+ this.form = {}
this.dialogVisible = true
},
// 鍒犻櫎
diff --git a/src/components/view/a7-Ensure-results-validity.vue b/src/components/view/a7-Ensure-results-validity.vue
index 2627d5c..6df1472 100644
--- a/src/components/view/a7-Ensure-results-validity.vue
+++ b/src/components/view/a7-Ensure-results-validity.vue
@@ -225,7 +225,7 @@
minWidth: '160'
}, {
label: '鍒涘缓浜�',
- prop: 'createUser',
+ prop: 'createUserName',
minWidth: '100'
}, {
dataType: 'action',
diff --git a/src/components/view/a7-quality-control-plan.vue b/src/components/view/a7-quality-control-plan.vue
index 491b737..2fd1335 100644
--- a/src/components/view/a7-quality-control-plan.vue
+++ b/src/components/view/a7-quality-control-plan.vue
@@ -185,7 +185,7 @@
minWidth: '160'
}, {
label: '鍒涘缓浜�',
- prop: 'createUser',
+ prop: 'createUserName',
minWidth: '100'
}, {
dataType: 'action',
diff --git a/src/main.js b/src/main.js
index 5ca9a36..2e86d84 100644
--- a/src/main.js
+++ b/src/main.js
@@ -22,11 +22,11 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-// const javaApi = 'http://172.20.10.5:8001';
+const javaApi = 'http://172.20.10.5:8001';
//閫氫俊娴嬭瘯搴�
-Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
-const javaApi = 'http://10.1.13.77:8001';
+// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
+// const javaApi = 'http://10.1.13.77:8001';
// 閫氫俊姝ｅ紡搴�
Vue.prototype.LOCATIONVUE = "http://10.193.45.63:8080";
--
Gitblit v1.9.3