admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-09-12 19:04:05 +08:00
parent 2e21c23e2e
commit 400bbc9745
5 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.production
View File

@ -5,8 +5,8 @@ NODE_ENV = "production"
# VITE_API_URL = "http://139.9.66.234:6688"
# VITE_API_URL = "http://182.90.224.147:6688"
# VITE_API_URL = 'http://192.168.34.155:6688'
# VITE_API_URL = 'http://10.75.253.12:6090'
VITE_API_URL = "http://182.90.224.147:9013"
VITE_API_URL = 'http://10.75.253.12:6090'
# VITE_API_URL = "http://182.90.224.147:9013"
VITE_WPAPI_URL = "http://182.90.224.147:8081"
# VITE_API_URL = "http://101.43.164.214:6688"
# VITE_API_URL = "https://wx.antjg.com:6081/"

3
src/views/goverment/huizhou/assessmentManagement/unitScore/components/scoreTableNew.vue
View File

@ -127,6 +127,8 @@
<el-button class="hzCancelStyle" @click="cancelScore">取消</el-button>
<el-button class="btnStyle" type="primary" @click="saveScore"> 保存 </el-button>
</div>
<!-- 打印评分表 -->
<scoreTableNewPrint :relativeInfo="relativeInfo" :formDataTable="formData" :recordTableData="recordData"></scoreTableNewPrint>
</template>
<script lang="ts" setup>
@ -135,6 +137,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
import type { FormInstance, UploadProps } from "element-plus";
import { scoreSubItemList, scoreDetail, noScoreDetail, addScoreDetail, updateScoreDetail } from "@/api/modules/huizhou";
import dayjs from "dayjs";
import scoreTableNewPrint from "./scoreTableNewPrint.vue";
const formData = ref({});
const emits = defineEmits(["confirm"]);
const props = defineProps(["relativeInfo"]);

32
src/views/goverment/huizhou/assessmentManagement/unitScore/components/scoreTableNewPrint.vue
View File

@ -137,7 +137,7 @@ import { scoreSubItemList, scoreDetail, noScoreDetail, addScoreDetail, updateSco
import dayjs from "dayjs";
const formData = ref({});
const emits = defineEmits(["confirm"]);
const props = defineProps(["relativeInfo", "printVisible"]);
const props = defineProps(["relativeInfo", "formDataTable", "recordTableData"]);
const recordData = ref({});
const categoryList = ref([]);
const selectOptions = ref([{ label: "测试", value: 1 }]);
@ -303,14 +303,32 @@ const getScoreSubItemData = async () => {
}
console.log(res);
};
// 监听属性变化
watch(
() => props.formDataTable,
(n, o) => {
formData.value = n;
},
{ deep: true }
);
// 监听属性变化
watch(
() => props.recordTableData,
(n, o) => {
recordData.value = n;
},
{ deep: true }
);
onMounted(async () => {
await getScoreSubItemData();
formData.value = { ...props.relativeInfo };
if (formData.value.startTime) {
formData.value.timeRange = [formData.value.startTime, formData.value.endTime];
}
formData.value.scoreTime = dayjs().format("YYYY-MM-DD");
console.log(formData.value);
formData.value = props.formDataTable;
recordData.value = props.recordTableData;
// formData.value = { ...props.relativeInfo };
// if (formData.value.startTime) {
// formData.value.timeRange = [formData.value.startTime, formData.value.endTime];
// }
// formData.value.scoreTime = dayjs().format("YYYY-MM-DD");
// console.log(formData.value);
});
</script>

1
src/views/goverment/huizhou/assessmentManagement/unitScore/index.scss
View File

@ -7,6 +7,7 @@
display: flex;
width: 100%;
height: 100%;
overflow: hidden;
.left-content {
padding: 10px 20px;
background: var(--el-menu-bg-color);

6
src/views/goverment/huizhou/assessmentManagement/unitScore/index.vue
View File

@ -45,7 +45,7 @@
<!-- <img src="@/assets/images/tableIcon/configureIcon.png" alt="" class="configureIcon" /> -->
<span>新增打分</span>
</el-button>
<el-button v-else v-auth="'score_upddate'" class="btnStyle" type="primary" @click="openScoreTable(row)">
<el-button v-else v-auth="'score_update'" class="btnStyle" type="primary" @click="openScoreTable(row)">
<!-- <img src="@/assets/images/tableIcon/configureIcon.png" alt="" class="configureIcon" /> -->
<span>编辑打分</span>
</el-button>
@ -64,8 +64,6 @@
</div>
<!-- 评分表 -->
<scoreTableNew :relativeInfo="relativeInfo" @confirm="confirmScore"></scoreTableNew>
<!-- 打印评分表 -->
<scoreTableNewPrint :relativeInfo="relativeInfo" @confirm="confirmScore"></scoreTableNewPrint>
</div>
<!-- 新增单位 -->
<el-dialog class="imgDialog" title="新增" width="50%" v-model="addVisible" show-close>
@ -140,12 +138,10 @@ import DialogForm from "@/components/DialogForm/index.vue";
import scoreTable from "./components/scoreTable.vue";
import addCompany from "./components/addCompany.vue";
import scoreTableNew from "./components/scoreTableNew.vue";
import scoreTableNewPrint from "./components/scoreTableNewPrint.vue";
import { getDicList } from "@/api/modules/jxjview";
import { scorePage, enterpriseList, engineerList, scoreAdd, deleteScoreDetail } from "@/api/modules/huizhou";
import { useHandleData } from "@/hooks/useHandleData";
import printJS from "print-js";
const printVisible = ref(false);
const relativeInfo = ref({});
const dicMainData = ref([]);
const openScore = ref(false);