zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

This commit is contained in:
caoqianming 2024-01-24 09:32:00 +08:00
parent 98581e7d51 5ed9cd6d72
commit 72875e5b0b
4 changed files with 395 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/bigScreen/index_enm.vue
View File

@ -102,11 +102,11 @@
<div class="chart" id="chart1"></div> <div class="chart" id="chart1"></div>
</div> </div>
<div class="panel"> <div class="panel">
<div class="panel_title">原煤消耗趋势图</div> <div class="panel_title">工业水/原煤消耗趋势图</div>
<div class="chart" id="chart2"></div> <div class="chart" id="chart2"></div>
</div> </div>
<div class="panel"> <div class="panel">
<div class="panel_title">工业水/压缩空气消耗趋势图</div> <div class="panel_title">压缩空气消耗趋势图</div>
<div class="chart" id="chart3"></div> <div class="chart" id="chart3"></div>
</div> </div>
</div> </div>

551
src/views/login/index.vue
View File

@ -1,9 +1,10 @@
<template> <template>
<div class="login_bg"> <div class="login_bg">
<!-- <div class="right-con" :style="{backgroundImage: 'url(' + baseConfig.base_logo + ')'}"></div> --> <!-- <div class="right-con" :style="{backgroundImage: 'url(' + baseConfig.base_logo + ')'}"></div> -->
<div class="login_adv" :style="{'background-image':baseConfig.base_logo_side==''?'url(img/logo_side.png)':'url('+baseConfig.base_logo_side+')'}"> <div class="login_adv"
:style="{ 'background-image': baseConfig.base_logo_side == '' ? 'url(img/logo_side.png)' : 'url(' + baseConfig.base_logo_side + ')' }">
<div class="login_adv__title"> <div class="login_adv__title">
<h2 v-if="baseConfig.base_name">{{baseConfig.base_name}}</h2> <h2 v-if="baseConfig.base_name">{{ baseConfig.base_name }}</h2>
</div> </div>
<div class="login_adv__mask"></div> <div class="login_adv__mask"></div>
<!-- <div class="login_adv__bottom"> <!-- <div class="login_adv__bottom">
@ -12,17 +13,18 @@
</div> </div>
<div class="login_main"> <div class="login_main">
<div class="login_config"> <div class="login_config">
<el-button :icon="config.dark?'el-icon-sunny':'el-icon-moon'" circle type="info" @click="configDark"></el-button> <el-button :icon="config.dark ? 'el-icon-sunny' : 'el-icon-moon'" circle type="info"
@click="configDark"></el-button>
</div> </div>
<div class="login-form"> <div class="login-form">
<div class="login-header"> <div class="login-header">
<div class="logo" v-if="baseConfig.name=='photon'"> <div class="logo" v-if="baseConfig.name == 'photon'">
<img id="photonImg" :alt="baseConfig.base_login" :src="baseConfig.base_login"> <img id="photonImg" :alt="baseConfig.base_login" :src="baseConfig.base_login">
</div> </div>
<div class="logo" v-else> <div class="logo" v-else>
<img :alt="baseConfig.base_name_short" :src="baseConfig.base_logo"> <img :alt="baseConfig.base_name_short" :src="baseConfig.base_logo">
<label>{{baseConfig.base_name}}</label> <label>{{ baseConfig.base_name }}</label>
</div> </div>
</div> </div>
<el-tabs> <el-tabs>
@ -33,7 +35,7 @@
<el-tab-pane :label="$t('login.mobileLogin')" lazy> <el-tab-pane :label="$t('login.mobileLogin')" lazy>
<phone-form></phone-form> <phone-form></phone-form>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<!-- 微信登陆 <!-- 微信登陆
<el-divider>{{ $t('login.signInOther') }}</el-divider> <el-divider>{{ $t('login.signInOther') }}</el-divider>
@ -41,10 +43,11 @@
<el-button type="success" icon="sc-icon-wechat" circle @click="wechatLogin"></el-button> <el-button type="success" icon="sc-icon-wechat" circle @click="wechatLogin"></el-button>
</div> </div>
--> -->
<div class="login-oauth" v-if="baseConfig.base_name=='曲阳金隅安全智能管控平台'"> <div class="login-oauth" v-if="baseConfig.base_name == '曲阳金隅安全智能管控平台'">
<el-button type="default" @click="appDown">安卓APP</el-button> <el-button type="default" @click="appDown">安卓APP</el-button>
<el-button type="default" @click="h5Show">H5访问</el-button> <el-button type="default" @click="h5Show">H5访问</el-button>
<el-button type="primary" @click="MonitorOpen" style="background-color:orange;border-color:orange">监控视频</el-button> <el-button type="primary" @click="MonitorOpen"
style="background-color:orange;border-color:orange">监控视频</el-button>
</div> </div>
<!-- <div class="login-oauth" v-else> <!-- <div class="login-oauth" v-else>
<el-button type="default" @click="faceLogin">刷脸登录</el-button> <el-button type="default" @click="faceLogin">刷脸登录</el-button>
@ -55,9 +58,10 @@
<el-dialog v-model="showWechatLogin" :title="$t('login.wechatLoginTitle')" :width="400" destroy-on-close> <el-dialog v-model="showWechatLogin" :title="$t('login.wechatLoginTitle')" :width="400" destroy-on-close>
<div class="qrCodeLogin"> <div class="qrCodeLogin">
<sc-qr-code class="qrCode" :text="WechatLoginCode" :size="200"></sc-qr-code> <sc-qr-code class="qrCode" :text="WechatLoginCode" :size="200"></sc-qr-code>
<p class="msg">{{$tc('login.wechatLoginMsg', 1)}}<br/>{{$tc('login.wechatLoginMsg', 2)}}</p> <p class="msg">{{ $tc('login.wechatLoginMsg', 1) }}<br />{{ $tc('login.wechatLoginMsg', 2) }}</p>
<div class="qrCodeLogin-result" v-if="isWechatLoginResult"> <div class="qrCodeLogin-result" v-if="isWechatLoginResult">
<el-result icon="success" :title="$tc('login.wechatLoginResult', 1)" :sub-title="$tc('login.wechatLoginResult', 2)"></el-result> <el-result icon="success" :title="$tc('login.wechatLoginResult', 1)"
:sub-title="$tc('login.wechatLoginResult', 2)"></el-result>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
@ -72,201 +76,380 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog v-model="limitedPhoto" @close="closeCamera" id="loginFaceWrap" style="width: 664px;"> <el-dialog v-model="limitedPhoto" @close="closeCamera" id="loginFaceWrap" style="width: 664px;">
<h1 style="text-align: center;">人脸登录</h1> <h1 style="text-align: center;">人脸登录</h1>
<div class="testTracking"> <div class="testTracking">
<faceLogin ref="faceTracking" @close="closeCamera" name="faceLogin" @func="getMsgFormSon"></faceLogin> <faceLogin ref="faceTracking" @close="closeCamera" name="faceLogin" @func="getMsgFormSon"></faceLogin>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { Monitor } from '@element-plus/icons-vue' import { Monitor } from '@element-plus/icons-vue'
import passwordForm from './components/passwordForm' import passwordForm from './components/passwordForm'
import phoneForm from './components/phoneForm' import phoneForm from './components/phoneForm'
import faceLogin from '@/components/faceLogin' import faceLogin from '@/components/faceLogin'
export default { export default {
components: { components: {
passwordForm, passwordForm,
phoneForm, phoneForm,
faceLogin faceLogin
}, },
data() { data() {
return { return {
config: { config: {
lang: this.$TOOL.data.get('APP_LANG') || this.$CONFIG.LANG, lang: this.$TOOL.data.get('APP_LANG') || this.$CONFIG.LANG,
dark: this.$TOOL.data.get('APP_DARK') || false dark: this.$TOOL.data.get('APP_DARK') || false
},
lang: [
{
name: '简体中文',
value: 'zh-cn',
}, },
lang: [ {
{ name: 'English',
name: '简体中文', value: 'en',
value: 'zh-cn',
},
{
name: 'English',
value: 'en',
}
],
baseConfig:{},
limitedPhoto:false,
WechatLoginCode: "",
showWechatLogin: false,
isWechatLoginResult: false,
showApp: false,
appUrl: 'http://222.222.144.147:6013/media/zc_ehs.apk',
showH5: false,
h5Url: 'http://222.222.144.147:6013/h5/'
}
},
watch:{
'config.dark'(val){
if(val){
document.documentElement.classList.add("dark")
this.$TOOL.data.set("APP_DARK", val)
}else{
document.documentElement.classList.remove("dark")
this.$TOOL.data.remove("APP_DARK")
} }
}, ],
'config.lang'(val){ baseConfig: {},
this.$i18n.locale = val limitedPhoto: false,
this.$TOOL.data.set("APP_LANG", val) WechatLoginCode: "",
showWechatLogin: false,
isWechatLoginResult: false,
showApp: false,
appUrl: 'http://222.222.144.147:6013/media/zc_ehs.apk',
showH5: false,
h5Url: 'http://222.222.144.147:6013/h5/'
}
},
watch: {
'config.dark'(val) {
if (val) {
document.documentElement.classList.add("dark")
this.$TOOL.data.set("APP_DARK", val)
} else {
document.documentElement.classList.remove("dark")
this.$TOOL.data.remove("APP_DARK")
} }
}, },
created: function() { 'config.lang'(val) {
this.$TOOL.cookie.remove("TOKEN") this.$i18n.locale = val
this.$TOOL.data.remove("USER_INFO") this.$TOOL.data.set("APP_LANG", val)
this.$TOOL.data.remove("MENU") }
this.$TOOL.data.remove("PERMISSIONS") },
this.$TOOL.data.remove("DASHBOARDGRID") created: function () {
this.$TOOL.data.remove("grid") this.$TOOL.cookie.remove("TOKEN")
this.$store.commit("clearViewTags") this.$TOOL.data.remove("USER_INFO")
this.$store.commit("clearKeepLive") this.$TOOL.data.remove("MENU")
this.$store.commit("clearIframeList") this.$TOOL.data.remove("PERMISSIONS")
this.$TOOL.data.remove("DASHBOARDGRID")
//console.log('%c SCUI %c Gitee: https://gitee.com/lolicode/scui', 'background:#666;color:#fff;border-radius:3px;', '') this.$TOOL.data.remove("grid")
}, this.$store.commit("clearViewTags")
mounted(){ this.$store.commit("clearKeepLive")
let url1 = window.location.origin; this.$store.commit("clearIframeList")
this.project_code = url1.split('/')[3];
this.getDept(); //console.log('%c SCUI %c Gitee: https://gitee.com/lolicode/scui', 'background:#666;color:#fff;border-radius:3px;', '')
}, },
methods: { mounted() {
getDept(){ let url1 = window.location.href;
let that = this; this.project_code = url1.split('/')[3];
let project = ''; this.getDept();
if(that.project_code==undefined){ },
project = '/'; methods: {
}else{ getDept() {
project = '?project_code='+that.project_code; let that = this;
} let project = '';
that.$API.system.config.base.req(project).then((res) => { if (that.project_code == undefined) {
that.baseConfig = res.base; project = '/';
that.$store.commit("SET_baseName", res.base.base_name); } else {
that.$store.commit("SET_baseLogo", res.base.base_logo); project = '?project_code=' + that.project_code;
that.$TOOL.data.set("BASE_INFO", res)
})
},
appDown() {
this.showApp = true;
},
h5Show() {
this.showH5 = true;
},
MonitorOpen(){
window.open('http://10.99.5.79:5515/')
},
//人脸登录
faceLogin() {
this.limitedPhoto = true;
},
/*关闭相机*/
closeCamera() {
this.limitedPhoto = false;
this.$refs.faceTracking.closeCamera();
// this.thisVideo.srcObject.getTracks()[0].stop();
},
configDark(){
this.config.dark = this.config.dark ? false : true
},
configLang(command){
this.config.lang = command.value
},
wechatLogin(){
this.showWechatLogin = true
this.WechatLoginCode = "SCUI-823677237287236-" + new Date().getTime()
this.isWechatLoginResult = false;
setTimeout(()=>{
this.isWechatLoginResult = true
},3000)
} }
that.$API.system.config.base.req(project).then((res) => {
that.baseConfig = res.base;
that.$store.commit("SET_baseName", res.base.base_name);
that.$store.commit("SET_baseLogo", res.base.base_logo);
that.$TOOL.data.set("BASE_INFO", res)
})
},
appDown() {
this.showApp = true;
},
h5Show() {
this.showH5 = true;
},
MonitorOpen() {
window.open('http://10.99.5.79:5515/')
},
//人脸登录
faceLogin() {
this.limitedPhoto = true;
},
/*关闭相机*/
closeCamera() {
this.limitedPhoto = false;
this.$refs.faceTracking.closeCamera();
// this.thisVideo.srcObject.getTracks()[0].stop();
},
configDark() {
this.config.dark = this.config.dark ? false : true
},
configLang(command) {
this.config.lang = command.value
},
wechatLogin() {
this.showWechatLogin = true
this.WechatLoginCode = "SCUI-823677237287236-" + new Date().getTime()
this.isWechatLoginResult = false;
setTimeout(() => {
this.isWechatLoginResult = true
}, 3000)
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.login_bg {width: 100%;height: 100%;background: #fff;display: flex;} .login_bg {
.login_adv {width: 33.33333%;background-color: #555;background-size: cover;background-position: center center;background-repeat: no-repeat;position: relative;} width: 100%;
.login_adv__title {color: #fff;padding: 40px;position: absolute;top:0px;left:0px;right: 0px;z-index: 2;} height: 100%;
.login_adv__title h2 {font-size: 30px;} background: #fff;
.login_adv__title h4 {font-size: 18px;margin-top: 10px;font-weight: normal;} display: flex;
.login_adv__title p {font-size: 14px;margin-top:10px;line-height: 1.8;color: rgba(255,255,255,0.6);} }
.login_adv__title div {margin-top: 10px;display: flex;align-items: center;}
.login_adv__title div span {margin-right: 15px;}
.login_adv__title div i {font-size: 40px;}
.login_adv__title div i.add {font-size: 20px;color: rgba(255,255,255,0.6);}
.login_adv__bottom {position: absolute;left:0px;right: 0px;bottom: 0px;color: #fff;padding: 40px;background-image:linear-gradient(transparent, #000);z-index: 3;}
.login_adv__mask {position: absolute;top:0px;left:0px;right: 0px;bottom: 0px;z-index: 1;}
.login_main {flex: 1;overflow: auto;display:flex;} .login_adv {
.login-form {width: 410px;margin: auto;padding:20px 0;} width: 33.33333%;
.login-header {margin-bottom: 40px; width: 460px;} background-color: #555;
.login-header .logo {display: flex;align-items: center;} background-size: cover;
/* .login-header .logo img {width: 130px;vertical-align: bottom;margin-right: 10px;} */ background-position: center center;
.login-header .logo img {width: 60px;height: 60px;vertical-align: bottom;margin-right: 10px;} background-repeat: no-repeat;
.login-header .logo label {font-size: 26px;font-weight: bold;} position: relative;
.login-oauth {display: flex;justify-content:space-around;} }
.login-form .el-divider {margin-top:40px;}
.login-form {} .login_adv__title {
.login-form:deep(.el-tabs) .el-tabs__header {margin-bottom: 25px;} color: #fff;
.login-form:deep(.el-tabs) .el-tabs__header .el-tabs__item {font-size: 14px;} padding: 40px;
position: absolute;
top: 0px;
left: 0px;
right: 0px;
z-index: 2;
}
.login-form:deep(.login-forgot) {text-align: right;} .login_adv__title h2 {
.login-form:deep(.login-forgot) a {color: var(--el-color-primary);} font-size: 30px;
.login-form:deep(.login-forgot) a:hover {color: var(--el-color-primary-light-3);} }
.login-form:deep(.login-reg) {font-size: 14px;color: var(--el-text-color-primary);}
.login-form:deep(.login-reg) a {color: var(--el-color-primary);}
.login-form:deep(.login-reg) a:hover {color: var(--el-color-primary-light-3);}
.login_config {position: absolute;top:20px;right: 20px;} .login_adv__title h4 {
font-size: 18px;
margin-top: 10px;
font-weight: normal;
}
.login-form:deep(.login-msg-yzm) {display: flex;width: 100%;} .login_adv__title p {
.login-form:deep(.login-msg-yzm) .el-button {margin-left: 10px;--el-button-size:42px;} font-size: 14px;
margin-top: 10px;
line-height: 1.8;
color: rgba(255, 255, 255, 0.6);
}
.qrCodeLogin {text-align: center;position: relative;padding: 20px 0;} .login_adv__title div {
.qrCodeLogin img.qrCode {background: #fff;padding:20px;border-radius:10px;} margin-top: 10px;
.qrCodeLogin p.msg {margin-top: 15px;} display: flex;
.qrCodeLogin .qrCodeLogin-result {position: absolute;top:0;left:0;right: 0;bottom: 0;text-align: center;background: var(--el-mask-color);} align-items: center;
}
@media (max-width: 1200px){ .login_adv__title div span {
.login-form {width: 340px;} margin-right: 15px;
}
.login_adv__title div i {
font-size: 40px;
}
.login_adv__title div i.add {
font-size: 20px;
color: rgba(255, 255, 255, 0.6);
}
.login_adv__bottom {
position: absolute;
left: 0px;
right: 0px;
bottom: 0px;
color: #fff;
padding: 40px;
background-image: linear-gradient(transparent, #000);
z-index: 3;
}
.login_adv__mask {
position: absolute;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
z-index: 1;
}
.login_main {
flex: 1;
overflow: auto;
display: flex;
}
.login-form {
width: 410px;
margin: auto;
padding: 20px 0;
}
.login-header {
margin-bottom: 40px;
width: 460px;
}
.login-header .logo {
display: flex;
align-items: center;
}
/* .login-header .logo img {width: 130px;vertical-align: bottom;margin-right: 10px;} */
.login-header .logo img {
width: 60px;
height: 60px;
vertical-align: bottom;
margin-right: 10px;
}
.login-header .logo label {
font-size: 26px;
font-weight: bold;
}
.login-oauth {
display: flex;
justify-content: space-around;
}
.login-form .el-divider {
margin-top: 40px;
}
.login-form {}
.login-form:deep(.el-tabs) .el-tabs__header {
margin-bottom: 25px;
}
.login-form:deep(.el-tabs) .el-tabs__header .el-tabs__item {
font-size: 14px;
}
.login-form:deep(.login-forgot) {
text-align: right;
}
.login-form:deep(.login-forgot) a {
color: var(--el-color-primary);
}
.login-form:deep(.login-forgot) a:hover {
color: var(--el-color-primary-light-3);
}
.login-form:deep(.login-reg) {
font-size: 14px;
color: var(--el-text-color-primary);
}
.login-form:deep(.login-reg) a {
color: var(--el-color-primary);
}
.login-form:deep(.login-reg) a:hover {
color: var(--el-color-primary-light-3);
}
.login_config {
position: absolute;
top: 20px;
right: 20px;
}
.login-form:deep(.login-msg-yzm) {
display: flex;
width: 100%;
}
.login-form:deep(.login-msg-yzm) .el-button {
margin-left: 10px;
--el-button-size: 42px;
}
.qrCodeLogin {
text-align: center;
position: relative;
padding: 20px 0;
}
.qrCodeLogin img.qrCode {
background: #fff;
padding: 20px;
border-radius: 10px;
}
.qrCodeLogin p.msg {
margin-top: 15px;
}
.qrCodeLogin .qrCodeLogin-result {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
text-align: center;
background: var(--el-mask-color);
}
@media (max-width: 1200px) {
.login-form {
width: 340px;
} }
@media (max-width: 1000px){ }
.login_main {display: block;}
.login_main .login_config {position: static;padding:20px 20px 0 20px;text-align: right;} @media (max-width: 1000px) {
.login-form {width:100%;padding:20px 40px;} .login_main {
.login_adv {display: none;} display: block;
} }
#loginFaceWrap{
width: 664px!important; .login_main .login_config {
position: static;
padding: 20px 20px 0 20px;
text-align: right;
} }
.testTracking {
width: 600px; .login-form {
height: 500px;
margin-left: 20px;
}
#photonImg{
width: 100%; width: 100%;
padding: 20px 40px;
} }
.login_adv {
display: none;
}
}
#loginFaceWrap {
width: 664px !important;
}
.testTracking {
width: 600px;
height: 500px;
margin-left: 20px;
}
#photonImg {
width: 100%;
}
</style> </style>

21
src/views/wpm/mlog_dept10.vue
View File

@ -258,9 +258,10 @@
</el-main> </el-main>
</el-container> </el-container>
</el-main> </el-main>
<save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup" <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup" :mtaskDate="mtaskDate"
:material_out="material_out" :material_model="material_model" :brothersList="brothersList" :material_in="material_in" :activeType="activeName" :material_out="material_out" :material_model="material_model" :brothersList="brothersList"
@success="handleSaveSuccess" @closed="dialogSave = false"></save-dialog> :material_in="material_in" :activeType="activeName" @success="handleSaveSuccess"
@closed="dialogSave = false"></save-dialog>
<showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false"> <showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
</showDrawer> </showDrawer>
<el-dialog title="编辑任务" v-model="addMtaskInfoVisible"> <el-dialog title="编辑任务" v-model="addMtaskInfoVisible">
@ -313,8 +314,9 @@ export default {
paramsWm: {}, paramsWm: {},
mgroup: '', mgroup: '',
mlogId: '', mlogId: '',
mtaskDate: '',
material_out: '', material_out: '',
material_model:'', material_model: '',
} }
}, },
mounted() { mounted() {
@ -400,6 +402,7 @@ export default {
let that = this; let that = this;
if (that.currentMtask && that.currentMtask.id) { if (that.currentMtask && that.currentMtask.id) {
that.mgroup = that.currentMtask.mgroup; that.mgroup = that.currentMtask.mgroup;
that.mtaskDate = that.currentMtask.start_date;
that.material_out = that.currentMtask.material_out; that.material_out = that.currentMtask.material_out;
that.material_model = that.currentMtask.material_out_.model; that.material_model = that.currentMtask.material_out_.model;
let arr = []; let arr = [];
@ -420,10 +423,10 @@ export default {
} }
}, },
table_submit(row) { table_submit(row) {
let lengths = row.mlogs.length,infoText = ''; let lengths = row.mlogs.length, infoText = '';
if(lengths>0){ if (lengths > 0) {
infoText = '该任务有'+lengths+'条日志，确定提交吗？'; infoText = '该任务有' + lengths + '条日志，确定提交吗？';
}else{ } else {
infoText = '该任务没有日志，确定提交吗？'; infoText = '该任务没有日志，确定提交吗？';
} }
this.$confirm(infoText, "提示", { this.$confirm(infoText, "提示", {
@ -433,7 +436,7 @@ export default {
this.$message.success('操作成功') this.$message.success('操作成功')
this.$refs.table_mtask.refresh() this.$refs.table_mtask.refresh()
this.mtaskClick(this.currentMtask) this.mtaskClick(this.currentMtask)
}).catch(err => {}) }).catch(err => { })
}) })
}, },
// table_submit(row) { // table_submit(row) {

17
src/views/wpm/worktask_form.vue
View File

@ -479,7 +479,8 @@
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="生产任务"> <el-form-item label="生产任务">
<el-select v-model="item.material_out" placeholder="产品名称" disabled style="width: 100%"> <el-select v-model="item.material_out" placeholder="产品名称" disabled style="width: 100%">
<el-option v-for="item in materialOptions" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in materialOptions" :key="item.id" :label="item.full_name"
:value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -576,6 +577,7 @@ export default {
material_out: { type: String, default: "" }, material_out: { type: String, default: "" },
material_model: { type: String, default: "" }, material_model: { type: String, default: "" },
brothersList: { type: Array, default: () => [] }, brothersList: { type: Array, default: () => [] },
mtaskDate: { type: String, default: "" }
}, },
data() { data() {
return { return {
@ -644,7 +646,15 @@ export default {
this.form.mtask = this.mtask; this.form.mtask = this.mtask;
this.form.mgroup = this.mgroup; this.form.mgroup = this.mgroup;
this.form.handle_date = handle_date; this.form.handle_date = handle_date;
this.form.batch = this.material_model + '-' + dateNow; let batchDate = '';
console.log(this.mtaskDate);
if (this.mtaskDate !== '') {
batchDate = this.mtaskDate.split('-').join('');
console.log(batchDate);
} else {
batchDate = dateNow;
}
this.form.batch = this.material_model + '-' + batchDate;
this.getMaterial(); this.getMaterial();
this.getUserList(); this.getUserList();
this.getEquipment(); this.getEquipment();
@ -776,7 +786,7 @@ export default {
for (var i = 0; i < res.length; i++) { for (var i = 0; i < res.length; i++) {
mOptions.push({ mOptions.push({
id: res[i].material_out, id: res[i].material_out,
name: res[i].material_out_name, full_name: res[i].material_out_name,
material_in: res[i].material_in material_in: res[i].material_in
}); });
} }
@ -786,6 +796,7 @@ export default {
let obj = {}; let obj = {};
obj.page = 0; obj.page = 0;
obj.is_hidden = false; obj.is_hidden = false;
obj.type__in = '10,20,30';
this.$API.mtm.material.list.req(obj).then((res) => { this.$API.mtm.material.list.req(obj).then((res) => {
this.materialOptions = res; this.materialOptions = res;
}); });