From 9782db3b170f38829bdd1ad6ef70e83d90072a28 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 07 一月 2026 16:07:29 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/style/MJListStyle.scss | 0
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue | 708 ++++++++++++++++++++++
pages.json | 43 +
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue | 9
pages/index/tab2.vue | 189 ++++-
pages/index/tab4.vue | 53 -
pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue | 4
pages/ZLGL/zaikujianyandan/InStockCheckBillList.vue | 333 ++++++++++
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue | 5
pages/MJGL/style/MJBillStyle.scss | 264 ++++++++
uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue | 2
pages/index/tab1.vue | 66 -
static/tabBar/icon4.png | 0
pages/shengchandiaobo/MoveStockBill.vue | 17
static/tabBar/icon4-default.png | 0
manifest.json | 4
pages/index/tab3.vue | 99 +-
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue | 19
pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue | 2
pages/index/login.vue | 2
pages/shengchanlingliao/PPickingCheckBill.vue | 3
components/FIFOListModule/FIFOListComponent.vue | 4
pages/index/index.vue | 43
23 files changed, 1,643 insertions(+), 226 deletions(-)
diff --git a/components/FIFOListModule/FIFOListComponent.vue b/components/FIFOListModule/FIFOListComponent.vue
index 63735c1..4d6e164 100644
--- a/components/FIFOListModule/FIFOListComponent.vue
+++ b/components/FIFOListModule/FIFOListComponent.vue
@@ -25,6 +25,10 @@
<text>涓嬫灦鏁伴噺: </text>
{{ FIFOItem['涓嬫灦鏁伴噺'] }}
</view>
+ <view class="item">
+ <text>鐢熶骇鏃ユ湡: </text>
+ {{ FIFOItem['鎺у埗鍊�'] }}
+ </view>
</view>
</uni-card>
</view>
diff --git a/manifest.json b/manifest.json
index a66fbe2..1cbe8d4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.0.42",
- "versionCode" : 242,
+ "versionName" : "2.0.46",
+ "versionCode" : 246,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index c13608c..97acd53 100644
--- a/pages.json
+++ b/pages.json
@@ -1410,6 +1410,27 @@
{
"navigationBarTitleText" : "鍦ㄥ簱妫�楠屽崟"
}
+ },
+ {
+ "path" : "pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
+ "style" :
+ {
+ "navigationBarTitleText" : "璁惧淇濆吇璁板綍鍗�"
+ }
+ },
+ {
+ "path" : "pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
+ "style" :
+ {
+ "navigationBarTitleText" : "璁惧鐐规璁板綍鍗�"
+ }
+ },
+ {
+ "path" : "pages/ZLGL/zaikujianyandan/InStockCheckBillList",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍦ㄥ簱妫�楠屽崟鍒楄〃"
+ }
}
],
@@ -1428,25 +1449,25 @@
"pagePath": "pages/index/tab1",
"iconPath": "static/tabBar/icon1.png",
"selectedIconPath": "static/tabBar/icon1-default.png",
- "text": "杞﹂棿宸ュ簭"
- },
- {
- "pagePath": "pages/index/tab2",
- "iconPath": "static/tabBar/icon2.png",
- "selectedIconPath": "static/tabBar/icon2-default.png",
- "text": "鍗曟嵁鍒楄〃"
+ "text": "杞﹂棿绠＄悊"
},
{
"pagePath": "pages/index/tab3",
- "iconPath": "static/tabBar/icon2.png",
- "selectedIconPath": "static/tabBar/icon2-default.png",
- "text": "鍣ㄥ叿绠＄悊"
+ "iconPath": "static/tabBar/icon4.png",
+ "selectedIconPath": "static/tabBar/icon4-default.png",
+ "text": "璁惧绠＄悊"
},
{
"pagePath": "pages/index/tab4",
+ "iconPath": "static/tabBar/icon3.png",
+ "selectedIconPath": "static/tabBar/icon3-default.png",
+ "text": "璐ㄩ噺绠＄悊"
+ },
+ {
+ "pagePath": "pages/index/tab2",
"iconPath": "static/tabBar/icon2.png",
"selectedIconPath": "static/tabBar/icon2-default.png",
- "text": "璐ㄩ噺绠＄悊"
+ "text": "鍗曟嵁鍒楄〃"
},
{
"pagePath": "pages/index/mine",
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
new file mode 100644
index 0000000..1aef13a
--- /dev/null
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -0,0 +1,708 @@
+<template>
+ <view>
+ <view class="tabs" id="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+ <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view>
+ </view>
+ <!-- 鍩烘湰淇℃伅 -->
+ <template v-if="tabs == 0">
+ <view class="form" :style="{
+ height: containerHeight + 'px',
+ overflow: 'auto'
+ }">
+ <view class="form-item">
+ <view class="title">璁惧鏉＄爜:</view>
+ <view class="right">
+ <input v-model="hform.HBarCode" @confirm="GetMessageByBarCode(hform.HBarCode)"
+ placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐐规寮�濮�:</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+ <input :value="hform.HBeginDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐐规缁撴潫:</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+ <input :value="hform.HEndDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏁伴噺:</view>
+ <view class="right">
+ <input type="number" v-model="hform.HQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏈�缁堢粨璁�:</view>
+ <view class="right none-border">
+ <radio-group @change="radioChange" class="radio_Container">
+ <label>
+ <view>
+ <radio value="OK" :checked="hform.HLastResult == 'OK'" />
+ <text>OK</text>
+ </view>
+ </label>
+ </label>
+ <view>
+ <radio value="NG" :checked="hform.HLastResult == 'NG'" />
+ <text>NG</text>
+ </view>
+ </label>
+ </radio-group>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">寮傚父鎯呭喌璁板綍:</view>
+ <view class="right">
+ <input v-model="hform.HErrNote" placeholder="璇疯緭鍏ュ紓甯告儏鍐佃褰�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">閲嶅ぇ瀹夊叏闅愭偅璁板綍:</view>
+ <view class="right">
+ <input v-model="hform.HBigSafeNote" placeholder="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮ｈ褰�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐐规鏁版嵁:</view>
+ <view class="right">
+ <input v-model="hform.HDotCheckNote" placeholder="璇疯緭鍏ョ偣妫�鏁版嵁" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇鐝:</view>
+ <zxz-uni-data-select class="right" :localdata="HShiftsList" dataKey="鐝鍚嶇О" dataValue="HItemID"
+ v-model="hform.HShiftsID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">閮ㄩ棬:</view>
+ <zxz-uni-data-select class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О" dataValue="HItemID"
+ v-model="hform.HDeptID">
+
+ </zxz-uni-data-select>
+ <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+ </view>
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right">
+ <input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧鍚嶇О:</view>
+ <view class="righton">
+ <input v-model="hform.HBarName" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧瑙勬牸:</view>
+ <view class="righton">
+ <input v-model="hform.HBarSpec" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧鍨嬪彿:</view>
+ <view class="righton">
+ <input v-model="hform.HBarModel" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐐规璁″垝:</view>
+ <view class="righton">
+ <input v-model="hform.HPlanNo" disabled />
+ </view>
+ </view>
+ </view>
+ </template>
+ <!-- 鏄庣粏淇℃伅 -->
+ <template v-if="tabs == 1">
+ <view class="form">
+ <view class="form-item">
+ <view class="left">
+ 璁惧鐐规瑙勭▼
+ </view>
+ <view class="right">
+ <input type="text" :value="hform.HEquipDotCheckRuleInterNo" />
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
+ </view>
+ </view>
+ </view>
+ <view class="list" v-for="(item,index) in HCheckFileList" :key="index">
+ <uni-card style="margin: 10px;">
+ <view class="card-detail">
+ <view class="detail">
+ <text>搴忓彿锛�</text>{{index+1}}
+ </view>
+ <view class="detail">
+ <text>缁撴灉锛�</text>
+ <checkbox-group style="display: inline-block;"
+ @change="checkBoxChangeHandler(index, $event)">
+ <checkbox value="enabled" :checked="item.HDotCheckResult" />
+ </checkbox-group>
+ </view>
+ <view class="detail">
+ <text>鐐规椤圭洰鍒嗙被锛�</text>{{item.HDotCheckItemClassName}}
+ </view>
+ <view class="detail">
+ <text>鐐规鏂规硶锛�</text>{{item.HDotCheckItemMethodName}}
+ </view>
+ <view class="detail">
+ <text>鐐规閮ㄤ綅锛�</text>{{item.HDotCheckPart}}
+ </view>
+ <view class="detail">
+ <text>璐熻矗浜哄悕绉帮細</text>{{item.HManagerName}}
+ </view>
+ <view class="detail">
+ <text>澶囨敞锛�</text>{{item.HRemark}}
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
+ </template>
+ <!-- 鍏朵粬淇℃伅 -->
+ <template v-if="tabs == 2">
+ <view class="form" :style="{
+ height: containerHeight + 'px',
+ overflow: 'auto'
+ }">
+ <view class="form-item">
+ <view class="title">鍒涘缓浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HMaker" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒涘缓鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HMakeDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDater" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDateDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HChecker" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃堕棿:</view>
+ <view class="righton">
+ <input v-model="hform.HCheckDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HDeleteMan" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HDeleteDate" />
+ </view>
+ </view>
+ </view>
+
+ </template>
+ <!-- 闄勪欢淇℃伅 -->
+ <template v-if="tabs == 3">
+ <view class="card-item-wrapper">
+ <view class="attachment-btns">
+ <button type="primary" size="mini" @tap="fileUpload">閫夋嫨鏂囦欢</button>
+ <view style="flex: 1;"></view>
+ </view>
+ <view v-for="(item, index) in attachmentInfo" :key="index">
+ <uni-card :title="item['fileName']" :thumbnail="item.filePath">
+ <view class="card-detail">
+ <view class="detail">
+ <text>澶у皬锛�</text>{{item["size"]}}
+ </view>
+ <view class="detail">
+ <text>鐘舵�侊細</text>{{item["status"]}}
+ </view>
+ <view class="detail operation" v-if="item['status']!='涓婁紶鎴愬姛'">
+ <text>鎿嶄綔锛�</text>
+ <button class="btn-a" size="mini" @tap.stop="uploadFile(index)">涓婁紶</button>
+ <button class="btn-b" size="mini" @tap.stop="delFile(index)">鍒犻櫎</button>
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ </view>
+ </template>
+ <!-- 鎿嶄綔鎸夐挳 -->
+ <view class="buttons" id="buttons">
+ <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <view style="flex: 1;"></view>
+ <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+ <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+ </view>
+</template>
+
+<script>
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "@/utils/common";
+ import {
+ MpaasScan
+ } from "@/utils/mpaasScan.js"
+ import "@/pages/MJGL/style/MJBillStyle.scss"
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ import {
+ TrackOpTypes
+ } from "vue";
+ export default {
+ name: 'sb_EquipDotCheckBill',
+ data() {
+ return {
+ tabs: 0,
+ HMainSourceBillType: "",
+ btnTop: 0,
+ tabsBottom: 0,
+ HModName: "sb_EquipDotCheckBill",
+ HBillType: '3903',
+ operationType: 1,
+ uploadOptions: {},
+
+ HDeptList: [],
+ HShiftsList: [],
+ HCheckFileList: [],
+ attachmentInfo: [],
+
+ hform: {
+ HBarCode: "",
+ HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HQty: 0,
+ HErrNote: "",
+ HBigSafeNote: "",
+ HDotCheckNote: "",
+ HShiftsName: "",
+ HShiftsID: 0,
+ HBillNo: "",
+ HInterID: 0,
+ HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HDeptName: "",
+ HDeptID: 0,
+ HRemark: "",
+ HBarName: "",
+ HEquipID: 0,
+ HBarSpec: "",
+ HBarModel: "",
+ HPlanNo: "",
+ HPlanInterID: 0,
+ HPlanEntryID: 0,
+ HEquipDotCheckRuleInterID: 0,
+ HEquipDotCheckRuleInterNo: "",
+ HMaker: getUserInfo()['Czymc'],
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HUpDater: "",
+ HUpDateDate: "",
+ HChecker: "",
+ HCheckDate: "",
+ HDeleteMan: "",
+ HDeleteDate: "",
+ lngBillKey: 0,
+ lngBillSubKey: 0,
+ HLastResult: "OK"
+ }
+ };
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
+ }
+ }
+ },
+ methods: {
+ checkBoxChangeHandler(index, e) {
+ let cr = e.detail.value
+ if (cr.length == 0) {
+ this.HCheckFileList[index]["HDotCheckResult"] = false
+ } else {
+ this.HCheckFileList[index]["HDotCheckResult"] = true
+ }
+ },
+ uploadFile(index) {
+ console.log('filePath: ', this.attachmentInfo[index].filePath);
+ // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+ uni.uploadFile({
+ url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+ filePath: this.attachmentInfo[index].filePath,
+ name: 'file',
+ formData: {
+ HBillNo: this.hform.HBillNo,
+ HRemark: "",
+ HUserName: getUserInfo()["Czymc"]
+ },
+ success: (uploadRes) => {
+ CommonUtils.showTips({
+ message: "涓婁紶鎴愬姛"
+ })
+ this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+ },
+ fail: (err) => {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `涓婁紶澶辫触: ${err}`
+ })
+ }
+ })
+ },
+ delFile(index) {
+ console.log('attachmentInfo: ', this.attachmentInfo[index]);
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ this.attachmentInfo.splice(index, 1)
+ }
+ },
+ })
+
+ },
+ handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+ console.log('file: ', res);
+ let fileInfo = res.data[0]
+ this.attachmentInfo.push({
+ fileName: fileInfo.name,
+ size: fileInfo.size,
+ status: '绛夊緟涓婁紶',
+ filePath: fileInfo.tempFilePath
+ })
+ },
+ // 涓婁紶鏂囦欢
+ fileUpload() {
+ this.$refs.XeUpload.upload('file', {});
+ },
+ //鑾峰彇鐝鏁版嵁
+ async getShiftList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetGy_ShiftsList_Json',
+ data: {
+ Shifts: "",
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HShiftsList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+ async getHDeptList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_Department/list',
+ data: {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HDeptList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ toScanCode() {
+ MpaasScan.scanCode(cb => {
+ this.hfrom.HBarCode = cb
+ this.GetMessageByBarCode(cb)
+ })
+ },
+ async GetMessageByBarCode(HBarCode) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Gy_EquipFileBill/txtHBarCode_KeyDown",
+ data: {
+ HBarCode: HBarCode,
+ user: getUserInfo()["Czymc"]
+ },
+ })
+
+
+ if (!res) {
+ return
+ }
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+
+ console.log('data: ', data);
+ this.hform.HEquipID = data[0].HInterID
+ this.hform.HBarName = data[0].璁惧鍚嶇О
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸
+ this.hform.HBarModel = data[0].璁惧鍨嬪彿
+ this.hform.HQty = 1
+
+ // 鑾峰彇妫�楠岃绋�
+ this.GetItemByEquipFile()
+ } catch (err) {
+
+ }
+ },
+ async GetItemByEquipFile() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetItemByEquipFile",
+ data: {
+ "EquipProjectID": this.hform.HEquipID,
+ "Type": "DJ",
+ "HDate": this.hform.HBeginDate
+ }
+ })
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
+ this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
+ this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
+ this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
+ .鐐规璁″垝ID
+ this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
+ 0].鐐规璁″垝瀛怚D
+
+ this.HCheckFileList = Array.from(data).map(item => {
+ return {
+ "HDotCheckItemID": item.HDotCheckItemID,
+ "HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
+ "HDotCheckItem": item.鐐规椤圭洰,
+ "HDotCheckPart": item.鐐规閮ㄤ綅,
+ "HClaim": item.鍏蜂綋瑕佹眰,
+ "HManagerID": item.璐熻矗浜篒D,
+ "HManagerCode": item.璐熻矗浜轰唬鐮�,
+ "HManagerName": item.璐熻矗浜哄悕绉�,
+ "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
+ "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
+ "HSourceBillNo": item.鐐规璁″垝鍗�,
+ "HDotCheckItemClassID": 0,
+ "HDotCheckItemClassName": "",
+ "HDotCheckItemMethodID": 0,
+ "HDotCheckItemMethodName": "",
+ "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+ }
+ })
+
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+ })
+ }
+ },
+ radioChange({
+ detail: {
+ value
+ }
+ }) {
+ this.HLastResult = value
+ },
+ async getMaxNum() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetMAXNum",
+ data: {
+ "HBillType": this.HBillType
+ }
+ })
+
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ console.log('data: ', data);
+ this.hform.HInterID = 0
+ this.hform.HBillNo = data[0]["HBillNo"]
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+ })
+ }
+ },
+ async submit() {
+ try {
+ let oMain = JSON.stringify(this.hform);
+ let sSubStr = JSON.stringify(this.HCheckFileList);
+ let sMainSub = oMain + ';' + sSubStr;
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_PDA_EquipDotCheckBill/SaveGetEquipDotCheckBillList",
+ data: {
+ "msg": sMainSub
+ },
+ method: "POST"
+ })
+
+ if(!res) {
+ return
+ }
+
+ let {count, Message} = res.data
+ if(count == 1){
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill?operationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ }else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+ })
+ }
+
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ })
+ }
+ }
+ },
+ onLoad(e) {
+ console.log('e: ', e);
+ if (!e.operationType) {
+ this.operationType = 1
+ } else {
+ this.operationType = e.operationType
+ }
+
+ if (this.operationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ } else if (this.operationType == 2) {
+ // 澶嶅埗
+ } else if (this.operationType == 3) {
+ // 缂栬緫
+
+ } else if (this.operationType == 4) {
+ // 娴忚
+
+ }
+
+ this.getHDeptList()
+ this.getShiftList()
+ },
+ onReady() {
+ const query = uni.createSelectorQuery().in(this)
+ query.select("#buttons")
+ .boundingClientRect()
+ .select("#tabs")
+ .boundingClientRect()
+ .exec(res => {
+ this.btnTop = Math.floor(res[0].top)
+ this.tabsBottom = Math.ceil(res[1].bottom)
+ })
+ }
+ }
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
new file mode 100644
index 0000000..492629a
--- /dev/null
+++ b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
@@ -0,0 +1,19 @@
+<template>
+ <view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ };
+ }
+ }
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/MJGL/style/MJBillStyle.scss b/pages/MJGL/style/MJBillStyle.scss
new file mode 100644
index 0000000..53775e9
--- /dev/null
+++ b/pages/MJGL/style/MJBillStyle.scss
@@ -0,0 +1,264 @@
+.buttons {
+ box-sizing: border-box;
+ width: 100%;
+ height: 120rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 30rpx 40rpx 40rpx 40rpx;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+ .btn-a {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ // position: absolute;
+ // right: 120rpx;
+ }
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ }
+ .placeholder-view {
+ flex: 1;
+ }
+}
+
+.tabs {
+ width: 100%;
+ display: flex;
+ border-bottom: 1px solid #ddd;
+
+ view {
+ width: 25%;
+ font-size: 30rpx;
+ color: #555;
+ text-align: center;
+ padding: 16rpx 0;
+ }
+
+ .on {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+}
+
+.form {
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+ box-sizing: border-box;
+ padding: 20rpx 40rpx;
+}
+
+.form-item {
+ display: flex;
+ align-items: center;
+ font-size: 30rpx;
+ padding: 6rpx 0;
+ gap: 12rpx;
+
+ .title {
+ width: 208rpx;
+ flex-shrink: 0;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+
+ .right {
+ // width: 450rpx;
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ position: relative;
+ display: flex;
+
+ picker {
+ width: 100%;
+ }
+
+ .uni-combox {
+ width: 100%
+ }
+ }
+
+ .righton {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ input {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ textarea {
+ width: 98%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .icon-wrapper {
+ background-color: #3A78FF;
+ width: 52rpx;
+ height: 52rpx;
+ border-radius: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
+
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
+
+ .icon-wrapper[disabled] {
+ background-color: rgba(228, 228, 228, 1);
+ pointer-events: none;
+ touch-action: none;
+ }
+
+}
+
+.none-border {
+ border: none !important;
+}
+
+.radio_Container {
+ display: flex;
+ flex-direction: row;
+ gap: 30rpx;
+}
+
+ .list {
+ width: 100%;
+
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+
+ .detail {
+ // width: 50%;
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+ }
+
+.card-item-wrapper {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ box-sizing: border-box;
+ padding: 20rpx 20rpx;
+
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+
+ .detail {
+ // width: 50%;
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+
+ .operation {
+ display: flex;
+ align-items: center;
+ gap: 10rpx;
+
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: rgb(255, 87, 34);
+ color: #fff;
+ }
+
+ uni-button {}
+ }
+
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+ }
+
+ .attachment-btns {
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ gap: 6rpx;
+
+ }
\ No newline at end of file
diff --git a/pages/MJGL/style/MJListStyle.scss b/pages/MJGL/style/MJListStyle.scss
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/pages/MJGL/style/MJListStyle.scss
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
index 1ea919b..191b607 100644
--- a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
+++ b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
@@ -461,7 +461,7 @@
toScanCode() {
MpaasScan.scanCode((res) => {
if (res) {
- this.getSourceBillInfo(HBarCode);
+ this.getSourceBillInfo(res);
}
});
},
@@ -945,6 +945,13 @@
// if (!this.checkSubmitValidate()) {
// return;
// }
+ if(this.HisReportList.length<=0){
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `璇疯緭鍏ユ楠屼俊鎭痐,
+ });
+ return
+ }
try {
console.log('this.$refs: ', this.$refs);
diff --git a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
index e61f1a9..6ef0cb2 100644
--- a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
+++ b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
@@ -50,7 +50,7 @@
<input type="number" v-model="hform.HSourceBillQty" />
</view>
</view>
- <view class="form-item">
+ <view class="form-item" v-show="false">
<view class="left">浠诲姟鍗曞彿</view>
<view class="right disabled">
<input type="text" :value="hform.HICMOBillNo" disabled />
@@ -60,7 +60,7 @@
:disabled="hasSourceBill" size="20" @click="showSelectorModule(hform, 5)"></uni-icons>
</view>
</view>
- <view class="form-item">
+ <view class="form-item" v-show="false">
<view class="left">娴佽浆鍗″彿</view>
<view class="right disabled">
<input type="text" :value="hform.HProcExchBillNo" disabled />
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
index 03a77c0..34d0e38 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
@@ -461,8 +461,9 @@
})
},
HKeeperNameChange(e) {
- console.log(e)
- let keeperItem = this.HKeeperList.find(elem => elem.HName = e)
+ console.log(this.HKeeperList)
+ let keeperItem = this.HKeeperList.find(elem => elem.HName == e)
+ console.log(keeperItem)
this.detailManifestItem.HKeeperID = keeperItem.HItemID
this.detailManifestItem.HKeeperName = keeperItem.HName
diff --git a/pages/ZLGL/zaikujianyandan/InStockCheckBillList.vue b/pages/ZLGL/zaikujianyandan/InStockCheckBillList.vue
new file mode 100644
index 0000000..3a85f0a
--- /dev/null
+++ b/pages/ZLGL/zaikujianyandan/InStockCheckBillList.vue
@@ -0,0 +1,333 @@
+<template>
+ <view>
+ <view class="header" id="list_header">
+ <view class="form">
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="right">
+ <input name="HBillNo" v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">寮�濮嬫椂闂�:</view>
+ <view class="right">
+ <picker mode="date" :value="hform.HBeginDate" @change="HBeginDateChange">
+ <view class="picker-overlay"></view>
+ <input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="璇烽�夋嫨" />
+ </picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁撴潫鏃堕棿:</view>
+ <view class="right">
+ <picker mode="date" :value="hform.HEndDate" @change="HEndDateChange">
+ <view class="picker-overlay"></view>
+ <input name="HEndDate" disabled :value="hform.HEndDate" placeholder="璇烽�夋嫨" />
+ </picker>
+ </view>
+ </view>
+ </view>
+ <view class="buttons">
+ <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+ <button class="btn-b" size="mini" type="default" @tap="creat">鏂板</button>
+ <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+ </view>
+ </view>
+ <scroll-view scroll-y="true" @scroll="scrollHandler" :scroll-top="contentScrollTop"
+ :style="{height: calcHeight + 'px'}" class="content">
+ <view class="over" v-if="billList.length == 0">
+ 鏆傛棤鏁版嵁
+ </view>
+
+ <view v-else class="list" v-for="(item,index) in billList" :key="index">
+ <uni-card style="margin: 10px;">
+ <view class="card-detail">
+ <view class="detail">
+ <text>鍗曟嵁鍙凤細</text>{{item["鍗曟嵁鍙�"]}}
+ </view>
+ <view class="detail">
+ <text>鐗╂枡浠ｇ爜锛�</text>{{item["鐗╂枡浠ｇ爜"]}}
+ </view>
+ <view class="detail">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item["鐗╂枡鍚嶇О"]}}
+ </view>
+ <view class="detail">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item["瑙勬牸鍨嬪彿"]}}
+ </view>
+ <view class="detail">
+ <text>璁￠噺鍗曚綅锛�</text>{{item["璁￠噺鍗曚綅"]}}
+ </view>
+ <view class="detail">
+ <text>鍚堟牸鏁伴噺锛�</text>{{item["鍚堟牸鏁伴噺"]}}
+ </view>
+ <view class="detail">
+ <text>涓嶅悎鏍兼暟閲忥細</text>{{item["涓嶅悎鏍兼暟閲�"]}}
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ </scroll-view>
+ <uni-pagination id="pagination" v-model="curPage" :pageSize="size" :total="length"></uni-pagination>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs';
+ import {
+ CommonUtils
+ } from '../../../utils/common';
+ import {
+ getUserInfo
+ } from '../../../utils/auth';
+
+ export default {
+ name: "InStockCheckBillList",
+ data() {
+ return {
+ contentScrollTop: 0,
+ contentScrollTopOld: 0,
+ headerHeight: 0,
+ paginationHeight: 0,
+
+ curPage: 1,
+ size: 50,
+ length: 0,
+
+ hform: {
+ HBillNo: "",
+ HBeginDate: dayjs(new Date()).subtract(30, "d").format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD")
+ },
+
+ billList: [],
+ };
+ },
+ computed: {
+ calcHeight: {
+ get() {
+ console.log('this.paginationHeight - this.headerHeight: ', this.paginationHeight - this
+ .headerHeight);
+ return this.paginationHeight - this.headerHeight
+ }
+ }
+ },
+ onLoad() {
+ this.getDisplayPage()
+ },
+ onReady() {
+ this.getScrollHeight()
+ },
+ methods: {
+ getScrollHeight() {
+ const query = uni.createSelectorQuery().in(this)
+ query
+ .select("#list_header")
+ .boundingClientRect()
+ .select("#pagination")
+ .boundingClientRect()
+ .exec(res => {
+ this.headerHeight = Math.ceil(res[0].bottom)
+ this.paginationHeight = Math.floor(res[1].top)
+ })
+
+ },
+ scrollToTop() {
+ this.contentScrollTop = this.contentScrollTopOld;
+ this.$nextTick(() => {
+ this.contentScrollTop = 0
+ });
+ },
+ scrollHandler(e) {
+ this.contentScrollTopOld = e.detail.scrollTop
+ },
+ creat() {
+ uni.navigateTo({
+ url: "/pages/ZLGL/zaikujianyandan/InStockCheckBill?operationType=1"
+ })
+ },
+ search() {
+ this.getDisplayPage()
+ },
+ clear() {
+ this.hform.HBillNo = ""
+ this.hform.HBeginDate = dayjs(new Date()).subtract(7, 'd').format("YYYY-MM-DD")
+ this.hform.HEndDate = dayjs(new Date()).format("YYYY-MM-DD")
+
+ this.getDisplayPage()
+ },
+ async getDisplayPage() {
+ let sWhere = ` and 鏃ユ湡
+ BETWEEN CAST('${this.hform.HBeginDate}' AS DATE)
+ AND CAST('${this.hform.HEndDate}' AS DATE)
+ `
+ if(this.hform.HBillNo){
+ sWhere += ` and 鍗曟嵁鍙� like '${this.hform.HBillNo}'`
+ }
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: 'QC_InStockCheckBillController/getListPage',
+ data: {
+ sWhere: sWhere,
+ user: getUserInfo()['Czymc'],
+ page: this.curPage,
+ size: this.size
+ }
+ })
+
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ if (count >= 0) {
+ console.log('data: ',data);
+ this.length = count
+ this.billList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: '鑾峰彇鍦ㄥ簱妫�楠屽崟澶辫触: ' + Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: '鑾峰彇鍦ㄥ簱妫�楠屽崟澶辫触: ' + err
+ })
+ }
+
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+ .header {
+ padding: 20rpx 20rpx;
+ }
+
+ .form {
+ width: 640rpx;
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ padding: 6rpx 0;
+
+ .title {
+ width: 180rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ position: relative;
+ }
+
+ .righton {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ input {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+ }
+
+ .buttons {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ padding-top: 20rpx;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ #pagination {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ padding: 20rpx 0;
+ }
+
+ .list {
+ width: 100%;
+
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ align-items: center;
+ line-height: 120%;
+ gap: 10rpx 0;
+
+ input {
+ font-size: 26rpx;
+ }
+
+ .detail {
+ // width: 50%;
+ box-sizing: border-box;
+ font-size: 26rpx;
+ color: #555;
+ padding-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+
+ .editable {
+ width: 50%;
+ display: inline-flex;
+ flex-direction: row;
+ align-items: center;
+
+ text {
+ flex-shrink: 0;
+ }
+
+ .sampleDestory {
+ border: 1px solid #acacac;
+ border-radius: 5rpx;
+ padding: 0 12rpx;
+ }
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 59b9ab9..3c6551a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -49,7 +49,15 @@
menuListName: 'index',
canEdit: false,
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- itemData: [{
+ itemData: [
+ {
+ "img": "../../static/icon/icon18.png",
+ "text": "ERP鍙婃椂搴撳瓨鏌ヨ",
+ "url": "/pages/jishikucunchaxun/table",
+ "id": 32,
+ "hidden": false
+ },
+ {
img: '../../static/icon/icon8.png',
text: '鏀舵枡閫氱煡鍗曟潯鐮佹墦鍗�',
url: '/pages/tiaomaguanli/table?HBillType=1103',
@@ -253,13 +261,7 @@
id: 27,
hidden: false,
},
- {
- img: '../../static/icon/icon16.png',
- text: '鍒嗘寮忚皟鍏ュ崟缂撳瓨',
- url: '/pages/fenbushidiaorudan/table',
- id: 28,
- hidden: false,
- },
+
{
img: '../../static/icon/icon16.png',
text: '鍒嗘寮忚皟鍑哄崟',
@@ -315,12 +317,27 @@
hidden: false,
},
{
- img: '../../static/icon/icon8.png',
- text: '涓婃ā鍗�',
- url: `/pages/MJGL/shangmudan/MouldUpperBill`,
- id: 37,
- hidden: false,
+ "img": "../../static/icon/icon21.png",
+ "text": "鏍囩鎵撳嵃",
+ "url": "/pages/labelPrinter/index",
+ "id": 24,
+ "hidden": false
},
+ {
+ "img": "../../static/icon/icon21.png",
+ "text": "鏉＄爜鎷嗙爜",
+ "url": "/pages/tiaomachaima/tiaomachaima",
+ "id": 25,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon21.png",
+ "text": "鏉＄爜鎷嗙爜2",
+ "url": "/pages/tiaomachaima/tiaomachaima2",
+ "id": 26,
+ "hidden": false
+ },
+
],
// itemData: [{
// img: '../../static/icon/icon1.png',
diff --git a/pages/index/login.vue b/pages/index/login.vue
index b923ab7..decaaab 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -105,7 +105,7 @@
"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
"闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
- "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.0.102:81/API/',
+ "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.89.27:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
// 灏忓崼鍐呭缃�
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index e368513..34012ab 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -42,84 +42,40 @@
url: '/pages/gongxuIn/Cj_StationInBill',
id: 1,
hidden: false,
- }, {
- img: '../../static/icon/icon9.png',
- text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/gongxuIn/Cj_StationInBillList',
- id: 2,
- hidden: false,
- }, {
+ },
+
+ {
img: '../../static/icon/icon10.png',
text: '宸ュ簭鍑虹珯姹囨姤鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
url: '/pages/gongxuOut/Cj_StationOutBill',
id: 3,
hidden: false,
- }, {
- img: '../../static/icon/icon10.png',
- text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/gongxuOut/Cj_StationOutBillList',
- id: 4,
- hidden: false,
- }, {
+ },
+
+ {
img: '../../static/icon/icon11.png',
text: '宸ュ簭濮斿鍙戝嚭鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
url: '/pages/weiwaigxIn/Cj_StationEntrustInBill',
id: 5,
hidden: false,
- }, {
- img: '../../static/icon/icon11.png',
- text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
- id: 6,
- hidden: false,
- }, {
+ },
+
+ {
img: '../../static/icon/icon12.png',
text: '宸ュ簭濮斿鎺ユ敹鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
url: '/pages/weiwaigxOut/Cj_StationEntrustOutBill',
id: 7,
hidden: false,
- }, {
- img: '../../static/icon/icon12.png',
- text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/weiwaigxOut/Cj_StationEntrustOutBillList',
- id: 8,
- hidden: false,
- }
- , {
- img: '../../static/icon/icon1.png',
- text: '璁惧妗ｆ鏌ヨ',
- tip: '鏌ョ湅璇︽儏',
- url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
- id: 9,
- hidden: true,
- }, {
- img: '../../static/icon/icon8.png',
- text: '璁惧灞ュ巻鏌ヨ',
- tip: '鏌ョ湅璇︽儏',
- url: '/pages/shebeilvli/EquipFileBillResume',
- id: 10,
- hidden: true,
- }, {
+ },
+ {
img: '../../static/icon/icon14.png',
text: '鎴戠殑鎶ュ伐骞冲彴',
tip: '鐐瑰嚮杩涘叆',
url: '/pages/baogong/IpadIndex',
id: 11,
- hidden: true,
- },
- {
- img: '../../static/icon/icon32.png',
- text: '璁惧杩愯鐘舵��',
- tip: '鏌ョ湅璇︽儏',
- url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
- id: 14,
hidden: true,
},
{
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 6c895d6..a1c53df 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -216,48 +216,164 @@
"id": 23,
"hidden": false
},
-
+ {
+ img: '../../static/icon/icon16.png',
+ text: '鍒嗘寮忚皟鍏ュ崟缂撳瓨',
+ url: '/pages/fenbushidiaorudan/table',
+ id: 28,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon9.png',
+ text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/gongxuIn/Cj_StationInBillList',
+ id: 2,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon10.png',
+ text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/gongxuOut/Cj_StationOutBillList',
+ id: 4,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon11.png',
+ text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
+ id: 6,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon12.png',
+ text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/weiwaigxOut/Cj_StationEntrustOutBillList',
+ id: 8,
+ hidden: false,
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�",
+ "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
+ "id": 51,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿璋冩嫧鍗曞垪琛�",
+ "url": "/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
+ "id": 51,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿棰嗙敤閫�搴撳崟鍒楄〃",
+ "url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
+ "id": 50,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon5.png",
+ "text": "妯″叿鐐规璁板綍鍗曞垪琛�",
+ "url": "/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
+ "id": 47,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon5.png",
+ "text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
+ "url": "/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
+ "id": 48,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿棰嗙敤鍑哄簱鍗曞垪琛�",
+ "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
+ "id": 49,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "妯″叿缁翠慨璁板綍鍒楄〃",
+ "url": "/pages/weixiujilu/mouldRepairRecordBillList",
+ "id": 39,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "妯″叿鏁呴殰鐧昏鍒楄〃",
+ "url": "/pages/qijvguzhangdengji/mouldMistake",
+ "id": 37,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "棣栦欢妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
+ "id": 41,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "宸℃妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
+ "id": 43,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏈欢妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
+ "id": 45,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏉ユ枡妫�楠屽垪琛�",
+ "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
+ "id": 54,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍏ㄦ妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBillList",
+ "id": 55,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "杞﹂棿鑷鍗曞垪琛�",
+ "url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
+ "id": 55,
+ "hidden": false
+ },
// 鏍囩鏉＄爜鐩稿叧
- {
- "img": "../../static/icon/icon21.png",
- "text": "鏍囩鎵撳嵃",
- "url": "/pages/labelPrinter/index",
- "id": 24,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon21.png",
- "text": "鏉＄爜鎷嗙爜",
- "url": "/pages/tiaomachaima/tiaomachaima",
- "id": 25,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon21.png",
- "text": "鏉＄爜鎷嗙爜2",
- "url": "/pages/tiaomachaima/tiaomachaima2",
- "id": 26,
- "hidden": false
- },
+
// 璁惧鐩稿叧
{
"img": "../../static/icon/icon3.png",
- "text": "璁惧淇濆吇璁板綍鍗�",
+ "text": "璁惧淇濆吇璁板綍鍗曞垪琛�",
"url": "/pages/baoyangjilu/Sb_EquipMaintainRuleList",
"id": 27,
"hidden": false
},
{
"img": "../../static/icon/icon6.png",
- "text": "璁惧鏁呴殰鐧昏琛�",
+ "text": "璁惧鏁呴殰鐧昏琛ㄥ垪琛�",
"url": "/pages/guzhangdengji/EqpConkBookBillList",
"id": 28,
"hidden": false
},
{
"img": "../../static/icon/icon7.png",
- "text": "璁惧缁翠慨璁板綍鍗�",
+ "text": "璁惧缁翠慨璁板綍鍗曞垪琛�",
"url": "/pages/shebeiweixiu/SbEqpMaintenanceBillList",
"id": 29,
"hidden": false
@@ -266,39 +382,33 @@
// 寮傚父鐩稿叧
{
"img": "../../static/icon/icon15.png",
- "text": "寮傚父鍙嶉鍗�",
+ "text": "寮傚父鍙嶉鍗曞垪琛�",
"url": "/pages/yichang/MESExecptFeedBackBillList",
"id": 30,
"hidden": false
},
{
"img": "../../static/icon/icon16.png",
- "text": "寮傚父鍙嶉澶勭悊鍗�",
+ "text": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
"url": "/pages/yichang/MESExecptFeedBackBillList",
"id": 31,
"hidden": false
},
// 搴撳瓨鏌ヨ鐩稿叧
- {
- "img": "../../static/icon/icon18.png",
- "text": "ERP鍙婃椂搴撳瓨鏌ヨ",
- "url": "/pages/jishikucunchaxun/table",
- "id": 32,
- "hidden": false
- },
+
// 鍙栨牱杩樻牱鐩稿叧
{
"img": "../../static/icon/icon8.png",
- "text": "鍙栨牱鍗�",
+ "text": "鍙栨牱鍗曞垪琛�",
"url": "/pages/quyangdan/TakeSampleCheckBillList",
"id": 33,
"hidden": false
},
{
"img": "../../static/icon/icon8.png",
- "text": "杩樻牱鍗�",
+ "text": "杩樻牱鍗曞垪琛�",
"url": "/pages/huanyangdan/BackSampleCheckBillList",
"id": 34,
"hidden": false
@@ -328,6 +438,13 @@
"hidden": false
},
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍦ㄥ簱妫�楠屽崟缂撳瓨",
+ "url": "/pages/ZLGL/zaikujianyandan/InStockCheckBillList",
+ "id": 57,
+ "hidden": false
+ }
]
}
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index 0ef9312..7e3fb1b 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -69,23 +69,9 @@
},
{
"img": "../../static/icon/icon13.png",
- "text": "妯″叿鏁呴殰鐧昏鍒楄〃",
- "url": "/pages/qijvguzhangdengji/mouldMistake",
- "id": 37,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
"text": "妯″叿鏁呴殰鐧昏鍗�",
"url": "/pages/qijvguzhangdengji/mouldMistakeBill?operationType=1",
"id": 38,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
- "text": "妯″叿缁翠慨璁板綍鍒楄〃",
- "url": "/pages/weixiujilu/mouldRepairRecordBillList",
- "id": 39,
"hidden": false
},
{
@@ -96,34 +82,8 @@
"hidden": false
},
- {
- "img": "../../static/icon/icon5.png",
- "text": "妯″叿鐐规璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
- "id": 47,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon5.png",
- "text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
- "id": 48,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "妯″叿棰嗙敤鍑哄簱鍗曞垪琛�",
- "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
- "id": 49,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "妯″叿棰嗙敤閫�搴撳崟鍒楄〃",
- "url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
- "id": 50,
- "hidden": false
- },
+
+
{
"img": "../../static/icon/icon8.png",
"text": "妯″叿棰嗙敤鍑哄簱鍗�",
@@ -140,19 +100,56 @@
},
{
"img": "../../static/icon/icon8.png",
- "text": "妯″叿璋冩嫧鍗曞垪琛�",
- "url": "/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
- "id": 51,
+ "text": "妯″叿鎶ュ簾鍑哄簱鍗�",
+ "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
+ "id": 50,
"hidden": false
},
{
- "img": "../../static/icon/icon8.png",
- "text": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�",
- "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
- "id": 51,
- "hidden": false
+ img: '../../static/icon/icon8.png',
+ text: '涓婃ā鍗�',
+ url: `/pages/MJGL/shangmudan/MouldUpperBill`,
+ id: 37,
+ hidden: false,
},
-
+ {
+ img: '../../static/icon/icon1.png',
+ text: '璁惧妗ｆ鏌ヨ',
+ tip: '鏌ョ湅璇︽儏',
+ url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
+ id: 9,
+ hidden: true,
+ },
+ {
+ img: '../../static/icon/icon8.png',
+ text: '璁惧灞ュ巻鏌ヨ',
+ tip: '鏌ョ湅璇︽儏',
+ url: '/pages/shebeilvli/EquipFileBillResume',
+ id: 10,
+ hidden: true,
+ },
+ {
+ img: '../../static/icon/icon32.png',
+ text: '璁惧杩愯鐘舵��',
+ tip: '鏌ョ湅璇︽儏',
+ url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
+ id: 14,
+ hidden: true,
+ },
+ {
+ "img":"../../static/icon/icon8.png",
+ "text": "璁惧淇濆吇璁板綍鍗�",
+ "url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
+ "id": 53,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "璁惧鐐规璁板綍鍗�",
+ "url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
+ "id": 55,
+ "hidden": false
+ }
]
}
},
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index a41308d..c74e390 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -44,13 +44,7 @@
canEdit: false,
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
itemData: [
- {
- "img": "../../static/icon/icon13.png",
- "text": "棣栦欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
- "id": 41,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon13.png",
"text": "棣栦欢妫�楠屽崟",
@@ -58,13 +52,7 @@
"id": 42,
"hidden": false
},
- {
- "img": "../../static/icon/icon8.png",
- "text": "宸℃妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
- "id": 43,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon8.png",
"text": "宸℃妫�楠屽崟",
@@ -72,13 +60,7 @@
"id": 44,
"hidden": false
},
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏈欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
- "id": 45,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon8.png",
"text": "鏈欢妫�楠屽崟",
@@ -93,13 +75,7 @@
"id": 53,
"hidden": false
},
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏉ユ枡妫�楠屽垪琛�",
- "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
- "id": 54,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon8.png",
"text": "鐢熶骇鍏ュ簱妫�楠屽崟",
@@ -128,13 +104,7 @@
"id": 55,
"hidden": false
},
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍏ㄦ妫�楠屽崟鏌ヨ",
- "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBillList",
- "id": 55,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon8.png",
"text": "杞﹂棿鑷鍗�",
@@ -142,13 +112,14 @@
"id": 55,
"hidden": false
},
+
{
- "img": "../../static/icon/icon8.png",
- "text": "杞﹂棿鑷鍗曟煡璇�",
- "url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
- "id": 55,
- "hidden": false
- }
+ "img": "../../static/icon/icon8.png",
+ "text": "鍦ㄥ簱妫�楠屽崟",
+ "url": "/pages/ZLGL/zaikujianyandan/InStockCheckBill",
+ "id": 57,
+ "hidden": false
+ }
]
}
diff --git a/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue b/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue
index d962d7d..24a691a 100644
--- a/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue
+++ b/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue
@@ -502,7 +502,7 @@
for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
- this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+ this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
}
}
},
diff --git a/pages/shengchandiaobo/MoveStockBill.vue b/pages/shengchandiaobo/MoveStockBill.vue
index 52c9c1c..c5ee5e3 100644
--- a/pages/shengchandiaobo/MoveStockBill.vue
+++ b/pages/shengchandiaobo/MoveStockBill.vue
@@ -439,6 +439,7 @@
console.log('璋冨叆浠撳簱: ',e);
for (var i = 0; i < this.HWHNameList.length; i++) {
if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+ console.log('璋冨叆浠撳簱: ',this.HWHNameList[i]);
this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
this.hform.HWHID = this.HWHNameList[i].HItemID
@@ -457,12 +458,13 @@
console.log('璋冨嚭浠撳簱: ',e);
for (var i = 0; i < this.HWHNameList.length; i++) {
if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+ console.log('璋冨嚭浠撳簱: ',this.HWHNameList[i]);
this.hform.HSCWHName = this.HWHNameList[i].浠撳簱鍚嶇О
this.hform.HSCWHID = this.HWHNameList[i].HItemID
if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
this.showHSCStockPlaceName = true
} else {
- this.hform.HStockPlaceName = ''
+ this.hform.HSCSPName = ''
this.showHSCStockPlaceName = false
}
}
@@ -473,7 +475,7 @@
for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
- this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+ this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
}
}
},
@@ -482,7 +484,7 @@
for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
this.hform.HSCSPName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
- this.hform.HSCSPID = this.HStockPlaceNameList[i].HItemID
+ this.hform.HSCSPID = this.HStockPlaceNameList[i].HMainID
}
}
},
@@ -649,7 +651,6 @@
var sOldBarCode = HBarCode
var HDeleteFlag = sOldBarCode.substring(0, 1);
var sBarCode = sOldBarCode.slice(1);
-
var sHWHID = this.hform.HWHID
var sHSPID = this.hform.HStockPlaceID
let sHSCWHID = this.hform.HSCWHID
@@ -750,10 +751,10 @@
HBillType: this.hform.HBillType,
HBillNo: this.hform.HBillNo,
HMaker: this.hform.HMaker,
- HWhID: sHWHID,
- HSPID: sHSPID,
- HSCWHID: sHSCWHID,
- HSCSPID: sHSCSPID,
+ HWhID: this.hform.HSCWHID,
+ HSPID: this.hform.HSCSPID,
+ HSCWHID: this.hform.HWHID,
+ HSCSPID: this.hform.HStockPlaceID,
HQty: sHQty,
// HRedBlueFlag: this.hform.HRedBlueFlag,
// SourceFlag: HSourceFlag,
diff --git a/pages/shengchanlingliao/PPickingCheckBill.vue b/pages/shengchanlingliao/PPickingCheckBill.vue
index 23d398a..dc5de7d 100644
--- a/pages/shengchanlingliao/PPickingCheckBill.vue
+++ b/pages/shengchanlingliao/PPickingCheckBill.vue
@@ -598,8 +598,9 @@
HStockPlaceNameChange(e) {
for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+ console.log('e: ',this.HStockPlaceNameList[i]);
this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
- this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+ this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
}
}
},
diff --git a/static/tabBar/icon4-default.png b/static/tabBar/icon4-default.png
new file mode 100644
index 0000000..78836ae
--- /dev/null
+++ b/static/tabBar/icon4-default.png
Binary files differ
diff --git a/static/tabBar/icon4.png b/static/tabBar/icon4.png
new file mode 100644
index 0000000..7508e08
--- /dev/null
+++ b/static/tabBar/icon4.png
Binary files differ
diff --git a/uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue b/uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue
index c9eb603..031b9c7 100644
--- a/uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue
+++ b/uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue
@@ -604,7 +604,7 @@
box-sizing: border-box;
//border-radius: 4px;
border-radius: 22rpx;
- border: 1px solid #acacac;
+ // border: 1px solid #acacac;
padding: 0 5px;
padding-left: 10px;
position: relative;
--
Gitblit v1.9.1