From 0f0d62f85d0e44c03161ef6d3043a4d70fe553dd Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 30 十一月 2023 15:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/productionschedul/index.vue | 424 +++++++++++++++++++++++++++++++++++
src/views/plan/manufacturingorder/index.vue | 1
src/views/plan/productionschedul/template-form.vue | 173 ++++++++++++++
vue.config.js | 1
src/views/plan/customerorder/index.vue | 1
src/api/plan/productionschedul.js | 16 +
src/views/warehouse/pallettransports/index.vue | 75 +++--
src/views/common/ztt-table.vue | 12
8 files changed, 666 insertions(+), 37 deletions(-)
diff --git a/src/api/plan/productionschedul.js b/src/api/plan/productionschedul.js
new file mode 100644
index 0000000..c0df5f0
--- /dev/null
+++ b/src/api/plan/productionschedul.js
@@ -0,0 +1,16 @@
+import request from '@/router/axios'
+
+export function fetchScheduleList(query) {
+ return request({
+ url: '/mes/productionSchedul/page',
+ method: 'get',
+ params: query
+ })
+}
+
+export function fetchScheduleById(id) {
+ return request({
+ url: '/mes//productionSchedul/'+id,
+ method: 'get',
+ })
+}
\ No newline at end of file
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 4776dca..e9cb8d8 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -149,11 +149,7 @@
v-bind="$attrs"
v-on="$listeners"
:highlight-current-row="true"
- :row-key="
- (row) => {
- return row.id
- }
- "
+ :row-key="rowKey"
@row-dblclick="dbClickRow"
@row-contextmenu="contextMenu"
@header-click="headClick"
@@ -563,6 +559,12 @@
name: 'TTable',
components: { exSlot, advancedSearchDialog, zttdraggable },
props: {
+ rowKey: {
+ type: String,
+ default: ()=>{
+ return 'id'
+ }
+ },
// 琛ㄦ牸鍨嬪彿锛歮ini,medium,small
tableSize: { type: String, default: 'small' },
// 鏁版嵁璇锋眰鏂规硶
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 973dd86..47981a3 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -93,7 +93,6 @@
> -->
</template>
</ttable>
-
<!-- 寮圭獥, 鏃ユ湡閫夋嫨 -->
<ConfirmPullCustomerorder
v-if="showPullCustomerOrderVisible"
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 3e3d4fc..c6e2cf8 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -1123,6 +1123,7 @@
getByMoIds([this.orderPlan.id]).then((repsonse) => {
const resData = repsonse.data.data
const resCode = repsonse.data.code
+ console.log("resData-----",repsonse);
if (resCode === 0) {
const _that = this
for (const key in resData) {
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
new file mode 100644
index 0000000..ae15cb2
--- /dev/null
+++ b/src/views/plan/productionschedul/index.vue
@@ -0,0 +1,424 @@
+<template>
+ <div class="mod-config">
+ <basic-container>
+ <el-row>
+ <el-col :span="12">
+ <div style="height:80vh;">
+ <avue-crud :data="tableData" ref="crud" :option="option" :span-method="spanMethod"
+ @refresh-change="getData"
+ :page="page"
+ @selection-change="selectionRow"
+ :table-loading="loading">
+ <template #menu="{ row, index }">
+ <el-button type="text" icon="el-icon-delete" size="small" @click="deleteHandle(row, index)">鍒犻櫎</el-button>
+ </template>
+ </avue-crud>
+ </div>
+ </el-col>
+ <el-col :span="12" style="padding-left: 10px">
+ <div style="">
+ <el-card>
+ <div slot="header" class="clearfix">
+ <span>璋冨害鏃堕棿绾�</span>
+ <el-button style="float: right; padding: 3px 0" type="text">鎿嶄綔鎸夐挳</el-button>
+ </div>
+ <div style="height:70vh;overflow-y: scroll;">
+ <el-timeline reverse>
+ <el-timeline-item
+ placement="top"
+ v-for="(item, index) in scheduleList"
+ :key="index"
+ :timestamp="item.planTime">
+ <el-card style="width:95%;margin: 0;padding: 0px 0px;">
+ <p style="font-weight: bold;">{{item.title}}</p>
+ <p>瀹為檯鏃堕棿: {{ item.actualTime }}</p>
+ </el-card>
+ </el-timeline-item>
+ </el-timeline>
+ </div>
+ </el-card>
+ </div>
+ </el-col>
+ </el-row>
+ </basic-container>
+ </div>
+</template>
+
+<script>
+import {
+ fetchScheduleList,
+ fetchScheduleById,
+} from '@/api//plan/productionschedul'
+import TableForm from './template-form'
+import ttable from '@/views/common/ztt-table.vue'
+import { mapGetters } from 'vuex'
+export default {
+ data() {
+ return {
+ scheduleList: [],
+ typeOptions: [],
+ multipleSelection: [],
+ loading: true,
+ tableData: [],
+ page: {
+ total: 10,
+ currentPage: 1,
+ pageSize: 10
+ },
+ option: {
+ height: 'auto',
+ selection: true,
+ columnBtn: false,
+ index: true,
+ rowKey: 'product',
+ indexLabel: '搴忓彿',
+ menuAlign: 'center',
+ menuWidth: 100,
+ editBtn: false,
+ delBtn: false,
+ addBtn: false,
+ border: true,
+ align: 'center',
+ column: [
+ {
+ minWidth: 120,
+ prop: 'projectName',
+ label: '椤圭洰鍚嶇О',
+ overHidden: true,
+ },
+ {
+ minWidth: 100,
+ prop: 'contractNo',
+ label: '鍚堝悓鍙�',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'orderTime',
+ label: '鎺ュ崟鏃ユ湡',
+ overHidden: true,
+ formatter: (row,columnValue)=> this.formatDate(row,columnValue)
+ },
+ {
+ minWidth: 120,
+ prop: 'customerName',
+ label: '瀹㈡埛鍚嶇О',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'deliveryDate',
+ label: '浜よ揣鏃ユ湡',
+ overHidden: true,
+ formatter: (row,columnValue)=> this.formatDate(row,columnValue)
+ },
+ {
+ minWidth: 120,
+ prop: 'productType',
+ label: '浜у搧绫诲瀷',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'product',
+ label: '浜у搧鍚�',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'specs',
+ label: '瑙勬牸鍨嬪彿',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'unit',
+ label: '鍗曚綅',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'number',
+ label: '鏁伴噺',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'productionStatus',
+ label: '鐢熶骇鎯呭喌',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'productionRoutine',
+ label: '鐢熶骇绋嬪害',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'projectLeader',
+ label: '椤圭洰璐熻矗浜�',
+ overHidden: true,
+ },
+ {
+ minWidth: 150,
+ prop: 'remark',
+ label: '澶囨敞',
+ overHidden: true,
+ }
+ ],
+ },
+ spanArr: [{
+ prop: 'projectName',
+ span: []
+ }, {
+ prop: 'contractNo',
+ span: []
+ },
+ {
+ prop: 'orderTime',
+ span: []
+ },
+ {
+ prop: 'customerName',
+ span: []
+ },
+ {
+ prop: 'deliveryDate',
+ span: []
+ },
+ {
+ prop: 'productType',
+ span: []
+ },
+ ],
+ }
+ },
+ components: {
+ ttable,
+ TableForm,
+ },
+ computed: {
+ ...mapGetters(['permissions'])
+ },
+ created(){
+ this.loading = true
+ this.getData()
+ this.getParamType()
+ this.rowSort()
+ this.rowCalc()
+ },
+ beforeUpdate() {
+ this.rowSort()
+ this.rowCalc()
+ },
+ watch:{
+
+ },
+ mounted() {
+
+ },
+ beforeDestroy() {
+ },
+ methods: {
+ initTimeLine(data){
+ this.scheduleList = []
+ if(data){
+ let arr = [
+ {
+ title: '鏂囦欢绛惧彂',
+ actualTime: data.documentActualTime,
+ planTime: data.documentPlanTime,
+ },
+ {
+ title: '涓嬭揪鐗╂枡闇�姹�',
+ actualTime: data.bomActualTime,
+ planTime: data.bomPlanTime,
+ },
+ {
+ title: '閲囪喘璇环+鍚堝悓绛捐',
+ actualTime: data.contractActualTime,
+ planTime: data.contractPlanTime,
+ },
+ {
+ title: '鐗╂枡閲囪喘鍒拌揣',
+ actualTime: data.arrivalActualTime,
+ planTime: data.arrivalPlanTime,
+ },
+ {
+ title: '鐗╂枡鍒拌揣妫�楠�',
+ actualTime: data.checkActualTime,
+ planTime: data.checkPlanTime,
+ },
+ {
+ title: '棰嗘枡銆佽绠卞叆搴�',
+ actualTime: data.productActualTime,
+ planTime: data.productPlanTime,
+ },
+ ]
+ this.scheduleList = arr
+ }
+ },
+ getScheduleById(id){
+ if(id){
+ fetchScheduleById(id).then(res=>{
+ this.initTimeLine(res.data.data)
+ }).catch(error=>{
+ console.log(error);
+ })
+ }
+ },
+ selectionRow(val){
+ if (val.length > 1) {
+ const preVal = val.shift();
+ this.$refs.crud.toggleRowSelection(preVal, false);
+ }
+ this.getScheduleById(val[0].id)
+ },
+ formatDate(row, cellValue){
+ if (cellValue) {
+ const dutyDateList = /\d{4}-\d{1,2}-\d{1,2}/g.exec(cellValue)
+ if (dutyDateList && dutyDateList.length > 0) {
+ return dutyDateList[0]
+ }
+ }
+ return ''
+ },
+ // 鑾峰彇鏁版嵁鍒楄〃
+ getData() {
+ this.loading = true
+ let param = {
+ size: 20,
+ current: 1,
+ }
+ fetchScheduleList(param).then((res) => {
+ this.tableData = res.data.data.records
+ this.page.total = res.data.data.total
+ this.page.currentPage = res.data.data.records.pages
+ })
+ this.loading = false
+
+ },
+ handleCurrentChange(val) {
+ this.multipleSelection = val
+ },
+ // 鍒犻櫎
+ deleteHandle(row,index) {
+ this.$confirm('鏄惁纭鍒犻櫎', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(function() {
+
+ })
+ },
+ //鍔ㄦ�佸悎骞舵柟娉�
+ rowCalc() {
+ this.spanArr.forEach((ele, index) => {
+ let parent
+ if (index !== 0) parent = this.spanArr[ele.parent || index - 1].span
+ ele.span = this.rowSpan(ele.prop, parent)
+ })
+ },
+ rowSort(list) {
+ let propList = this.spanArr.map(ele => ele.prop)
+ this.spanArr.forEach((ele, index) => {
+ let key = ele.prop
+ this.tableData = this.tableData.sort((a, b) => {
+ let flag = true;
+ for (let i = 0; i < index; i++) {
+ let prop = this.spanArr[i].prop
+ flag = flag && a[prop] == b[prop]
+ }
+ if (flag) {
+ if (a[key] < b[key]) { return 1; }
+ else if (a[key] > b[key]) { return -1; }
+ return 0;
+ }
+ return 0;
+ })
+ })
+ },
+ rowSpan(key, parent) {
+ let list = [];
+ let position = 0;
+ this.tableData.forEach((item, index) => {
+ if (index === 0) {
+ list.push(1)
+ let position = 0;
+ } else {
+ if (this.tableData[index][key] === this.tableData[index - 1][key]) {
+ if (parent && parent[index] !== 0) {
+ list.push(1)
+ position = index
+ } else {
+ list[position] += 1;
+ list.push(0)
+ }
+ } else {
+ list.push(1)
+ position = index
+ }
+ }
+ })
+ return list
+ },
+ spanMethod({ row, column, rowIndex, columnIndex }) {
+ for (let i = 0; i < this.spanArr.length; i++) {
+ const ele = this.spanArr[i]
+ if (column.property == ele.prop) {
+ const _row = ele.span[rowIndex];
+ const _col = _row > 0 ? 1 : 0;
+ return {
+ rowspan: _row,
+ colspan: _col
+ }
+ }
+ }
+ }
+ }
+}
+</script>
+<style scoped>
+.basic-template-table .el-table__body .el-table__row td:first-child .cell {
+ padding-left: 0px;
+ padding-right: 0px;
+}
+
+.basic-template-table .el-table__body .el-table__row:hover {
+ cursor: move;
+}
+
+.basic-template-table .el-table__body .el-table__row:hover .icon {
+ display: inline-block;
+}
+
+.basic-template-table .el-table__body .el-table__row .icon {
+ color: rgba(0, 0, 0, 0.45);
+ font-size: 12px;
+ line-height: 18px;
+ display: none;
+}
+
+.aufontAll {
+ font-family: aufontAll !important;
+ font-size: 14px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.h-icon-all-drag {
+ background: url('/img/tz.png') center center no-repeat;
+ background-size: cover;
+ font-size: 14px;
+}
+.h-icon-all-drag:before {
+ content: '\E63E';
+ font-size: 14px;
+ visibility: hidden;
+}
+.avue-main .el-card__body{
+ padding: 0px 20px;
+}
+</style>
diff --git a/src/views/plan/productionschedul/template-form.vue b/src/views/plan/productionschedul/template-form.vue
new file mode 100644
index 0000000..6d47932
--- /dev/null
+++ b/src/views/plan/productionschedul/template-form.vue
@@ -0,0 +1,173 @@
+<template>
+ <el-dialog
+ v-diadrag
+ :title="!dataForm.id ? '鏂板' : '淇敼'"
+ :close-on-click-modal="false"
+ :visible.sync="visible"
+ >
+ <el-form
+ :model="dataForm"
+ :rules="dataRule"
+ ref="dataForm"
+ label-width="100px"
+ class="l-mes"
+ >
+ <el-form-item label="妯℃澘缂栧彿" prop="templateNo">
+ <el-input
+ v-model="dataForm.templateNo"
+ placeholder="妯℃澘缂栧彿"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="妯℃澘鍚嶇О" prop="templateName">
+ <el-input
+ v-model="dataForm.templateName"
+ placeholder="妯℃澘鍚嶇О"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="妯℃澘绫诲瀷" prop="templateType">
+ <el-select
+ v-model="dataForm.templateType"
+ placeholder="妯℃澘绫诲瀷"
+ filterable
+ style="width: 100%"
+ clearable
+ @change="templateTypeChange"
+ >
+ <el-option
+ v-for="item in templateTypeList"
+ :key="item.id"
+ :label="item.templateTypeName"
+ :value="item.templateTypeName"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="dataForm.remark" placeholder="澶囨敞"></el-input>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="visible = false">鍙栨秷</el-button>
+ <el-button
+ type="primary"
+ :disabled="isSubmit"
+ v-thinclick="`dataFormSubmit`"
+ >纭畾</el-button
+ >
+ </span>
+ </el-dialog>
+</template>
+
+<script>
+import { getObj, addObj, putObj, getTemplateTypes } from '@/api/basic/template'
+
+export default {
+ data() {
+ return {
+ templateTypeList: [],
+ visible: false,
+ dataForm: {
+ id: 0,
+ templateName: '',
+ templateNo: '',
+ templateType: '',
+ dataType: '',
+ remark: ''
+ },
+ dataRule: {
+ templateName: [
+ { required: true, message: '妯℃澘鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }
+ ],
+ templateType: [
+ { required: true, message: '妯℃澘绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }
+ ]
+ },
+ isSubmit: false
+ }
+ },
+ methods: {
+ init(id) {
+ this.dataForm.id = id || 0
+ this.visible = true
+ this.$nextTick(() => {
+ this.$refs.dataForm.resetFields()
+ Promise.all([this.getDict(), this.getDataForm(this.dataForm.id)]).then(
+ (res) => {}
+ )
+ })
+ },
+ getDataForm(id) {
+ return new Promise((resolve, reject) => {
+ if (id) {
+ getObj(id)
+ .then((response) => {
+ if (response.data.code === 0) {
+ this.dataForm = response.data.data
+ resolve()
+ } else {
+ this.dataForm = {}
+ reject()
+ }
+ })
+ .catch((error) => {
+ reject(error)
+ })
+ }
+ })
+ },
+ getDict() {
+ return new Promise((resolve, reject) => {
+ getTemplateTypes()
+ .then((response) => {
+ if (response.data.code === 0) {
+ this.templateTypeList = response.data.data
+ resolve()
+ } else {
+ this.templateTypeList = []
+ reject()
+ }
+ })
+ .catch((error) => {
+ reject(error)
+ })
+ })
+ },
+ templateTypeChange() {
+ const currOperationTemplateType = this.dataForm.templateType
+ const templateType = this.templateTypeList.find(
+ (item) => item.templateTypeName === currOperationTemplateType
+ )
+ console.log(templateType)
+ if (templateType != undefined) {
+ this.dataForm.dataType = templateType.dataType
+ } else {
+ this.dataForm.dataType = ''
+ }
+ },
+ // 琛ㄥ崟鎻愪氦
+ dataFormSubmit() {
+ this.isSubmit = true
+ this.$refs.dataForm.validate((valid) => {
+ if (valid) {
+ if (this.dataForm.id) {
+ putObj(this.dataForm).then((data) => {
+ this.$message.success('淇敼鎴愬姛')
+ this.visible = false
+ this.isSubmit = false
+ this.$emit('refreshDataList')
+ })
+ } else {
+ addObj(this.dataForm).then((data) => {
+ this.$message.success('娣诲姞鎴愬姛')
+ this.visible = false
+ this.isSubmit = false
+ this.$emit('refreshDataList')
+ })
+ }
+ } else {
+ this.isSubmit = false
+ }
+ })
+ }
+ }
+}
+</script>
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index af65c10..78fcdff 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -205,6 +205,7 @@
export default {
data() {
return {
+ partDesc: null,
ajaxFun: palletTransportsFetchList,
currPalletTransportsRow: null,
palletTransportsMaterialMultipleSelection: [],
@@ -347,6 +348,15 @@
},
computed: {
...mapGetters(['permissions'])
+ },
+ watch:{
+ palletTransportsMaterialMultipleSelection(newVal){
+ if(newVal.length>0){
+ this.palletTransportsMaterialSelectionChange(newVal)
+ }else{
+ this.palletTransportsDetailData = []
+ }
+ }
},
created() { },
methods: {
@@ -549,8 +559,8 @@
},
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
- console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
- console.log("鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
+ // console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
+ // console.log("閫変腑鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
let transportsDetails =[]
transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
return{
@@ -567,17 +577,27 @@
}})
// this.palletTransportsDetailData = transportsDetails
if (transportsDetails.length > 0) {
+ let selectionList = this.palletTransportsMaterialMultipleSelection
saveBatchPalletTransportsDetail(transportsDetails)
.then((response) => {
const resData = response.data
if (resData.code === 0) {
this.innerVisible = false
this.$message.success('娣诲姞绉诲簱鏄庣粏鎴愬姛')
- this.MobileLibrary()
- this.$emit('refreshDataList')
+ let materialRow = selectionList[selectionList.length - 1]
+ console.log("materialRow-----",materialRow);
+ this.palletTransportsMaterialData.forEach(ele=>{
+ if(ele.id==materialRow.id){
+ console.log("ele-------",ele);
+ ele.transferQuantity = materialRow.surplusQuantity
+ ele.surplusQuantity = 0
+ }
+ })
} else {
this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
}
+ // this.getPalletTransportsMaterialData()
+ this.palletTransportsMaterialSelectionChange(selectionList)
})
// .catch(() => {
// })
@@ -585,12 +605,6 @@
},
// 娣诲姞ifs鐗╂枡搴撳瓨鍥炶皟
addIfsStockCallback() {
- // 鍒锋柊鐗╂枡闇�姹傘�佸埛鏂扮Щ搴撴槑缁�
- // this.getPalletTransportsMaterialData()
- // 鍒锋柊璐х洏杩愯緭浠诲姟鍒楄〃
- // if (this.showStock) {
- // this.getPallettransportsData()
- // }
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -706,26 +720,26 @@
},
palletTransportsMaterialSelectionChange(val) {
this.palletTransportsMaterialMultipleSelection = val
- let ids =[]
- this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
- let pId = ids[ids.length - 1];
- console.log(pId);
- this.palletTransportsDetailData = []
- this.datalistAPI = pId
- this.MobileLibrary()
- },
- MobileLibrary(){
- if(this.datalistAPI){
- selectAll({
- transportsId:this.currPalletTransportsRow.id,
- transportsMaterialId: this.datalistAPI
- }).then((res) =>{
- console.log(res);
- if(res.data.data){
- this.palletTransportsDetailData.push(res.data.data)
- }
- })
- }
+ console.log(this.palletTransportsMaterialMultipleSelection);
+ if(val && val.length>0){
+ let ids =[]
+ this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
+ let pId = ids[ids.length - 1];
+ console.log(pId);
+ if(pId!=null){
+ selectAll({
+ transportsId:this.currPalletTransportsRow.id,
+ transportsMaterialId: pId
+ }).then((res) =>{
+ this.palletTransportsDetailData = []
+ if(res.data.data){
+ this.palletTransportsDetailData.push(res.data.data)
+ }
+ })
+ }else{
+ this.palletTransportsDetailData = []
+ }
+ }
},
palletTransportsDetailSelectionChange(val) {
this.palletTransportsDetailMultipleSelection = val
@@ -742,7 +756,6 @@
})
},
optaskRowClick(row, column) {
- console.log(row,222222222222222);
this.WorkOrder = row
this.palletTransportsOptaskData.forEach((item) => {
if (row.id !== item.id) {
diff --git a/vue.config.js b/vue.config.js
index 627b473..b450b4c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,6 +2,7 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
+// const url = 'http://192.168.2.7:9999'
const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
--
Gitblit v1.9.3