| admin/src/api/store/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/stock/components/AssetSel.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/stock/out.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| h5/pages/inventory/detail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| h5/pages/login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| h5/pages/polling/empty.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| h5/pages/workOrder/wait.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
admin/src/api/store/index.js
@@ -7,7 +7,8 @@ } export function ywOutinboundEx (data) { return request.post('/visitsAdmin/cloudService/business/ywOutinbound/exportExcel', data, { trim: true trim: true, download: true }) } export function ywOutinboundDetail (id) { admin/src/views/stock/components/AssetSel.vue
@@ -28,7 +28,7 @@ <el-table-column prop="brand" label="品牌" min-width="80px"></el-table-column> <el-table-column prop="attr" label="规格型号" min-width="80px"></el-table-column> <el-table-column prop="unitName" label="单位" min-width="80px"></el-table-column> <el-table-column prop="maxStock" label="库存" min-width="80px"></el-table-column> <el-table-column v-if="isOut" prop="maxStock" label="库存" min-width="80px"></el-table-column> </el-table> <Pagination class="mt10" @size-change="handleSizeChange" @current-change="getList" :pagination="pagination"> </Pagination> @@ -83,7 +83,7 @@ const { pagination, searchForm, isOut, warehouseId } = this this.listLoading = true if(page){pagination.page = page} console.log('isOut', isOut); console.log('isOut', isOut) let fn = isOut ? ywStockPage : fetchList fn({ admin/src/views/stock/out.vue
@@ -40,7 +40,7 @@ import dayjs from 'dayjs' import duration from 'dayjs/plugin/duration' dayjs.extend(duration) import { ywOutinboundPage } from '@/api' import { ywOutinboundPage, ywOutinboundEx } from '@/api' import { fetchList as getStoreList } from '@/api/ywWarehouse' import { StoreTypeOps, rules } from './components/config' export default { h5/pages/inventory/detail.vue
@@ -32,7 +32,7 @@ <view class="line">规格型号：{{ item.materialAttr }}</view> <view class="line" v-if="item.status == 0"> <view class="">账面数量：{{ item.stock }}{{ item.materialUnitName }}</view> <view @click.stop="openEheck(item)" class="btn">执行盘点</view> <view v-if="info.status == 1" @click.stop="openEheck(item)" class="btn">执行盘点</view> </view> <view class="static" v-if="item.status == 1"> <view class="ite"> @@ -86,8 +86,10 @@ <image v-if="!modalForm.actStock" src="@/static/side/btn_jian_grey@2x.png" mode=""></image> <image v-else @click="changeAct(-1)" src="@/static/side/btn_jian@3x.png" mode=""></image> </template> <input :disabled="Boolean(modalForm.handleType && modalForm.handleType == 'detail')" type="digit" v-model="modalForm.actStock"></input> <image v-if="!modalForm.handleType" @click="changeAct(1)" src="@/static/side/btn_jia@3x.png" mode=""></image> <input :disabled="Boolean(modalForm.handleType && modalForm.handleType == 'detail')" type="digit" v-model="modalForm.actStock"></input> <image v-if="!modalForm.handleType" @click="changeAct(1)" src="@/static/side/btn_jia@3x.png" mode=""> </image> </view> <view class="unit">{{ modalForm.materialUnitName }}</view> </view> @@ -95,8 +97,9 @@ </view> <view class="remark"> <view class="la">备注：</view> <textarea v-model="modalForm.remark" :disabled="Boolean(modalForm.handleType && modalForm.handleType == 'detail')" placeholder="请填写备注" :maxlength="-1" placeholder-class="placeholder9" cols="30" rows="10"></textarea> <textarea v-model="modalForm.remark" :disabled="Boolean(modalForm.handleType && modalForm.handleType == 'detail')" placeholder="请填写备注" :maxlength="-1" placeholder-class="placeholder9" cols="30" rows="10"></textarea> </view> <view v-if="!modalForm.handleType" class="btns"> <view class="btn" @click="showModal = false">取消</view> @@ -185,12 +188,12 @@ }) }, handleQuery(str) { handleQuery() { this.list = [] this.page = 1 this.getList(str) this.getList() }, getList(str) { getList() { const { page, activeTab, @@ -201,17 +204,29 @@ capacity: 20, page, model: { status: str || activeTab, status: activeTab, stocktakingId: id, ...param } }).then(res => { this.list = [...this.list, ...res.data.records] this.list = [...this.list, ...res.data.records || []] this.total = res.data.total if (this.param.materialQrcode && this.list.length == 1) { if (this.param.materialQrcode && this.total == 1) { this.openEheck(this.list[0]) this.$set(this.param, 'materialQrcode', null) this.param = {} } else if (this.param.materialQrcode && this.total == 0) { this.param = {} uni.showModal({ content: '未匹配到物料，请重新扫码', showCancel: false, success: (res) => { if (res.confirm) { this.getList() } } }); } }) }, scrolltolower() { @@ -259,7 +274,9 @@ this.getList() }, tipSub() { const { info } = this const { info } = this ywStocktaFinishById(info.id).then(res => { this.showTip = false uni.navigateBack() @@ -282,7 +299,7 @@ if (decodeText) { //这里decodeText就是通过扫描二维码得到的内容 this.stopScan() this.$set(this.param, 'materialQrcode', decodeText) this.handleQuery('null') this.handleQuery() } }, (err) => { @@ -397,17 +414,20 @@ margin-bottom: 10rpx; flex: 1; } .head{ display: flex; // align-items: center; justify-content: space-between; color: #666666; .status{ width: 76rpx; text-align: right; padding-top: 3rpx; } } .line { height: 60rpx; display: flex; h5/pages/login.vue
@@ -101,7 +101,7 @@ }) } else { uni.redirectTo({ url: "/pages/polling/empty" url: "/pages/polling/empty?message=" + res.message }) } }) @@ -164,7 +164,7 @@ }) } else { uni.redirectTo({ url: "/pages/polling/empty" url: "/pages/polling/empty?message=" + res.message }) } }) h5/pages/polling/empty.vue
@@ -1,6 +1,7 @@ <template> <view class="main_app"> <image class="logo" src="@/static/side/default_empty@2x.png" mode=""></image> <view class="message">{{message}}</view> <view class="btn" @click="backHome">返回主页</view> </view> </template> @@ -9,8 +10,11 @@ export default { data() { return { message: '' }; }, onLoad(op) { this.message = op.message || '' }, methods: { backHome(){ @@ -29,6 +33,13 @@ height: 228rpx; margin: 60% auto 0; } .message{ font-weight: 500; font-size: 30rpx; color: #222222; margin-top: 20rpx; text-align: center; } .btn{ position: fixed; bottom: 64rpx; h5/pages/workOrder/wait.vue
@@ -28,7 +28,7 @@ <view v-if="item.status == 0 && item.param3 == 0 && (item.type == 0 || item.type == 1)" class="status">未开始 </view> <view v-if="item.status == 0 && item.param3 == 1 && (item.type == 0 || item.type == 1)" class="status green">进行中</view> class="status green">{{ item.type == 0 ? '盘点中' : '进行中' }}</view> <view v-if="item.status == 1 && item.type == 2" class="status gray">已处理</view> <view v-if="item.status == 1 && (item.type == 0 || item.type == 1)" class="status gray">已完成</view> </view> @@ -37,7 +37,7 @@ <view class="text">执行时间：{{item.obj.key3}}</view> <view class="text"> <view class="">巡检负责人：{{item.obj.key4}}</view> <view class="btn" @click.stop="openSc(item)"> <view v-if="queryStatus == 0" class="btn" @click.stop="openSc(item)"> <image src="@/static/side/ic_saoma@2x.png" mode=""></image> <view v-if="item.status == 0" class="">扫码巡检</view> </view> @@ -249,7 +249,7 @@ .tabs { display: flex; width: 750rpx; margin: 12rpx 0rpx 0; margin: 0rpx 0rpx 0; border-bottom: 1rpx solid #E5E5E5; background-color: #fff;
