qb 4 months ago
parent
commit
5f11ea6778
  1. 2
      src/page/login/aiqa.vue
  2. 10
      src/utils/LodopFuncs.js
  3. 50
      src/views/aftersales/aftersalesWorkOrder.vue
  4. 4
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  5. 4
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  6. 5
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  7. 5
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  8. 44
      src/views/distribution/reservation/reservation.vue
  9. 6
      src/views/reportforms/DeliveryDetailsReport.vue
  10. 6
      src/views/reportforms/DeliveryStatisticsReport.vue
  11. 4
      src/views/warehouse/prewarehousing/Prewarehouseorder.vue
  12. 4
      src/views/waybill/TemporaryStorageList.vue

2
src/page/login/aiqa.vue

@ -289,7 +289,7 @@ const AiData = (value = '') => {
lowercaseValue.includes('打印机驱动下载地址') lowercaseValue.includes('打印机驱动下载地址')
) { ) {
aiResponse = '打印机启动下载地址如下:'; aiResponse = '打印机启动下载地址如下:';
data.link = 'http://47.108.51.143:9000/logpm/other/CLodop_Setup_for_Win32NT.exe'; data.link = 'http://8.137.19.41:9000/logpm/other/CLodop_Setup_for_Win32NT.exe';
} else if ( } else if (
lowercaseValue.includes('扫描仪驱动') || lowercaseValue.includes('扫描仪驱动') ||
lowercaseValue.includes('扫描仪驱动下载地址') lowercaseValue.includes('扫描仪驱动下载地址')

10
src/utils/LodopFuncs.js

@ -104,7 +104,7 @@ export function getLodop(oOBJECT, oEMBED) {
<div class='container'> <div class='container'>
<div class='left'> <div class='left'>
<h2>安装Web打印服务</h2> <h2>安装Web打印服务</h2>
<p><b>第一步</b>:请您下载并安装Web打印服务CLodop。<a href='http://47.108.51.143:9000/logpm/other/CLodop_Setup_for_Win32NT.exe' target='_self'><b>点击下载</b></a></p> <p><b>第一步</b>:请您下载并安装Web打印服务CLodop。<a href='http://8.137.19.41:9000/logpm/other/CLodop_Setup_for_Win32NT.exe' target='_self'><b>点击下载</b></a></p>
</div> </div>
<div class='right'> <div class='right'>
<h2>打印机驱动下载</h2> <h2>打印机驱动下载</h2>
@ -114,16 +114,16 @@ export function getLodop(oOBJECT, oEMBED) {
<th>驱动地址</th> <th>驱动地址</th>
<th>驱动版本</th> <th>驱动版本</th>
</tr></thead><tbody><tr> </tr></thead><tbody><tr>
<td>Deli_2020.4_M-2</td><td><a href='http://47.108.51.143:9000/logpm/other/Deli_2020.4_M-2.zip' target='_self'>点击下载</a></td> <td>Deli_2020.4_M-2</td><td><a href='http://8.137.19.41:9000/logpm/other/Deli_2020.4_M-2.zip' target='_self'>点击下载</a></td>
<td>2020.4</td></tr> <td>2020.4</td></tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div>`; </div>`;
// var strCLodopInstallB = "<br>(若此前已安装过,可<a href='CLodop.protocol:setup' target='_self'>点这里直接再次启动</a>)"; // var strCLodopInstallB = "<br>(若此前已安装过,可<a href='CLodop.protocol:setup' target='_self'>点这里直接再次启动</a>)";
var strCLodopInstallB = "<br>注意事项:"; var strCLodopInstallB = "<br>注意事项:";
var strCLodopUpdate = var strCLodopUpdate =
"<br><font color='#FF00FF'>Web打印服务CLodop需升级!点击这里<a href='http://47.108.51.143:9000/logpm/other/CLodop_Setup_for_Win32NT.exe' target='_self'>执行升级</a>"; "<br><font color='#FF00FF'>Web打印服务CLodop需升级!点击这里<a href='http://8.137.19.41:9000/logpm/other/CLodop_Setup_for_Win32NT.exe' target='_self'>执行升级</a>";
var strLodop7FontTag = "<br><font color='#FF00FF'>Web打印服务Lodop7"; var strLodop7FontTag = "<br><font color='#FF00FF'>Web打印服务Lodop7";
var strLodop7HrefX86 = "点击这里<a href='Lodop7_Linux_X86_64.tar.gz' target='_self'>下载安装</a>(下载后解压,点击lodop文件开始执行)"; var strLodop7HrefX86 = "点击这里<a href='Lodop7_Linux_X86_64.tar.gz' target='_self'>下载安装</a>(下载后解压,点击lodop文件开始执行)";
var strLodop7HrefARM = "点击这里<a href='Lodop7_Linux_ARM64.tar.gz' target='_self'>下载安装</a>(下载后解压,点击lodop文件开始执行)"; var strLodop7HrefARM = "点击这里<a href='Lodop7_Linux_ARM64.tar.gz' target='_self'>下载安装</a>(下载后解压,点击lodop文件开始执行)";

50
src/views/aftersales/aftersalesWorkOrder.vue

@ -1301,13 +1301,36 @@ const ResetTableSearch = async () => {
PublicDataRequest(TabPermissions.value, true); PublicDataRequest(TabPermissions.value, true);
}; };
// //
// const searchReset = () => {
// TopQuery.value = {};
// let _Obj = MatchCurrentMenu();
// _Obj.currentPage = 1;
// TabList.value.forEach(item => {
// item.query = {};
// });
// const TabcolumnList = [
// columnList,
// columnList1,
// columnList2,
// columnList3,
// columnList4,
// columnList5,
// columnList6,
// columnList7,
// columnList8,
// columnList9,
// columnList10,
// ];
// TabcolumnList.forEach(item => {
// handleClearTableQuery(item);
// });
// details.search = false; //
// updateMenuAndData(); //
// autoscaling();
// };
const searchReset = () => { const searchReset = () => {
TopQuery.value = {};
let _Obj = MatchCurrentMenu();
_Obj.currentPage = 1;
TabList.value.forEach(item => {
item.query = {};
});
const TabcolumnList = [ const TabcolumnList = [
columnList, columnList,
columnList1, columnList1,
@ -1321,14 +1344,19 @@ const searchReset = () => {
columnList9, columnList9,
columnList10, columnList10,
]; ];
TopQuery.value = {};
TabcolumnList.forEach(item => { let _Obj = MatchCurrentMenu();
handleClearTableQuery(item); _Obj.currentPage = 1;
}); const TabListLength = TabList.value.length;
for (let i = 0; i < TabListLength; i++) {
TabList.value[i].query = {};
handleClearTableQuery(TabcolumnList[i]);
}
details.search = false; // details.search = false; //
updateMenuAndData(); // updateMenuAndData();
autoscaling(); autoscaling();
}; };
// //
const searchHide = () => { const searchHide = () => {
console.log(details); console.log(details);

4
src/views/distribution/deliverylist/distributionDeliveryList.vue

@ -1059,9 +1059,9 @@ export default {
const currentDate = dayjs(); const currentDate = dayjs();
// //
// //
const startDate = currentDate.startOf('month'); const startDate = currentDate.subtract(23, 'day');
// //
const endDate = currentDate.endOf('month'); const endDate = currentDate.add(7, 'day');
// 'YYYY-MM-DD' // 'YYYY-MM-DD'
const formatDate = date => date.format('YYYY-MM-DD'); const formatDate = date => date.format('YYYY-MM-DD');
this.Deliverydate = []; this.Deliverydate = [];

4
src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@ -990,9 +990,9 @@ export default {
// //
const currentDate = dayjs(); const currentDate = dayjs();
// //
const startDate = currentDate.startOf('month'); const startDate = currentDate.subtract(23, 'day');
// //
const endDate = currentDate.endOf('month'); const endDate = currentDate.add(7, 'day');
// 'YYYY-MM-DD' // 'YYYY-MM-DD'
const formatDate = date => date.format('YYYY-MM-DD'); const formatDate = date => date.format('YYYY-MM-DD');
this.query.taskTimeArr = []; this.query.taskTimeArr = [];

5
src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@ -779,9 +779,10 @@ export default {
// //
const currentDate = dayjs(); const currentDate = dayjs();
// //
const startDate = currentDate.startOf('month'); const startDate = currentDate.subtract(23, 'day');
// //
const endDate = currentDate.endOf('month'); const endDate = currentDate.add(7, 'day');
// 'YYYY-MM-DD' // 'YYYY-MM-DD'
const formatDate = date => date.format('YYYY-MM-DD'); const formatDate = date => date.format('YYYY-MM-DD');
this.query.taskTimeArr = []; this.query.taskTimeArr = [];

5
src/views/distribution/inventory/distrilbutionBillLadingList.vue

@ -1134,9 +1134,10 @@ export default {
// //
const currentDate = dayjs(); const currentDate = dayjs();
// //
const startDate = currentDate.startOf('month'); const startDate = currentDate.subtract(23, 'day');
// //
const endDate = currentDate.endOf('month'); const endDate = currentDate.add(7, 'day');
// 'YYYY-MM-DD' // 'YYYY-MM-DD'
const formatDate = date => date.format('YYYY-MM-DD'); const formatDate = date => date.format('YYYY-MM-DD');
this.Deliverytime = []; this.Deliverytime = [];

44
src/views/distribution/reservation/reservation.vue

@ -333,14 +333,16 @@
</el-dialog> </el-dialog>
<el-dialog title="预约取消" v-model="dialogCancelReservation" style="width: 30%; height: 40%"> <el-dialog title="预约取消" v-model="dialogCancelReservation" style="width: 30%; height: 40%">
<el-form :model="cancel"> <div v-loading="dialogCancelReservationloading" element-loading-text="Loading..." class="el_gCancelReservation">
<el-form-item label="原因:"> <el-form :model="cancel">
<el-input v-model="cancel.message" autocomplete="off"></el-input> <el-form-item label="原因:">
</el-form-item> <el-input :rows="4" type="textarea" v-model="cancel.message" autocomplete="off"></el-input>
</el-form> </el-form-item>
<div slot="footer" class="dialog-footer"> </el-form>
<el-button @click="dialogCancelReservation = false"> </el-button> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancelReservationConfirm(row)"> </el-button> <el-button @click="dialogCancelReservation = false"> </el-button>
<el-button type="primary" @click="cancelReservationConfirm(row)" :disabled="dialogCancelReservationloading"> </el-button>
</div>
</div> </div>
</el-dialog> </el-dialog>
@ -387,6 +389,7 @@ export default {
data() { data() {
return { return {
// //
dialogCancelReservationloading: false,
dialogVisible: false, dialogVisible: false,
// html // html
html: '', html: '',
@ -1100,6 +1103,7 @@ export default {
this.$message.warning('请输入取消原因!!'); this.$message.warning('请输入取消原因!!');
return; return;
} }
this.dialogCancelReservationloading = true;
let data = {}; let data = {};
if (this.cancelReservationRow) { if (this.cancelReservationRow) {
data = this.cancelReservationRow; data = this.cancelReservationRow;
@ -1108,11 +1112,19 @@ export default {
this.$message.error('请稍后再试!!'); this.$message.error('请稍后再试!!');
return; return;
} }
cancelReservation(data).then(res => { cancelReservation(data)
this.onLoad(this.page); .then(res => {
this.cancelReservationRow = {}; this.onLoad(this.page);
this.dialogCancelReservation = false; this.cancelReservationRow = {};
}); this.dialogCancelReservation = false;
})
.catch(err => {
console.log(err);
})
.finally(() => {
this.dialogCancelReservationloading = false;
});
}, },
ddd() { ddd() {
this.form.deliveryType === ''; this.form.deliveryType === '';
@ -1746,4 +1758,10 @@ export default {
.avue-crud { .avue-crud {
height: 100%; height: 100%;
} }
.el_gCancelReservation{
.el-form-item{
width: 100%;
flex-direction: column;
}
}
</style> </style>

6
src/views/reportforms/DeliveryDetailsReport.vue

@ -283,9 +283,13 @@ function updateDictionary(targetArray, dictionaryType) {
// //
const onLoad = async () => { const onLoad = async () => {
console.log($route, '地址栏数据');
try { try {
details.loadingObj.list = true; details.loadingObj.list = true;
if ($route.query.deliveryType) {
details.columnList.find(item => item.prop == 'deliveryType').type = 1;
} else {
details.columnList.find(item => item.prop == 'deliveryType').type = 3;
}
let submit = { let submit = {
current: details.page.currentPage, current: details.page.currentPage,
size: details.page.pageSize, size: details.page.pageSize,

6
src/views/reportforms/DeliveryStatisticsReport.vue

@ -182,7 +182,7 @@ const queryCarn = ref({});
const DeliveryTypeList = ref([ const DeliveryTypeList = ref([
{ {
label: '全部', label: '全部',
value: '商配,市配', value: '商配,市配,自提',
}, },
{ {
label: '商配', label: '商配',
@ -192,6 +192,10 @@ const DeliveryTypeList = ref([
label: '市配', label: '市配',
value: '市配', value: '市配',
}, },
{
label: '自提',
value: '自提',
},
]); ]);
const TopQuery = ref({ const TopQuery = ref({
warehouseNameRange: [], warehouseNameRange: [],

4
src/views/warehouse/prewarehousing/Prewarehouseorder.vue

@ -1158,8 +1158,8 @@ const handleClose = res => {
const handleDownLoadFile = () => { const handleDownLoadFile = () => {
const url = const url =
details.ouPaiChooseType === 1 details.ouPaiChooseType === 1
? 'http://47.108.51.143:9000/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx' ? 'http://8.137.19.41:9000/logpm/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx'
: 'http://8.137.14.82:9000/bladex/upload/20240612/%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%EF%BC%88%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%EF%BC%89.xlsx'; : 'http://8.137.19.41:9000/logpm/bladex/upload/20240612/%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%28%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%29.xlsx';
const name = const name =
details.ouPaiChooseType === 1 details.ouPaiChooseType === 1
? '包条导入模版(货无忧-生成包条).xlsx' ? '包条导入模版(货无忧-生成包条).xlsx'

4
src/views/waybill/TemporaryStorageList.vue

@ -1477,8 +1477,8 @@ const handleOpenAddTagDlog = async () => {
const handleDownLoadFile = () => { const handleDownLoadFile = () => {
const url = const url =
details.ouPaiChooseType === 1 details.ouPaiChooseType === 1
? 'http://47.108.51.143:9000/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx' ? 'http://8.137.19.41:9000/logpm/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx'
: 'http://8.137.14.82:9000/bladex/upload/20240612/%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%EF%BC%88%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%EF%BC%89.xlsx'; : 'http://8.137.19.41:9000/logpm/bladex/upload/20240612/%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%28%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%29.xlsx';
const name = const name =
details.ouPaiChooseType === 1 details.ouPaiChooseType === 1
? '包条导入模版(货无忧-生成包条).xlsx' ? '包条导入模版(货无忧-生成包条).xlsx'

Loading…
Cancel
Save