From c761748876b5239a084e16b22f8d616897714175 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 07 十二月 2022 17:10:18 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/intelligentPatrol/studyJudge/index.vue | 156 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 122 insertions(+), 34 deletions(-)
diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index 63dc317..f0c9402 100644
--- a/src/views/intelligentPatrol/studyJudge/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/index.vue
@@ -31,7 +31,7 @@
<span>鎶ヨ璁板綍</span>
<span>涔卞仠涔辨斁杩濇硶鍗犻亾</span>
</div>
- <el-form ref="currentEvent" label-width="120px" :model="currentEvent" :rules="rules">
+ <el-form ref="currentEvent" label-width="120px" :model="eventInfoData" :rules="rules">
<el-form-item label="浜嬩欢缂栧彿:">
<span>{{ currentEvent.code }}</span>
</el-form-item>
@@ -47,25 +47,37 @@
<el-form-item label="鎸佺画鏃堕棿:">
<span>{{ currentEvent.conntinueTime }}</span>
</el-form-item>
+ <el-form-item label="鍏宠仈搴楅摵" prop="store">
+ <el-select v-model="eventInfoData.store" @change="selectStoreChange" placeholder="璇烽�夋嫨鍏宠仈搴楅摵">
+ <el-option v-for="store in storeList" :value="store.id" :label="store.storeName" :key="store.id" />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="eventInfoData.store" label="搴楅摵寰楀垎:">
+ <span>{{ selectStoreChange(eventInfoData.store).storeScore }}</span>
+ </el-form-item>
<el-form-item label="澶勭悊鎰忚:" prop="advice">
- <el-radio-group v-model="currentEvent.advice">
+ <el-radio-group v-model="eventInfoData.advice">
<el-radio :label="item.id" v-for="item in adviceList" :key="item.id">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="澶х被鍚嶇О:" prop="categoryId">
- <el-input v-model="currentEvent.categoryId" placeholder="璇烽�夋嫨澶х被鍚嶇О"></el-input>
+ <el-select v-model="eventInfoData.categoryId" placeholder="璇烽�夋嫨澶х被鍚嶇О" @change="categoryChange">
+ <el-option v-for="category in categoryOptions" :key="category.id" :value="category.id" :label="category.name" />
+ </el-select>
</el-form-item>
<el-form-item label="灏忕被鍚嶇О:" prop="typeId">
- <el-input v-model="currentEvent.typeId" placeholder="璇烽�夋嫨灏忕被鍚嶇О"></el-input>
+ <el-select v-model="eventInfoData.typeId" placeholder="璇烽�夋嫨灏忕被鍚嶇О">
+ <el-option v-for="type in typeOptions" :key="type.id" :value="type.id" :label="type.name" />
+ </el-select>
</el-form-item>
<el-form-item label="杞︾墝鍙�:" prop="carNumber">
- <el-input v-model="currentEvent.carNumber" placeholder="璇峰～鍐欒溅鐗屽彿鐮�"></el-input>
+ <el-input v-model="eventInfoData.carNumber" placeholder="璇峰～鍐欒溅鐗屽彿鐮�"></el-input>
</el-form-item>
<el-form-item label="澶囨敞:" prop="description">
- <el-input type="textarea" :rows="5" v-model="currentEvent.description"></el-input>
+ <el-input type="textarea" :rows="5" v-model="eventInfoData.description"></el-input>
</el-form-item>
<el-form-item>
- <el-button @click="pageChange('prev')">涓婁竴鏉�</el-button>
+ <el-button :disabled="currentPage === 1" @click="pageChange('prev')">涓婁竴鏉�</el-button>
<el-button @click.native.prevent="handleConfirm">纭</el-button>
<el-button @click="pageChange('next')">涓嬩竴鏉�</el-button>
</el-form-item>
@@ -74,23 +86,63 @@
</div>
</div>
</div>
+ <el-dialog :visible="isShowDialog" title="璋冨害淇℃伅">
+ <MyDispatch v-if="isShowDialog" :mytype="1" @confirmInspection="handleConfirm" :isGetData="true" @changeDialog="closeDialog"></MyDispatch>
+ </el-dialog>
</div>
</template>
<script>
import basecase from "@/api/operate/basecase";
+import baseInfo from "@/api/baseInfo";
+import { getStoreInfoList } from "@/api/operate/storeManagement";
import { FILE_ORIGINAL_URL } from "@/utils";
+import { validateCarNum } from "@/utils/validate";
+import MyDispatch from '@/components/dispatch';
export default {
+ components: { MyDispatch },
created() {
this.getInspectionData();
+ this.initEventParams();
basecase.getInspectionCountData()
.then(res => {
this.countData = res;
})
.catch(err => this.$message.error(err))
+
+ getStoreInfoList({ current: 1, size: 100 })
+ .then(({ list }) => {
+ this.storeList = list;
+ })
+ .catch(err => {
+ this.$message.error(err)
+ })
+
+ baseInfo.getCategoryList()
+ .then(res => {
+ this.categoryOptions = res;
+ })
+ .catch(err => this.$message.error(err))
+
+ baseInfo.getTypeList()
+ .then(res => {
+ this.typeList = res;
+ })
+ .catch(err => this.$message.error(err))
},
data() {
+ const validateCarNumber = (rule, value, callback) => {
+ if (value) {
+ if (validateCarNum(value)) {
+ callback();
+ } else {
+ callback(new Error('璇疯緭鍏ユ纭殑杞︾墝鍙�'));
+ }
+ } else {
+ callback();
+ }
+ };
return {
eventList: [],
countData: {
@@ -99,11 +151,11 @@
currentEvent: {},
adviceList: [
{
- id: 1,
+ id: 2,
label: '涓婃姤',
},
{
- id: 2,
+ id: 6,
label: '璋冨害',
},
{
@@ -115,6 +167,7 @@
label: '鏆備笉澶勭悊',
},
],
+ eventInfoData: null,
rules:{
advice:[
{
@@ -131,41 +184,35 @@
required: true, trigger:['blur', 'change'], message: '灏忕被鍚嶇О涓嶈兘涓虹┖'
}
],
- carNumber:[
- {
- required: true, trigger:['blur', 'change'], message: '杞︾墝鍙蜂笉鑳戒负绌�'
- }
- ]
+ carNumber:[{ trigger:['blur', 'change'], validator: validateCarNumber }]
},
imageList: [],
- currentPage: 1
+ currentPage: 1,
+ categoryOptions: [],
+ typeOptions: [],
+ storeList: [],
+ typeList: [],
+ isShowDialog: false
}
},
methods:{
pageChange(type) {
- if (this.eventList.length === this.currentPage) {
- this.$message.warning('褰撳墠宸叉槸鏈�鍚庝竴椤�');
- return;
- }
if (type === 'next') {
this.currentPage += 1;
} else {
this.currentPage -= 1;
}
- this.currentEvent = this.eventList[this.currentPage - 1];
+ this.getInspectionData();
},
getInspectionData() {
basecase.getInspectionData({ current: this.currentPage })
.then(({ records }) => {
this.eventList = records;
- this.eventList.forEach(item => {
- if (item.picData) {
- const imageUrls = item.picData.split(',');
- this.imageList = imageUrls.map(url => `${FILE_ORIGINAL_URL}${url}`);
- }
- })
- this.currentEvent = this.eventList[this.currentPage - 1];
+ this.currentEvent = this.eventList[0];
+ if (this.currentEvent?.picData) {
+ this.imageList = this.currentEvent.picData.split(',').map(item => `${FILE_ORIGINAL_URL}${item}`);
+ }
})
.catch(err => this.$message.error(err))
},
@@ -174,16 +221,57 @@
handleConfirm(){
this.$refs.currentEvent.validate((flag)=>{
if(flag){
- basecase.confirmInspection(this.currentEvent)
- .then(() => {
- this.$message.success('鎿嶄綔鎴愬姛');
- this.getInspectionData();
- })
- .catch(err => this.$message.error(err))
+ this.eventInfoData.baseId = this.currentEvent.code;
+
+ // 璋冨害
+ if (this.eventInfoData.advice === 6) {
+ this.isShowDialog = true;
+ } else {
+ this.confirmInspection();
+ }
} else {
- this.$message.warning('璇锋鏌ュ繀濉」')
+ this.$message.warning('璇锋鏌ュ繀濉」');
}
})
+ },
+
+ initEventParams() {
+ this.eventInfoData = {
+ baseId: null,
+ store: null,
+ advice: null,
+ categoryId: null,
+ typeId: null,
+ carNumber: null,
+ description: null,
+ linkShop: 0,
+ shopName: null
+ }
+ },
+
+ categoryChange(id) {
+ this.typeOptions = this.typeList.filter(type => type.parentId === id);
+ },
+
+ confirmInspection(data) {
+ basecase.confirmInspection({ ...this.eventInfoData, ...data })
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.getInspectionData();
+ this.initEventParams();
+ })
+ .catch(err => this.$message.error(err))
+ },
+
+ closeDialog() {
+ this.isShowDialog = false;
+ },
+
+ selectStoreChange(id) {
+ const selectedStore = this.storeList.find(store => store.id === id);
+ this.eventInfoData.shopName = selectedStore.storeName;
+ this.eventInfoData.linkShop = 1;
+ return selectedStore;
}
}
}
--
Gitblit v1.8.0