| src/layout/components/Navbar.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/basicSettings/cronTime.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/produce/reportCorrect.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/produce/stepReport.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/workOrder/workOrderList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/layout/components/Navbar.vue
@@ -268,8 +268,7 @@ // Vue.prototype.$ButtonData = JSON.parse(localStorage.getItem('ButtonData')) }, mounted() { // this.getHubConnectionBuilder() this.getHubConnectionBuilder() }, computed: { ...mapGetters([ @@ -313,7 +312,7 @@ // }, // 建立hub连接 async getHubConnectionBuilder() { const url = 'http://121.196.36.24:8019/chatHub' const url = 'http://121.196.36.24:8048/chatHub' this.signalr = new signalR.HubConnectionBuilder().withUrl(url, { // skipNegotiation: true, // transport: signalR.HttpTransportType.WebSockets @@ -342,7 +341,7 @@ this.$notify({ offset: 80, type: 'warning', title: '消息提醒', message: res }) this.$store.state.settings.isDot = true }) await this.signalr.invoke('AddUser', getCookie('admin')) await this.signalr.invoke('AddUser', localStorage.getItem('account')) }, systemSetting() { src/views/basicSettings/cronTime.vue
@@ -248,8 +248,21 @@ </el-input> </el-form-item> <el-form-item label="ApiUrl" prop="ApiUrl"> <el-input v-model="dialogForm.ApiUrl" style="width: 200px" /> <el-form-item label="请求方式" prop="RequestType"> <!-- <el-input v-model="dialogForm.RequestType" style="width: 200px" />--> <el-select v-model="dialogForm.RequestType" style="width:200px" placeholder="请选择" :popper-append-to-body="false" > <el-option v-for="item in RequestTypeArr" :key="item.code" :label="item.name" :value="item.code" /> </el-select> </el-form-item> <el-form-item label="header(Key)" prop="AuthKey"> <el-input v-model="dialogForm.AuthKey" style="width: 200px" /> @@ -257,12 +270,42 @@ <el-form-item label="header(value)" prop="AuthValue"> <el-input v-model="dialogForm.AuthValue" style="width: 200px" /> </el-form-item> <el-form-item label="ApiUrl" prop="ApiUrl"> <el-input v-model="dialogForm.ApiUrl" style="width: 520px" /> </el-form-item> <!-- <el-form-item label="请求方式" prop="RequestType">--> <!-- <el-input v-model="dialogForm.RequestType" style="width: 200px" />--> <!-- </el-form-item>--> <el-form-item label="描述" prop="Describe"> <el-input v-model="dialogForm.Describe" type="textarea" style="width: 200px" /> </el-form-item> <el-form-item required label="是否推送"> <el-switch v-model="dialogForm.MessagePush" style="width: 200px" active-color="#13ce66" inactive-color="#eee" active-value="Y" inactive-value="N" /> </el-form-item> <el-form-item v-if="dialogForm.MessagePush==='Y'" label="推送人员"> <el-select v-model="dialogForm.PushUserCode" style="width:200px" placeholder="请选择" :popper-append-to-body="false" clearable multiple collapse-tags > <el-option v-for="item in userArr" :key="item.usercode" :label="item.username" :value="item.usercode" /> </el-select> </el-form-item> </el-form> @@ -336,6 +379,7 @@ import { cron } from 'vue-cron' import cronstrue from 'cronstrue/i18n' import vcrontab from '../../components/VcronTab/index' import { PersonPermissions } from '@/api/GeneralBasicData' export default { name: 'CronTime', @@ -374,7 +418,9 @@ Describe: '', // 描述 RequestType: 'POST', // 请求类型 LastRunTime: '', // 最后执行时间 Status: 0// 状态 Status: 0, // 状态 MessagePush: 'Y', PushUserCode: [] }, cronPopover: false, @@ -411,7 +457,12 @@ }, dialogVisible2: false, OrgTypeArrxx: [], recordData: []// 查看记录数组 recordData: [], // 查看记录数组 userArr: [], RequestTypeArr: [ { code: 'POST', name: 'POST' }, { code: 'GET', name: 'GET' } ] } }, @@ -422,12 +473,17 @@ }, created() { this.getTaskBackGroundGetJobs() this.getPersonPermissions() }, mounted() { window.addEventListener('resize', this.getHeight) this.getHeight() }, methods: { async getPersonPermissions() { const { data: res } = await PersonPermissions() this.userArr = res }, crontabFill(val) { this.dialogForm.Interval = val // const t = cronstrue.toString(this.dialogForm.Interval, { locale: 'zh_CN' }) @@ -491,6 +547,8 @@ this.dialogForm.AuthKey = row.AuthKey this.dialogForm.AuthValue = row.AuthValue this.dialogForm.Describe = row.Describe this.dialogForm.RequestType = row.RequestType this.dialogForm.PushUserCode = row.MessagePush === 'Y' ? row.PushUserCode.split(',') : '' }) }, // 删除按钮 @@ -562,6 +620,8 @@ this.dialogForm.Describe = '' this.dialogForm.RequestType = 'POST' this.dialogForm.LastRunTime = '' this.dialogForm.MessagePush = 'Y' this.dialogForm.PushUserCode = [] this.dialogForm.Status = 0 this.$refs.dialogForm.clearValidate() }, @@ -585,6 +645,7 @@ // } if (this.operation === 'add') { this.dialogForm.PushUserCode = this.dialogForm.MessagePush === 'Y' ? this.dialogForm.PushUserCode.join(',') : '' TaskBackGroundAdd(this.dialogForm).then(res => { if (res.code === '200') { this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！') @@ -595,6 +656,8 @@ } }) } else { // console.log(this.dialogForm.MessagePush === 'Y') this.dialogForm.PushUserCode = this.dialogForm.MessagePush === 'Y' ? this.dialogForm.PushUserCode.join(',') : '' TaskBackGroundUpdate(this.dialogForm).then(res => { if (res.code === '200') { this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！') src/views/produce/reportCorrect.vue
@@ -397,19 +397,57 @@ /> </el-form-item> <el-form-item v-if="dialogForm.flw_type==='Z'" label="报工班组" class="dialogFormItem"> <div style="width: 200px;" class="ellipsis"> {{ dialogForm.usergroup_name ? dialogForm.usergroup_name : '/' }} </div> <!-- <div style="width: 200px;" class="ellipsis">--> <!-- {{ dialogForm.usergroup_name ? dialogForm.usergroup_name : '/' }}--> <!-- </div>--> <el-select v-model="dialogForm.groupcode" style="width:200px" placeholder="请选择" filterable :disabled="dialogForm.groupcode===''" :popper-append-to-body="false" @change="usergroupChange" > <el-option v-for="item in usergroupArr" :key="item.usergroupcode" :label="item.usergroupname" :value="item.usergroupcode" /> </el-select> </el-form-item> <el-form-item v-if="dialogForm.flw_type!=='Z'" label="供应商" class="dialogFormItem"> <div style="width: 200px;" class="ellipsis"> {{ dialogForm.wx_name }} </div> </el-form-item> <el-form-item label="报工人员" class="dialogFormItem"> <div style="width: 200px;" class="ellipsis"> {{ dialogForm.username }} </div> <el-form-item label="报工人员" class="dialogFormItem" prop="usercode"> <!-- <div style="width: 200px;" class="ellipsis">--> <!-- {{ dialogForm.username }}--> <!-- </div>--> <el-select v-model="dialogForm.usercode" style="width:200px" placeholder="请选择" filterable multiple collapse-tags :multiple-limit="dialogForm.groupcode===''?1:0" :disabled="dialogForm.groupcode===''&&dialogForm.usergroupcode===''" :popper-append-to-body="false" > <el-option v-for="item in reportuserArr" :key="item.usercode" :label="item.usercode+' / '+item.username" :value="item.usercode" /> </el-select> </el-form-item> <el-form-item :label="dialogForm.flw_type==='Z'?'合格数量':'收料数量'" prop="report_qty" class="dialogFormItem"> <el-input @@ -573,7 +611,13 @@ import { handleDatetime } from '@/utils/global' import elDragDialog from '@/directive/el-drag-dialog' import waves from '@/directive/waves' import { DefectPermissions, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData' import { DefectPermissions, GroupsPermissions, GroupsPersonPermissions, PersonPermissions, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData' import { MesOrderStepModelSearch, MesOrderStepPriceBatchUpdateSeave, MesOrderStepUpdateSeave, @@ -647,11 +691,16 @@ dialogFormRules: { report_qty: [ { required: true, message: '请输入合格数量', trigger: ['blur', 'change'] } ], usercode: [ { required: true, message: '请选择报工人员', trigger: ['blur', 'change'] } ] }, stepCodeArr: [], // 下拉工序集合 batchUpdateDialogVisible: false, stepPriceEdit: 0 stepPriceEdit: 0, usergroupArr: [], reportuserArr: [] } }, @@ -722,10 +771,20 @@ batchUpdateHandleClose() { this.stepPriceEdit = 0 }, async usergroupChange(val) { const { data: res } = await GroupsPersonPermissions({ groupcode: val }) this.dialogForm.usercode = res[0].usercode_list ? res[0].usercode_list.split(',') : [] }, // 获取工序基础资料 async getStepData() { const { data: res } = await StepData() this.stepCodeArr = res const { data: res1 } = await GroupsPermissions()// 班组 this.usergroupArr = res1 const { data: res2 } = await PersonPermissions() // 人员 this.reportuserArr = res2 }, async getPrentOrganizationNoCompany() { const { data: res } = await PrentOrganizationNoCompany() @@ -820,7 +879,7 @@ this.dialogForm.last_choke = row.last_choke this.dialogForm.unprice = row.step_price this.dialogForm.groupcode = row.usergroup_code this.dialogForm.usercode = row.usercode this.dialogForm.usercode = row.usercode.split(',') this.dialogForm.usergroup_name = row.usergroup_name this.dialogForm.username = row.username this.dialogForm.report_date = row.report_date @@ -886,7 +945,7 @@ 'last_choke': this.dialogForm.last_choke, 'unprice': this.dialogForm.unprice, 'groupcode': this.dialogForm.groupcode, 'usercode': this.dialogForm.usercode, 'usercode': this.dialogForm.usercode.join(','), wxcode: this.dialogForm.wx_code, 'report_date': this.dialogForm.report_date, 'report_qty': parseFloat(this.dialogForm.report_qty), src/views/produce/stepReport.vue
@@ -582,7 +582,7 @@ <el-option v-for="item in reportuserArr" :key="item.usercode" :label="item.username" :label="item.usercode+' / '+item.username" :value="item.usercode" /> </el-select> src/views/workOrder/workOrderList.vue
@@ -1553,6 +1553,22 @@ <el-form-item label="工单数量:" class="formContent"> {{ formApprove.plan_qty }} </el-form-item> <el-form-item label="打印人员:" class="formContent"> <!-- {{ localStorage.getItem('username') }}--> {{ formApprove.routename }} </el-form-item> <el-form-item label="打印时间:" class="formContent"> {{ formApprove.lm_date }} </el-form-item> <!-- <br>--> <!-- <div style="width:98%;margin-left: 1%;border-bottom: 1px solid #000" />--> <!-- <br>--> <!-- <el-form-item label="子件备注:" class="formContent" style="width: 100%">--> <!-- {{ formApprove.memo }}--> <!-- </el-form-item>--> <!-- <el-form-item label="规格型号:" class="formContent" style="width: 100%">--> <!-- {{ formApprove.bomsubspec }}--> <!-- </el-form-item>--> <!-- <el-form-item label="客户名称:" class="formContent">--> <!-- {{ formApprove.priuserdefnvc1 }}--> @@ -1576,13 +1592,7 @@ <!-- <el-form-item label="工艺路线:" class="formContent">--> <!-- {{ formApprove.routename }}--> <!-- </el-form-item>--> <el-form-item label="打印人员:" class="formContent"> <!-- {{ localStorage.getItem('username') }}--> {{ formApprove.routename }} </el-form-item> <el-form-item label="打印时间:" class="formContent"> {{ formApprove.lm_date }} </el-form-item> </div> </el-form> </div> @@ -1720,6 +1730,17 @@ <el-form-item label="打印时间:" class="formContent"> {{ formApprove.lm_date }} </el-form-item> <!-- <br>--> <!-- <div style="width:98%;margin-left: 1%;border-bottom: 1px solid #000" />--> <!-- <br>--> <!-- <el-form-item label="子件备注:" class="formContent" style="width: 100%">--> <!-- {{ formApprove.memo }}--> <!-- </el-form-item>--> <!-- <el-form-item label="规格型号:" class="formContent" style="width: 100%">--> <!-- {{ formApprove.bomsubspec }}--> <!-- </el-form-item>--> </div> </el-form> </div> @@ -4173,6 +4194,9 @@ this.formApprove.priuserdefnvc5 = row.priuserdefnvc5 ? row.priuserdefnvc5 : '/' this.formApprove.priuserdefnvc6 = row.priuserdefnvc6 ? row.priuserdefnvc6 : '/' this.formApprove.memo = row.memo || '/' this.formApprove.bomsubspec = row.bomsubspec || '/' this.formApprove.TopInventoryName = row.TopInventoryName || '/' this.formApprove.saleOrderCode = this.formApprove.saleOrderCode !== '' ? this.formApprove.saleOrderCode : saleOrderCode
