| .env.production | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/kanbanManager/zhkb.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mouldManager/mouldCheckRecord.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mouldManager/mouldCheckStand.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mouldManager/mouldCirculateRecord.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mouldManager/mouldMaintainRecord.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mouldManager/mouldMaintainStand.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mouldManager/mouldOutInRecord.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mouldManager/mouldUpDownRecord.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/workOrder/workOrderList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/workOrder/workOrderSend.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.env.production
@@ -6,7 +6,7 @@ # 文件下载地址 下载数据模板地址 # 本地服务器 VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8049/' # VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8049/' # 客户 优步 # VUE_APP_BASE_API_FILE = 'http://192.168.0.120:8000/' VUE_APP_BASE_API_FILE = 'http://192.168.0.120:8000/' src/views/kanbanManager/zhkb.vue
@@ -101,9 +101,9 @@ display: flex;justify-content: flex-start; flex-wrap: wrap;" > <div v-for="i in LeftBottomData01" :key="i.wkshp_code" style="margin:0 18px" class="flex_c_s"> <div v-for="i in LeftBottomData01" :key="i.torg_code" style="margin:0 18px" class="flex_c_s"> <div class="all_block01 flex_c_s"> <div class="flex_c_c all_block02" style="">{{ i.wkshp_name }}</div> <div class="flex_c_c all_block02" style="">{{ i.torg_name }}</div> <div class="" style="display: flex;justify-content:space-between"> <div class="all_block02 flex_c_c" style="width: 49% ">任务数</div> <div class="all_block02 flex_c_c" style="width: 49% ">{{ i.plan_qty }}</div> @@ -269,47 +269,19 @@ }, 1000 * 40) const temp2 = [ { wkshp_code: '1', wkshp_name: '机加工' }, { wkshp_code: '2', wkshp_name: '台钻' }, { wkshp_code: '3', wkshp_name: '修检' }, { wkshp_code: '4', wkshp_name: '喷漆' }, { wkshp_code: '5', wkshp_name: '组装' } { wkshp_code: 'CJ001', wkshp_name: '金工车间' }, { wkshp_code: 'YBCS003', wkshp_name: '优步生产部' } ] // 左下 生产订单 const res4 = await WorkShopCompreLeftTop({ wkshopcode: temp2.map(i => i.wkshp_code).join(',') }) for (const res4Key in res4.data.LeftTop) { const data = { good_qty: 0, plan_qty: 0, wkshp_code: '', wkshp_name: '' } data.good_qty = res4.data.LeftTop[res4Key][0].good_qty data.plan_qty = res4.data.LeftTop[res4Key][0].plan_qty data.wkshp_code = res4.data.LeftTop[res4Key][0].wkshp_code data.wkshp_name = temp2.find(i => i.wkshp_code === data.wkshp_code).wkshp_name this.LeftBottomData01.push(data) } this.LeftBottomData01 = res4.data setInterval(() => { WorkShopCompreLeftTop({ wkshopcode: temp2.map(i => i.wkshp_code).join(',') }).then(res2 => { this.LeftBottomData01 = [] this.LeftBottomData02 = [] for (const res4Key in res4.data.LeftTop) { const data = { good_qty: 0, plan_qty: 0, wkshp_code: '', wkshp_name: '' } data.good_qty = res2.data.LeftTop[res4Key][0].good_qty data.plan_qty = res2.data.LeftTop[res4Key][0].plan_qty data.wkshp_code = res2.data.LeftTop[res4Key][0].wkshp_code data.wkshp_name = temp2.find(i => i.wkshp_code === data.wkshp_code).wkshp_name this.LeftBottomData01.push(data) } this.LeftBottomData01 = res4.data }) }, 1000 * 30)
@@ -130,7 +130,7 @@ /> <el-table-column prop="mould_spec" label="产品规格" label="规格型号" show-tooltip-when-overflow sortable="custom" > src/views/mouldManager/mouldCheckStand.vue
@@ -541,8 +541,8 @@ // 修改前请求接口 async getViewDeviceCheckStanedSearch(checkstand_code) { const { data: res } = await ViewMouldCheckStanedSearch({ checkstand_code }) this.tableDataDialog = res.data this.checkSelectedValue = res.data.map(i => i.code) this.tableDataDialog = res.Data this.checkSelectedValue = res.Data.map(i => i.code) this.dialogForm.code = res.code this.dialogForm.name = res.name src/views/mouldManager/mouldCirculateRecord.vue
@@ -122,7 +122,7 @@ /> <el-table-column prop="mould_spec" label="产品规格" label="规格型号" show-tooltip-when-overflow sortable="custom" > src/views/mouldManager/mouldMaintainRecord.vue
@@ -130,7 +130,7 @@ /> <el-table-column prop="mould_spec" label="产品规格" label="规格型号" show-tooltip-when-overflow sortable="custom" > src/views/mouldManager/mouldMaintainStand.vue
@@ -542,8 +542,8 @@ // 修改前请求接口 async getViewMouldRepairStanedSearch(repairstand_code) { const { data: res } = await ViewMouldRepairStanedSearch({ repairstand_code }) this.tableDataDialog = res.data this.checkSelectedValue = res.data.map(i => i.code) this.tableDataDialog = res.Data this.checkSelectedValue = res.Data.map(i => i.code) this.dialogForm.code = res.code this.dialogForm.name = res.name src/views/mouldManager/mouldOutInRecord.vue
@@ -128,7 +128,7 @@ /> <el-table-column prop="mould_spec" label="产品规格" label="规格型号" show-tooltip-when-overflow sortable="custom" > src/views/mouldManager/mouldUpDownRecord.vue
@@ -125,7 +125,7 @@ /> <el-table-column prop="mould_spec" label="产品规格" label="规格型号" show-tooltip-when-overflow sortable="custom" > src/views/workOrder/workOrderList.vue
@@ -1525,6 +1525,7 @@ </div> <div id="qrCode0" :key="formApprove.mesordercode" style="width: 22%;height:90px; margin-top: 20px; overflow-y: scroll;display: flex; @@ -1555,22 +1556,29 @@ width="70" align="center" /> <!-- <el-table-column--> <!-- id="column1"--> <!-- prop="stepqrcode"--> <!-- label="工序二维码"--> <!-- width="100"--> <!-- align="center"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" :key="'qrCodeDiv'+row.seq" class="tableColumn" />--> <!-- </template>--> <!-- </el-table-column>--> <el-table-column id="column1" prop="stepqrcode" label="工序二维码" prop="stepcode" label="工序编码" width="100" align="center" > <template slot-scope="{row}"> <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" :key="'qrCodeDiv'+row.seq" class="tableColumn" /> </template> </el-table-column> /> <el-table-column id="column2" prop="stepname" label="工序" label="工序名称" width="120" align="center" /> @@ -1654,6 +1662,7 @@ </div> <div id="qrCode1" :key="formApprove.mesordercode" style="width: 22%;height:90px; margin-top: 20px; overflow-y: scroll;display: flex; @@ -1684,18 +1693,25 @@ width="70" align="center" /> <!-- <el-table-column--> <!-- id="column1"--> <!-- prop="stepqrcode"--> <!-- label="工序二维码"--> <!-- width="100"--> <!-- align="center"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" :key="'qrCodeDiv'+row.seq" class="tableColumn" />--> <!-- </template>--> <!-- </el-table-column>--> <el-table-column id="column1" prop="stepqrcode" label="工序二维码" prop="stepcode" label="工序编码" width="100" align="center" > <template slot-scope="{row}"> <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" :key="'qrCodeDiv'+row.seq" class="tableColumn" /> </template> </el-table-column> /> <el-table-column id="column2" prop="stepname" @@ -4051,8 +4067,10 @@ res3 = res2.data.recordset } console.log(JSON.parse(JSON.stringify(res2.data.recordset))) // this.tableDataPrint = res3 this.tableDataPrint = this.chunkArray(res3, 8) this.tableDataPrint = this.chunkArray(res3, 15) this.formApprove.mesordercode = res3[0].wo_code this.formApprove.m_po = res3[0].m_po || '/' @@ -4129,15 +4147,15 @@ correctLevel: QRCode.CorrectLevel.L// 容错率，L/M/H }) } else { new QRCode(this.$refs['qrCodeDiv' + seq], { text: text, width: size === 'big' ? 90 : 60, height: size === 'big' ? 90 : 60, // colorDark: '#333333', // 二维码颜色 colorDark: '#000', // 二维码颜色 colorLight: '#ffffff', // 二维码背景色 correctLevel: QRCode.CorrectLevel.L// 容错率，L/M/H }) // new QRCode(this.$refs['qrCodeDiv' + seq], { // text: text, // width: size === 'big' ? 90 : 60, // height: size === 'big' ? 90 : 60, // // colorDark: '#333333', // 二维码颜色 // colorDark: '#000', // 二维码颜色 // colorLight: '#ffffff', // 二维码背景色 // correctLevel: QRCode.CorrectLevel.L// 容错率，L/M/H // }) } },
@@ -265,66 +265,66 @@ show-tooltip-when-overflow width="100" /> <!-- <el-table-column--> <!-- prop="priuserdefnvc1"--> <!-- label="客户名称"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc1 ? row.priuserdefnvc1 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc6"--> <!-- label="客户编码"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc6 ? row.priuserdefnvc6 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc2"--> <!-- label="对内名称"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc2 ? row.priuserdefnvc2 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc3"--> <!-- label="CTP日期"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc3 ? row.priuserdefnvc3 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc4"--> <!-- label="钢刀编号"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc4 ? row.priuserdefnvc4 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc5"--> <!-- label="盒型"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc5 ? row.priuserdefnvc5 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc1"--> <!-- label="客户名称"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc1 ? row.priuserdefnvc1 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc6"--> <!-- label="客户编码"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc6 ? row.priuserdefnvc6 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc2"--> <!-- label="对内名称"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc2 ? row.priuserdefnvc2 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc3"--> <!-- label="CTP日期"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc3 ? row.priuserdefnvc3 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc4"--> <!-- label="钢刀编号"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc4 ? row.priuserdefnvc4 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc5"--> <!-- label="盒型"--> <!-- width="110"--> <!-- sortable="custom"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- {{ row.priuserdefnvc5 ? row.priuserdefnvc5 : '/' }}--> <!-- </template>--> <!-- </el-table-column>--> <el-table-column prop="wkshp_name" label="生产车间" @@ -389,19 +389,19 @@ <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click.stop="del(row)" /> </el-tooltip> <el-tooltip class="item" effect="dark" content="打印工单" placement="top"> <!-- <i--> <!-- class="el-icon-tickets"--> <!-- style="cursor: pointer;color: #42b983;margin-right: 15px"--> <!-- @click="check(row)"--> <!-- />--> <i :style="{color:$store.state.settings.theme}" class="el-icon-printer" style="cursor: pointer;margin-right: 15px" @click.stop="handlePrint(row.wo_code)" /> </el-tooltip> <!-- <el-tooltip class="item" effect="dark" content="打印工单" placement="top">--> <!-- <!– <i–>--> <!-- <!– class="el-icon-tickets"–>--> <!-- <!– style="cursor: pointer;color: #42b983;margin-right: 15px"–>--> <!-- <!– @click="check(row)"–>--> <!-- <!– />–>--> <!-- <i--> <!-- :style="{color:$store.state.settings.theme}"--> <!-- class="el-icon-printer"--> <!-- style="cursor: pointer;margin-right: 15px"--> <!-- @click.stop="handlePrint(row.wo_code)"--> <!-- />--> <!-- </el-tooltip>--> <el-tooltip class="item" effect="dark" content="详情" placement="top"> <i
