From 76b2d67731f2c277d6d50702691635495f06f07c Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 22 十月 2025 14:24:30 +0800
Subject: [PATCH] 增加模具下模单
---
pages/index/tab1.vue | 14
pages.json | 16
pages/index/tab2.vue | 403 ++++++-------
pages/MJGL/xiamodan/form.vue | 697 ++++++++++++++++++++++++
pages/MJGL/shangmudan/form.vue | 3
pages/MJGL/xiamodan/table.vue | 531 ++++++++++++++++++
pages/index/login.vue | 2
pages/MJGL/shangmudan/table.vue | 73 +-
8 files changed, 1,481 insertions(+), 258 deletions(-)
diff --git a/pages.json b/pages.json
index 3807c28..8eda7a1 100644
--- a/pages.json
+++ b/pages.json
@@ -539,7 +539,8 @@
{
"path": "pages/MJGL/shangmudan/table",
"style": {
- "navigationBarTitleText": "涓婃ā鍗�"
+ "navigationBarTitleText": "涓婃ā鍗�",
+ "enablePullDownRefresh": true
}
},
{
@@ -548,6 +549,19 @@
"navigationBarTitleText": "涓婃ā鍗�"
}
},
+ {
+ "path": "pages/MJGL/xiamodan/table",
+ "style": {
+ "navigationBarTitleText": "涓嬫ā鍗�",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/MJGL/xiamodan/form",
+ "style": {
+ "navigationBarTitleText": "涓嬫ā鍗�"
+ }
+ },
{
"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
"style": {
diff --git a/pages/MJGL/shangmudan/form.vue b/pages/MJGL/shangmudan/form.vue
index 8a02218..fc62d0e 100644
--- a/pages/MJGL/shangmudan/form.vue
+++ b/pages/MJGL/shangmudan/form.vue
@@ -4,7 +4,7 @@
<view class="form-item">
<view class="title"><text>*</text>鏉″舰鐮�:</view>
<view class="right" style="width: 380rpx;">
- <input v-model="hform.HBarCode" disabled placeholder="璇锋壂鎻忔潯鐮�"/>
+ <input v-model="hform.HBarCode" disabled placeholder="璇锋壂鎻忔潯鐮�" @blur="getHBarCodeData(hform.HBarCode)"/>
</view>
<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
</view>
@@ -557,6 +557,7 @@
if(res.data.count == 1){
this.hform.HInterID = res.data.data[0].HInterID
this.hform.HBillNo = res.data.data[0].HBillNo
+ this.hform.HMakeDate = getDateTime.dateTimeStr('y-m-d')
this.btnType=1
}else{
uni.showToast({
diff --git a/pages/MJGL/shangmudan/table.vue b/pages/MJGL/shangmudan/table.vue
index 8d153c9..6997398 100644
--- a/pages/MJGL/shangmudan/table.vue
+++ b/pages/MJGL/shangmudan/table.vue
@@ -5,6 +5,7 @@
<view class="title">鐘舵��:</view>
<view class="right">
<picker :range="arrayStatus" :value="hform.HStatus" @change="HStatusChange">
+ <view class="picker-overlay"></view>
<input name="HStatus" disabled :value="hform.HStatus" placeholder="璇烽�夋嫨鐘舵��" />
</picker>
</view>
@@ -13,6 +14,7 @@
<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>
@@ -21,6 +23,7 @@
<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>
@@ -234,8 +237,8 @@
arrayStatus: ['鍏ㄩ儴', '鏈鏍�', '宸插鏍�', '宸插叧闂�'],
hform: {
HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
+ HBeginDate: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
+ HEndDate: new Date().toISOString().split('T')[0],
HICMOBillNo: '',
HBillNo: '',
HProcExchBillNo: '',
@@ -265,6 +268,36 @@
}, 1000);
},
methods: {
+ SearchWhere() { //杩囨护鏉′欢
+ this.sWhere = ''; // 鍏堟竻绌烘潯浠�
+ if (this.hform.HStatus) {
+ if (this.hform.HStatus == '鍏ㄩ儴') {
+ this.sWhere += "";
+ } else if (this.hform.HStatus == '鏈鏍�') {
+ this.sWhere += " and 瀹℃牳浜�=''";
+ } else if (this.hform.HStatus == '宸插鏍�') {
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ } else if (this.hform.HStatus == '宸插叧闂�') {
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ }
+ }
+ if (this.hform.BenginHCreateDate) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ }
+ if (this.hform.EndHCreateDate) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+ }
+ if (this.hform.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ }
+ if (this.hform.HICMOBillNo) {
+ this.sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + this.hform.HICMOBillNo + "%'";
+ }
+ if (this.hform.HProcExchBillNo) {
+ this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
+ }
+ return this.sWhere
+ },
getPage(page, list) {
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
@@ -272,6 +305,7 @@
return newList
},
getList() {
+ this.sWhere = this.SearchWhere()
uni.showLoading({
title: '鍔犺浇涓�...'
})
@@ -328,36 +362,7 @@
this.listData = []
this.page = 1
this.showList = []
-
- console.log(this.hform)
-
- if (this.hform.HStatus) {
- if (this.hform.HStatus == '鍏ㄩ儴') {
- this.sWhere += "";
- } else if (this.hform.HStatus == '鏈鏍�') {
- this.sWhere += " and 瀹℃牳浜�=''";
- } else if (this.hform.HStatus == '宸插鏍�') {
- this.sWhere += " and 瀹℃牳浜�<>''";
- } else if (this.hform.HStatus == '宸插叧闂�') {
- this.sWhere += " and 鍏抽棴浜�<>''";
- }
- }
- if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
- }
- if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
- }
- if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
- }
- if (this.hform.HICMOBillNo) {
- this.sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + this.hform.HICMOBillNo + "%'";
- }
- if (this.hform.HProcExchBillNo) {
- this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
- }
-
+
this.getList()
},
//鏂板
@@ -378,8 +383,8 @@
this.operations = -1,
this.hform = {
HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
+ HBeginDate: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
+ HEndDate: new Date().toISOString().split('T')[0],
HICMOBillNo: '',
HBillNo: '',
HProcExchBillNo: '',
diff --git a/pages/MJGL/xiamodan/form.vue b/pages/MJGL/xiamodan/form.vue
new file mode 100644
index 0000000..c1a89ff
--- /dev/null
+++ b/pages/MJGL/xiamodan/form.vue
@@ -0,0 +1,697 @@
+<template>
+ <view>
+ <view class="form">
+ <view class="form-item">
+ <view class="title"><text>*</text>鏉″舰鐮�:</view>
+ <view class="right" style="width: 380rpx;">
+ <input v-model="hform.HBarCode" disabled placeholder="璇锋壂鎻忔潯鐮�" @blur="getHBarCodeData(hform.HBarCode)"/>
+ </view>
+ <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input name="HBillNo" disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="right">
+ <picker mode="date" v-model="hform.HDate" @change="HDateChange">
+ <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+ </picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>閮ㄩ棬:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName" @input="HDeptNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>鎿嶄綔鍛�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName" @input="HEmpNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>璐熻矗浜�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HMangerName" @input="HManagerNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName" @input="HSourceNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍣ㄥ叿缂栫爜:</view>
+ <view class="righton">
+ <input name="HMouldNumber" v-model="hform.HMouldNumber" disabled placeholder="璇疯緭鍏ュ櫒鍏风紪鐮�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍣ㄥ叿鍚嶇О:</view>
+ <view class="righton">
+ <input name="HMouldName" v-model="hform.HMouldName" disabled placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍣ㄥ叿鍨嬪彿:</view>
+ <view class="righton">
+ <input name="HMouldModel" v-model="hform.HMouldModel" disabled placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏁伴噺:</view>
+ <view class="righton">
+ <input name="HQty" v-model="hform.HQty" disabled placeholder="璇疯緭鍏ユ暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">涓嬫ā鏃堕棿:</view>
+ <view class="righton">
+ <input name="HScanDate" disabled v-model="hform.HScanDate" placeholder="璇烽�夋嫨" />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title">鐢熶骇璁㈠崟:</view>
+ <view class="righton">
+ <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">娴佽浆鍗�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HProcExchBillNo" />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right">
+ <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
+ </view>
+ </view>
+
+ <view class="tab_area"></view>
+
+ <view v-if="showmore">
+ <view class="form-item">
+ <view class="title">鍒跺崟浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HMaker" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒跺崟鏃ユ湡:</view>
+ <view class="righton">
+ <input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled/>
+ <input v-else v-model="hform.HMakeDate" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDater" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</view>
+ <view class="righton">
+ <input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled/>
+ <input v-else v-model="hform.HUpDateDate" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HChecker" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃ユ湡:</view>
+ <view class="righton">
+ <input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled/>
+ <input v-else v-model="hform.HCheckDate" disabled/>
+ </view>
+ </view>
+
+ </view>
+ <view class="other">
+ <view v-if="!showmore" @tap="showmore = true">
+ 灞曞紑鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+ </view>
+ <view v-if="showmore" @tap="showmore = false">
+ 鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+ </view>
+ </view>
+
+ <view class="tab_area"></view>
+
+ <view class="bottom-btn">
+ <button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button>
+ <button v-if="btnType != 1 && isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+ </view>
+
+ </view>
+</template>
+<script>
+ import getDateTime from '@/utils/getdateTime.js';
+ import { getUserInfo } from "@/utils/auth.js";
+ export default {
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ linterid:'',
+ HBillNo:'',
+ btnType:1,//1鏂板锛�3淇敼
+ showmore: false,
+
+ arrayHDeptName:[],//閮ㄩ棬
+ HDeptNameList:[],
+ arrayHEmpName:[],//鍙戠幇浜�/璐熻矗浜�
+ HEmpNameList:[],
+ arrayHSourceName:[],//鐢熶骇璧勬簮
+ HSourceNameList:[],
+
+
+ isEdit: false,
+ hform:{
+ HInterID:'',
+ HBillNo:'',
+ HDate:getDateTime.dateTimeStr('y-m-d'),
+ HBarCode:'',
+ HDeptName:'',
+ HDeptID:'',
+ HEmpName:'',
+ HEmpID:'',
+ HMangerName:'',
+ HMangerID:'',
+
+
+ HSourceName:'',
+ HSourceID:'',
+ HMouldNumber:'',
+ HMouldID:'',
+ HMouldName:'',
+ HMouldModel:'',
+ HQty:'',
+ HScanDate:getDateTime.dateTimeStr('y-m-d h:i:s'),
+ HICMOBillNo:'',
+ HICMOInterID:'',
+ HICMOEntryID:'',
+ HProcExchBillNo:'',
+ HProcExchInterID:'',
+ HProcExchEntryID:'',
+ HOrgID:uni.getStorageSync('OrganizationID'),
+
+ HMaker:'',
+ HMakeDate:'',
+ HUpDater:'',
+ HUpDateDate:'',
+ HChecker:'',
+ HCheckDate:'',
+ HCloseMan:'',
+ HCloseDate:'',
+ HDeleteMan:'',
+ HDeleteDate:'',
+
+ eventType:'Add'
+ }
+ }
+ },
+ onLoad(e) {
+
+ this.hform.HMaker = uni.getStorageSync('HUserName')
+ console.log(e,this.userInfo)
+ if(e.linterid){
+ this.btnType = 3
+ this.linterid = e.linterid
+ this.HBillNo = e.HBillNo
+ this.getEditData(e.linterid, e.HBillNo)
+ }else{
+ this.getNewData()
+ }
+
+ this.getHDeptList()
+ this.getHEmpList()
+ this.getHSourceList()
+ },
+ methods: {
+ //鎵爜
+ toScanCode(){
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval':'10', //瓒呮椂鏃堕棿
+ 'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ },(ret) => {
+ console.log(ret.resp_result)
+ this.hform.HBarCode = ret.resp_result
+ this.getHBarCodeData(ret.resp_result)
+ })
+ },
+ //鏃ユ湡
+ HDateChange(e){
+ console.log(e.detail.value)
+ this.hform.HDate = e.detail.value
+ },
+ getHBarCodeData(HBarCode) {
+ var sWhere = " and 鏉″舰鐮�='" + this.hform.HBarCode +"' order by 鍒跺崟鏃ユ湡 desc"
+ uni.request({
+ url: this.serverUrl + '/Sc_MouldLowerBill/Sc_MouldUpperBillList',
+ data: {
+ sWhere: sWhere
+ },
+ success: (res) => {
+ console.log(2, res.data);
+ if (res.data.code == 1) {
+ var data = res.data.data[0];
+ console.log(3, data);
+ this.hform.HProcExchBillNo = data.HProcExchBillNo;
+ this.hform.HProcExchInterID = data.HProcExchInterID;
+ this.hform.HProcExchEntryID = data.HProcExchEntryID;
+ this.hform.HICMOBillNo = data.HICMOBillNo;
+ this.hform.HICMOInterID = data.HICMOInterID;
+ this.hform.HICMOEntryID = data.HICMOEntryID;
+ this.hform.HSourceID = data.HSourceID;
+ this.hform.HSourceName = data.鐢熶骇璧勬簮;
+ this.hform.HMouldID = data.HMouldID;
+ this.hform.HMouldNumber = data.妯″叿缂栫爜;
+ this.hform.HMouldName = data.妯″叿鍚嶇О;
+ this.hform.HMouldModel = data.妯″叿瑙勬牸;
+ this.hform.HQty = 1;
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+ getHDeptList(){
+ uni.request({
+ url: this.serverUrl + '/PublicPageMethod/DeptList',
+ data: { sWhere: "where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync('OrganizationID') + "" },
+ success: (res) => {
+ if(res.data.count == 1){
+ this.HDeptNameList = res.data.data
+ for(var i=0;i<res.data.data.length;i++){
+ this.arrayHDeptName[i] = res.data.data[i].HName
+ }
+ this.$forceUpdate();
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨浣跨敤閮ㄩ棬
+ HDeptNameChange(e){
+ for(var i=0;i<this.HDeptNameList.length;i++){
+ if(this.HDeptNameList[i].HName == e){
+ this.hform.HDeptID = this.HDeptNameList[i].HItemID
+ }
+ }
+ },
+ //鎿嶄綔鍛樸�佽礋璐ｄ汉
+ getHEmpList(){
+ uni.request({
+ url: this.serverUrl + '/Web/GetEmployeeList_Json',
+ data: { Employee: '',HGroupID:0 },
+ success: (res) => {
+ if(res.data.count == 1){
+ this.HEmpNameList = res.data.data
+ for(var i=0;i<res.data.data.length;i++){
+ this.arrayHEmpName[i] = res.data.data[i].HName
+ }
+ this.$forceUpdate();
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨鎿嶄綔鍛�
+ HEmpNameChange(e){
+ for(var i=0;i<this.HEmpNameList.length;i++){
+ if(this.HEmpNameList[i].HName == e){
+ this.hform.HEmpID = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //閫夋嫨璐熻矗浜�
+ HManagerNameChange(e){
+ for(var i=0;i<this.HEmpNameList.length;i++){
+ if(this.HEmpNameList[i].HName == e){
+ this.hform.HMangerID = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //鐢熶骇璧勬簮
+ getHSourceList(){
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getSourceList',
+ data: { sWhere: '' },
+ success: (res) => {
+ if(res.data.code == 1){
+ this.HSourceNameList = res.data.data.Gy_Source
+ for(var i=0;i<res.data.data.Gy_Source.length;i++){
+ this.arrayHSourceName[i] = res.data.data.Gy_Source[i].鐢熶骇璧勬簮
+ }
+ this.$forceUpdate();
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨鐢熶骇璧勬簮
+ HSourceNameChange(e){
+ for(var i=0;i<this.HSourceNameList.length;i++){
+ if(this.HSourceNameList[i].鐢熶骇璧勬簮 == e){
+ this.hform.HSourceID = this.HSourceNameList[i].HItemID
+ }
+ }
+ },
+ ifEdit(){
+ this.isEdit = true
+ this.hform.eventType = 'Modify'
+ },
+ //缂栬緫鍥炴樉
+ getEditData(linterid,HBillNo){
+ //涓昏〃
+ var sWhere = " and hmainid='" + linterid + "'";
+ uni.request({
+ url: this.serverUrl + '/Sc_MouldUpperBill/Sc_MouldLowerBillList',
+ data: { sWhere: sWhere,user: uni.getStorageSync('HUserName') },
+ success: (res) => {
+ console.log(1,res.data.data[0]);
+ if(res.data.code == 1){
+ var data = res.data.data[0]
+ this.btnType=3
+ this.hform.HInterID= data.hmainid
+ this.hform.HBillNo= data.鍗曟嵁鍙�
+ this.hform.HBarCode= data.鏉″舰鐮�
+ this.hform.HDeptID= data.HDeptID
+ this.hform.HDeptName= data.閮ㄩ棬
+ this.hform.HEmpID= data.HEmpID
+ this.hform.HEmpName= data.鎿嶄綔鍛�
+ this.hform.HMangerID= data.HMangerID
+ this.hform.HMangerName= data.璐熻矗浜�
+ this.hform.HRemark= data.琛ㄥご澶囨敞
+ this.hform.HDate = data.鏃ユ湡.substr(0,10)
+
+ this.hform.HSourceID=data.HSourceID,
+ this.hform.HSourceName=data.鐢熶骇璧勬簮,
+ this.hform.HMouldID=data.HMouldID,
+ this.hform.HMouldNumber=data.妯″叿缂栫爜,
+ this.hform.HMouldName=data.妯″叿鍚嶇О,
+ this.hform.HMouldModel=data.妯″叿瑙勬牸,
+ this.hform.HQty=data.鏁伴噺,
+ this.hform.HScanDate=data.涓嬫ā鎵爜鏃堕棿,
+ this.hform.HICMOBillNo=data.HICMOBillNo,
+ this.hform.HICMOInterID=data.HICMOInterID,
+ this.hform.HICMOEntryID=data.HICMOEntryID,
+ this.hform.HProcExchBillNo=data.HProcExchBillNo,
+ this.hform.HProcExchInterID=data.HProcExchInterID,
+ this.hform.HProcExchEntryID=data.HProcExchEntryID,
+ this.hform.HOrgID=data.HOrgID,
+
+ this.hform.HMaker= data.鍒跺崟浜�
+ this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
+ this.hform.HUpDater= data.淇敼浜�
+ this.hform.HUpDateDate= data.淇敼鏃ユ湡
+ this.hform.HChecker= data.瀹℃牳浜�
+ this.hform.HCheckDate= data.瀹℃牳鏃ユ湡
+ this.hform.HDeleteMan= data.浣滃簾浜�
+ this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ },
+ //鏂板
+ getNewData(){
+ uni.request({
+ url: this.serverUrl + '/Web/GetMAXNum',
+ data: { HBillType: '3847' },
+ success: (res) => {
+ console.log(res.data)
+ if(res.data.count == 1){
+ this.hform.HInterID = res.data.data[0].HInterID
+ this.hform.HBillNo = res.data.data[0].HBillNo
+ this.hform.HMakeDate = getDateTime.dateTimeStr('y-m-d')
+ this.btnType=1
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ },
+ submit() {
+ if(!this.hform.HBarCode){
+ uni.showToast({
+ title:'璇锋壂鎻忔ā鍏锋潯褰㈢爜',
+ icon:'none'
+ })
+ }else if(!this.hform.HSourceName){
+ uni.showToast({
+ title:'璇烽�夋嫨鐢熶骇璧勬簮',
+ icon:'none'
+ })
+ }else if(!this.hform.HMouldName){
+ uni.showToast({
+ title:'妯″叿涓嶈兘涓虹┖',
+ icon:'none'
+ })
+ }else if(!this.hform.HEmpName){
+ uni.showToast({
+ title:'璇烽�夋嫨鎿嶄綔鍛�',
+ icon:'none'
+ })
+ }else if(!this.hform.HMangerName){
+ uni.showToast({
+ title:'璇烽�夋嫨璐熻矗浜�',
+ icon:'none'
+ })
+ }else{
+ uni.showLoading({
+ title:'璇风◢鍊�'
+ })
+ var sMainStr = JSON.stringify(this.hform);
+ var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName')+";"+this.btnType;
+ console.log(sMainSub);
+ uni.request({
+ url: this.serverUrl + '/Sc_MouldUpperBill/AddSc_MouldLowerBill_PDA',
+ method:'POST',
+ dataType:"json",
+ data:{ oMain: sMainSub },
+ success: (res) => {
+ console.log(1,res);
+ uni.hideLoading()
+ if(res.data.count == 1){
+ let pages = getCurrentPages();
+ let prePage = pages[pages.length - 2];
+ prePage.$vm.getList()
+ if(this.isEdit){
+ setTimeout(()=>{
+ uni.redirectTo({
+ url:'/pages/MJGL/xiamodan/form'
+ })
+ },1000)
+ }else{
+ setTimeout(()=>{
+ uni.navigateBack()
+ },1000)
+ }
+ }
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ }
+ },
+ goBack(){
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.navigateBack()
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form{
+ width: 668rpx;
+ margin: 20rpx auto;
+ padding-bottom: 240rpx;
+ }
+ .tab_area{
+ width: 100%;
+ height: 50rpx;
+ }
+ .other{
+ margin-top: 8rpx;
+ text-align: center;
+ font-size: 28rpx;
+ padding: 4rpx 18rpx;
+ color: #1890FF;
+ }
+ .form-item{
+ display: flex;
+ align-items: center;
+ font-size: 30rpx;
+ padding: 6rpx 0;
+ .title{
+ width: 208rpx;
+ text{
+ color: red;
+ font-weight: bold;
+ }
+ }
+ .right{
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+ .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;
+ }
+
+ }
+ .bottom-btn{
+ 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;
+ 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;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/xiamodan/table.vue b/pages/MJGL/xiamodan/table.vue
new file mode 100644
index 0000000..a3a8cc6
--- /dev/null
+++ b/pages/MJGL/xiamodan/table.vue
@@ -0,0 +1,531 @@
+<template>
+ <view class="content">
+ <view class="form">
+ <view class="form-item">
+ <view class="title">鐘舵��:</view>
+ <view class="right">
+ <picker :range="arrayStatus" :value="hform.HStatus" @change="HStatusChange">
+ <view class="picker-overlay"></view>
+ <input name="HStatus" disabled :value="hform.HStatus" placeholder="璇烽�夋嫨鐘舵��" />
+ </picker>
+ </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 v-if="showmore">
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="right">
+ <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿缂栫爜:</view>
+ <view class="right">
+ <input v-model="hform.HModelNumber" placeholder="璇疯緭鍏ユā鍏风紪鐮�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿鍚嶇О:</view>
+ <view class="right">
+ <input v-model="hform.HModelName" placeholder="璇疯緭鍏ユā鍏峰悕绉�" />
+ </view>
+ </view>
+ </view>
+ <view class="other">
+ <view v-if="!showmore" @tap="showmore = true">
+ 灞曞紑鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+ </view>
+ <view v-if="showmore" @tap="showmore = false">
+ 鎶樺彔鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+ </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>
+
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+ <view class="list" v-for="(item,index) in showList" :key="index">
+
+ <uni-card :title="item.HBillNO" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+ @tap="showDetail = showDetail==index?-1:index">
+ <!-- #ifndef MP-WEIXIN-->
+ <view class="card-detail">
+ <view class="detail" v-if="item.閮ㄩ棬">
+ <text>閮ㄩ棬锛�</text>{{item.閮ㄩ棬}}
+ </view>
+ <view class="detail" v-if="item.璐熻矗浜�">
+ <text>璐熻矗浜猴細</text>{{item.璐熻矗浜簘}
+ </view>
+ <view class="detail" v-if="item.妯″叿缂栫爜">
+ <text>妯″叿缂栫爜锛�</text>{{item.妯″叿缂栫爜}}
+ </view>
+ <view class="detail" v-if="item.妯″叿鍚嶇О">
+ <text>妯″叿鍚嶇О锛�</text>{{item.妯″叿鍚嶇О}}
+ </view>
+ <view class="detail" v-if="item.妯″叿瑙勬牸">
+ <text>妯″叿瑙勬牸锛�</text>{{item.妯″叿瑙勬牸}}
+ </view>
+ <view class="detail" v-if="item.鐢熶骇璧勬簮">
+ <text>鐢熶骇璧勬簮锛�</text>{{item.鐢熶骇璧勬簮}}
+ </view>
+ <view class="detail" v-if="item.涓嬫ā鎵爜鏃堕棿">
+ <text>涓嬫ā鏃堕棿锛�</text>{{item.涓嬫ā鎵爜鏃堕棿.substr(0,10)}}
+ </view>
+ </view>
+ <view class="card-detail" v-if="showDetail == index">
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.淇敼浜�">
+ <text>淇敼浜猴細</text>{{item.淇敼浜簘}
+ </view>
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳浜�">
+ <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴浜�">
+ <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.澶囨敞">
+ <text>澶囨敞锛�</text>{{item.澶囨敞}}
+ </view>
+ </view>
+ <!-- #endif -->
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+
+ <view class="op" v-if="operations == index">
+ <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ </view>
+</template>
+
+<script>
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ export default {
+ data() {
+ return {
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ showmore: false,
+ arrayStatus: ['鍏ㄩ儴', '鏈鏍�', '宸插鏍�', '宸插叧闂�'],
+ hform: {
+ HStatus: '鍏ㄩ儴',
+ HBeginDate: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
+ HEndDate: new Date().toISOString().split('T')[0],
+ HModelName: '',
+ HModelNumber: '',
+ HBillNo: '',
+ },
+ sWhere: '',
+ listData: [],
+ showList: [],
+ showDetail: -1,
+ operations: -1,
+
+ page: 1,
+ }
+ },
+ onLoad() {
+ this.getList()
+ },
+ onReachBottom: function() {
+ this.page++
+ setTimeout(() => {
+ this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ }, 100)
+ },
+ onPullDownRefresh: function() {
+ this.clear()
+ setTimeout(() => {
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
+ methods:{
+ SearchWhere() { //杩囨护鏉′欢
+ this.sWhere = ''; // 鍏堟竻绌烘潯浠�
+
+ if (this.hform.HStatus) {
+ if (this.hform.HStatus == '鍏ㄩ儴') {
+ this.sWhere += "";
+ } else if (this.hform.HStatus == '鏈鏍�') {
+ this.sWhere += " and 瀹℃牳浜�=''";
+ } else if (this.hform.HStatus == '宸插鏍�') {
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ } else if (this.hform.HStatus == '宸插叧闂�') {
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ }
+ }
+ if (this.hform.HBeginDate) {
+ this.sWhere += " and CONVERT(varchar(100), 鏃ユ湡, 23) >= '" + this.hform.HBeginDate + "'";
+ }
+ if (this.hform.HEndDate) {
+ this.sWhere += " and CONVERT(varchar(100), 鏃ユ湡, 23) <= '" + this.hform.HEndDate + "'";
+ }
+ if (this.hform.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ }
+ if (this.hform.HModelNumber) {
+ this.sWhere += " and 妯″叿缂栫爜 like '%" + this.hform.HModelNumber + "%'";
+ }
+ if (this.hform.HModelName) {
+ this.sWhere += " and 妯″叿鍚嶇О like '%" + this.hform.HModelName + "%'";
+ }
+ return this.sWhere
+ },
+ getPage(page, list) {
+ let sindex = (parseInt(page) - 1) * 20
+ let eindex = parseInt(page) * 20
+ let newList = list.slice(sindex, eindex)
+ return newList
+ },
+ getList() {
+ this.sWhere = this.SearchWhere()
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ })
+ uni.request({
+ url: this.serverUrl + '/Sc_MouldUpperBill/Sc_MouldLowerBillList',
+ data: {
+ sWhere: this.sWhere,
+ user: uni.getStorageSync('HUserName')
+ },
+ success: (res) => {
+ console.log(1, res.data.data);
+ if (res.data.count == 1) {
+ this.listData = res.data.data
+ this.showList = this.getPage(this.page, this.listData)
+ setTimeout(() => {
+ uni.hideLoading()
+ }, 1000)
+ } else {
+ uni.hideLoading()
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鐘舵��
+ HStatusChange(e) {
+ console.log(e.detail.value)
+ this.hform.HStatus = this.arrayStatus[e.detail.value]
+ },
+ //閫夋嫨鍗曟嵁鏃ユ湡
+ HBeginDateChange(e) {
+ console.log(e.detail.value)
+ this.hform.HBeginDate = e.detail.value
+ },
+ //閫夋嫨鍗曟嵁鏃ユ湡
+ HEndDateChange(e) {
+ console.log(e.detail.value)
+ this.hform.HEndDate = e.detail.value
+ },
+ //鎼滅储
+ search() {
+ this.listData = [];
+ this.page = 1;
+ this.showList = [];
+ this.getList()
+ },
+ //鏂板
+ creat() {
+ uni.navigateTo({
+ url: '/pages/MJGL/xiamodan/form'
+ })
+ },
+ //閲嶇疆
+ clear() {
+ this.listData = []
+ this.page = 1
+ this.showList = []
+
+ this.showmore = false
+ this.sWhere = ''
+ this.showDetail = -1,
+ this.operations = -1,
+ this.hform = {
+ HStatus: '鍏ㄩ儴',
+ HBeginDate: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
+ HEndDate: new Date().toISOString().split('T')[0],
+ HModelName: '',
+ HModelNumber: '',
+ HBillNo: '',
+ };
+ this.getList();
+ },
+
+ //缂栬緫
+ edit(item) {
+ console.log(item)
+ uni.navigateTo({
+ url: '/pages/MJGL/xiamodan/form?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ })
+ },
+ //鍒犻櫎
+ del(item) {
+ console.log(item)
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.request({
+ url: this.serverUrl + '/Sc_MouldUpperBill/DeltetSc_MouldLowerBill',
+ data: {
+ HInterID: item.hmainid + "_" + item.hsubid,
+ HPRDORGID: uni.getStorageSync('OrganizationID'),
+ user: uni.getStorageSync('HUserName')
+ },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.clear()
+ }
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form {
+ width: 640rpx;
+ margin: 20rpx auto;
+
+ }
+
+ .other {
+ margin-top: 8rpx;
+ text-align: center;
+ font-size: 28rpx;
+ padding: 4rpx 18rpx;
+ color: #1890FF;
+ }
+
+ .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;
+ }
+
+ .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;
+ margin-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;
+ }
+ }
+
+ .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;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+ }
+
+</style>
\ No newline at end of file
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 4cd146d..ebb54da 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -85,7 +85,7 @@
"娓╁窞娴疯瘹鍏夊": 'http://122.228.39.234:7177/API/',
"瀹佹尝鎯犲悍宸ヤ笟": 'http://172.16.72.30:6699/API/',
"浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
- "缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/'
+ "缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:8082/API/'
},
serverUrlName: '娴欐睙鏅轰簯杩堟��',
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index a7c0d9d..75ba524 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -114,20 +114,6 @@
id: 11,
hidden: true,
}, {
- img: '../../static/icon/icon13.png',
- text: '涓婃ā鍗�',
- tip: '鏌ョ湅璇︽儏',
- url: '/pages/MJGL/shangmudan/table',
- id: 12,
- hidden: true,
- }, {
- img: '../../static/icon/icon13.png',
- text: '涓嬫ā鍗�',
- tip: '鏌ョ湅璇︽儏',
- url: '',
- id: 13,
- hidden: true,
- }, {
img: '../../static/icon/icon32.png',
text: '璁惧杩愯鐘舵��',
tip: '鏌ョ湅璇︽儏',
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 917ed45..964dcee 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -36,7 +36,9 @@
menuListName: 'tab2',
canEdit: false,
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- itemData: [{
+ itemData: [
+ // 閲囪喘鐩稿叧鏆傚瓨鍒楄〃
+ {
img: '../../static/icon/icon17.png',
text: '閲囪喘鍏ュ簱鏆傚瓨鍒楄〃',
url: '/pages/caigouruku/table',
@@ -49,258 +51,245 @@
id: 2,
hidden: false,
}, {
- img: '../../static/icon/icon17.png',
- text: '鍏朵粬鍏ュ簱鏆傚瓨鍒楄〃',
- url: '/pages/qitaruku_v2/table',
+ img: '../../static/icon/icon30.png',
+ text: '閲囪喘鍏ュ簱鏍￠獙鏆傚瓨鍒楄〃',
+ url: '/pages/caigourukujiaoyan/table',
id: 3,
hidden: false,
- }, {
- img: '../../static/icon/icon18.png',
- text: '鍏朵粬鍑哄簱鏆傚瓨鍒楄〃',
- url: '/pages/qitachuku_v2/table',
- id: 4,
- hidden: false,
- }, {
- img: '../../static/icon/icon32.png',
- text: '鐩存帴璋冩嫧鏆傚瓨鍒楄〃',
- url: '/pages/zhijiediaobo/table',
- id: 5,
- hidden: false,
- }, {
- img: '../../static/icon/icon30.png',
- text: '鐢熶骇棰嗘枡鏆傚瓨鍒楄〃',
- url: '/pages/shengchanlingliaoshengdan/table',
- id: 6,
- hidden: false,
- }, {
- img: '../../static/icon/icon31.png',
- text: '鐢熶骇琛ユ枡鏆傚瓨鍒楄〃',
- url: '/pages/shengchanbuliao/table',
- // url: '',
- id: 7,
- hidden: false,
- }, {
- img: '../../static/icon/icon17.png',
- text: '鐢熶骇鍏ュ簱鏆傚瓨鍒楄〃',
- url: '/pages/shengchanrukushengdan/table',
- // url:'',
- id: 8,
- hidden: false,
- }, {
- img: '../../static/icon/icon30.png',
- text: '濮斿棰嗘枡鏆傚瓨鍒楄〃',
- // url:'',
- url: '/pages/weiwailingliao/table',
- id: 9,
- hidden: false,
- }, {
+ },
+
+ // 閿�鍞浉鍏虫殏瀛樺垪琛�
+ {
img: '../../static/icon/icon18.png',
text: '閿�鍞嚭搴撴殏瀛樺垪琛�',
url: '/pages/xiaoshouchuku/table',
- id: 10,
+ id: 4,
hidden: false,
}, {
img: '../../static/icon/icon20.png',
text: '閿�鍞��璐ф殏瀛樺垪琛�',
url: '/pages/xiaoshoutuihuo/table',
- id: 11,
- hidden: false,
- },
- {
- img: '../../static/icon/icon20.png',
- text: '濮斿鍏ュ簱鏆傚瓨鍒楄〃',
- url: '/pages/weiwairuku/table',
- id: 12,
- hidden: false,
- }, {
- img: '../../static/icon/icon30.png',
- text: '鐢熶骇棰嗘枡鏍￠獙鏆傚瓨鍒楄〃',
- url: '/pages/shengchanlingliao/table',
- id: 13,
- hidden: false,
- }, {
- img: '../../static/icon/icon31.png',
- text: '鐢熶骇琛ユ枡鏍￠獙鏆傚瓨鍒楄〃',
- url: '/pages/shengchanbuliaojiaoyan/CacheList',
- id: 14,
- hidden: false,
- }, {
- img: '../../static/icon/icon32.png',
- text: '鐢熶骇璋冩嫧鏍￠獙鏆傚瓨鍒楄〃',
- url: '/pages/shengchandiaobo/table',
- id: 15,
- hidden: false,
- }, {
- img: '../../static/icon/icon18.png',
- text: '鍏朵粬鍑哄簱鏍￠獙鏆傚瓨鍒楄〃',
- url: '/pages/qitachuku/qitachuku',
- id: 16,
- hidden: false,
- }, {
- img: '../../static/icon/icon17.png',
- text: '鐢熶骇鍏ュ簱鏍￠獙鏆傚瓨鍒楄〃',
- url: '/pages/shengchanruku/table',
- id: 17,
+ id: 5,
hidden: false,
}, {
img: '../../static/icon/icon18.png',
text: '閿�鍞嚭搴撴牎楠屾殏瀛樺垪琛�',
url: '/pages/xiaoshouchukujiaoyan/table',
- id: 18,
+ id: 6,
+ hidden: false,
+ },
+
+ // 鐢熶骇鐩稿叧鏆傚瓨鍒楄〃
+ {
+ img: '../../static/icon/icon30.png',
+ text: '鐢熶骇棰嗘枡鏆傚瓨鍒楄〃',
+ url: '/pages/shengchanlingliaoshengdan/table',
+ id: 7,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon31.png',
+ text: '鐢熶骇琛ユ枡鏆傚瓨鍒楄〃',
+ url: '/pages/shengchanbuliao/table',
+ id: 8,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon17.png',
+ text: '鐢熶骇鍏ュ簱鏆傚瓨鍒楄〃',
+ url: '/pages/shengchanrukushengdan/table',
+ id: 9,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon8.png',
+ text: '鐢熶骇閫�鏂欏崟鏆傚瓨鍒楄〃',
+ url: `/pages/shengchantuiliao/table`,
+ id: 10,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon30.png',
+ text: '鐢熶骇棰嗘枡鏍￠獙鏆傚瓨鍒楄〃',
+ url: '/pages/shengchanlingliao/table',
+ id: 11,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon31.png',
+ text: '鐢熶骇琛ユ枡鏍￠獙鏆傚瓨鍒楄〃',
+ url: '/pages/shengchanbuliaojiaoyan/CacheList',
+ id: 12,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon17.png',
+ text: '鐢熶骇鍏ュ簱鏍￠獙鏆傚瓨鍒楄〃',
+ url: '/pages/shengchanruku/table',
+ id: 13,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon32.png',
+ text: '鐢熶骇璋冩嫧鏍￠獙鏆傚瓨鍒楄〃',
+ url: '/pages/shengchandiaobo/table',
+ id: 14,
+ hidden: false,
+ },
+
+ // 濮斿鐩稿叧鏆傚瓨鍒楄〃
+ {
+ img: '../../static/icon/icon30.png',
+ text: '濮斿棰嗘枡鏆傚瓨鍒楄〃',
+ url: '/pages/weiwailingliao/table',
+ id: 15,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon20.png',
+ text: '濮斿鍏ュ簱鏆傚瓨鍒楄〃',
+ url: '/pages/weiwairuku/table',
+ id: 16,
hidden: false,
}, {
img: '../../static/icon/icon30.png',
text: '濮斿棰嗘枡鏍￠獙鏆傚瓨鍒楄〃',
url: '/pages/weiwailingliaojiaoyan/table',
+ id: 17,
+ hidden: false,
+ },
+
+ // 鍏朵粬鍑哄叆搴撴殏瀛樺垪琛�
+ {
+ img: '../../static/icon/icon17.png',
+ text: '鍏朵粬鍏ュ簱鏆傚瓨鍒楄〃',
+ url: '/pages/qitaruku_v2/table',
+ id: 18,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon18.png',
+ text: '鍏朵粬鍑哄簱鏆傚瓨鍒楄〃',
+ url: '/pages/qitachuku_v2/table',
id: 19,
hidden: false,
}, {
- img: '../../static/icon/icon3.png',
- text: '璁惧淇濆吇璁板綍鍗�',
- url: '/pages/baoyangjilu/table',
+ img: '../../static/icon/icon18.png',
+ text: '鍏朵粬鍑哄簱鏍￠獙鏆傚瓨鍒楄〃',
+ url: '/pages/qitachuku/qitachuku',
id: 20,
hidden: false,
- },
- {
- img: '../../static/icon/icon30.png',
- text: '閲囪喘鍏ュ簱鏍￠獙鏆傚瓨鍒楄〃',
- url: '/pages/caigourukujiaoyan/table',
- id: 21,
- hidden: false,
- },{
- img: '../../static/icon/icon5.png',
- text: '璁惧鐐规璁板綍鍗�',
- url: '',
+ },
+
+ // 璋冩嫧鐩稿叧鏆傚瓨鍒楄〃
+ {
+ img: '../../static/icon/icon32.png',
+ text: '鐩存帴璋冩嫧鏆傚瓨鍒楄〃',
+ url: '/pages/zhijiediaobo/table',
+ id: 21,
+ hidden: false,
+ },
+
+ // 鍏朵粬鏆傚瓨鍒楄〃
+ {
+ img: '../../static/icon/icon8.png',
+ text: '缁勬墭鍗曟殏瀛樺垪琛�',
+ url: `/pages/zutuosaoma/table`,
id: 22,
hidden: false,
- }, {
- img: '../../static/icon/icon6.png',
- text: '璁惧鏁呴殰鐧昏琛�',
- url: '/pages/guzhangdengji/table',
- id: 23,
- hidden: false,
- }, {
- img: '../../static/icon/icon7.png',
- text: '璁惧缁翠慨璁板綍鍗�',
- url: '/pages/shebeiweixiu/table',
- id: 24,
- hidden: false,
- }, {
- img: '../../static/icon/icon15.png',
- text: '寮傚父鍙嶉鍗�',
- url: '/pages/yichang/table',
- id: 25,
- hidden: false,
- }, {
- img: '../../static/icon/icon16.png',
- text: '寮傚父鍙嶉澶勭悊鍗�',
- url: '/pages/yichang/list',
- id: 26,
- hidden: false,
- }, {
+ },
+ // 鏍囩鏉＄爜鐩稿叧锛堥潪鏆傚瓨鍒楄〃锛�
+ {
img: '../../static/icon/icon21.png',
text: '鏍囩鎵撳嵃',
url: '/pages/labelPrinter/index',
- id: 27,
+ id: 23,
hidden: false,
}, {
img: '../../static/icon/icon21.png',
text: '鏉＄爜鎷嗙爜',
url: '/pages/tiaomachaima/tiaomachaima',
- id: 28,
+ id: 24,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon21.png',
+ text: '鏉＄爜鎷嗙爜2',
+ url: '/pages/tiaomachaima/tiaomachaima2',
+ id: 25,
hidden: false,
},
+ // 璁惧鐩稿叧锛堥潪鏆傚瓨鍒楄〃锛�
+ {
+ img: '../../static/icon/icon3.png',
+ text: '璁惧淇濆吇璁板綍鍗�',
+ url: '/pages/baoyangjilu/table',
+ id: 26,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon5.png',
+ text: '璁惧鐐规璁板綍鍗�',
+ url: '',
+ id: 27,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon6.png',
+ text: '璁惧鏁呴殰鐧昏琛�',
+ url: '/pages/guzhangdengji/table',
+ id: 28,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon7.png',
+ text: '璁惧缁翠慨璁板綍鍗�',
+ url: '/pages/shebeiweixiu/table',
+ id: 29,
+ hidden: false,
+ },
+
+ // 寮傚父鐩稿叧锛堥潪鏆傚瓨鍒楄〃锛�
+ {
+ img: '../../static/icon/icon15.png',
+ text: '寮傚父鍙嶉鍗�',
+ url: '/pages/yichang/table',
+ id: 30,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon16.png',
+ text: '寮傚父鍙嶉澶勭悊鍗�',
+ url: '/pages/yichang/list',
+ id: 31,
+ hidden: false,
+ },
+ // 搴撳瓨鏌ヨ锛堥潪鏆傚瓨鍒楄〃锛�
{
img: '../../static/icon/icon18.png',
text: 'ERP鍙婃椂搴撳瓨鏌ヨ',
url: '/pages/jishikucunchaxun/table',
- id: 29,
+ id: 32,
hidden: false,
},
+
+ // 鍙栨牱杩樻牱锛堥潪鏆傚瓨鍒楄〃锛�
{
- img: '../../static/icon/icon21.png',
- text: '鏉＄爜鎷嗙爜2',
- url: '/pages/tiaomachaima/tiaomachaima2',
- id: 30,
+ img: '../../static/icon/icon8.png',
+ text: '鍙栨牱鍗�',
+ url: '/pages/quyangdan/table',
+ id: 33,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon8.png',
+ text: '杩樻牱鍗�',
+ url: '/pages/huanyangdan/table',
+ id: 34,
hidden: false,
},
- {
- img: '../../static/icon/icon8.png',
- text: '鍙栨牱鍗�',
- url: '/pages/quyangdan/table',
- id: 31,
- hidden: !this.judgeHidden(),
- },
- {
- img: '../../static/icon/icon8.png',
- text: '杩樻牱鍗�',
- url: '/pages/huanyangdan/table',
- id: 32,
- hidden: !this.judgeHidden(),
- },
- {
- img: '../../static/icon/icon8.png',
- text: '鐢熶骇閫�鏂欏崟鏆傚瓨鍒楄〃',
- url: `/pages/shengchantuiliao/table`,
- id: 33,
- hidden: false,
- },{
- img: '../../static/icon/icon8.png',
- text: '缁勬墭鍗曟殏瀛樺垪琛�',
- url: `/pages/zutuosaoma/table`,
- id: 34,
- hidden: false,
- }
- // {
- // img: '../../static/icon/icon8.png',
- // text: '妫�楠屾姤鍛�',
- // url: `/pages/InnerHtmlPage/index?src=http://172.16.72.15:8999/index.aspx?name=${getUserInfo()['HICNumber']}&pageTitle=妫�楠屾姤鍛奰,
- // id: 32,
- // hidden: false,
- // },
- // {
- // img: '../../static/icon/icon1.png',
- // text: '璁惧妗ｆ鏌ヨ',
- // tip: '鏌ョ湅璇︽儏',
- // url: '/pages/shebeidangan/table',
- // id: 9,
- // }, {
- // img: '../../static/icon/icon8.png',
- // text: '璁惧灞ュ巻鏌ヨ',
- // tip: '鏌ョ湅璇︽儏',
- // url: '/pages/shebeilvli/table',
- // id: 10,
- // }, {
- // img: '../../static/icon/icon14.png',
- // text: '鎴戠殑鎶ュ伐骞冲彴',
- // tip: '鐐瑰嚮杩涘叆',
- // url: '/pages/baogong/table',
- // id: 11,
- // }, {
- // img: '../../static/icon/icon13.png',
- // text: '涓婃ā鍗�',
- // tip: '鏌ョ湅璇︽儏',
- // url: '/pages/MJGL/shangmudan/table',
- // id: 12,
- // }, {
- // img: '../../static/icon/icon13.png',
- // text: '涓嬫ā鍗�',
- // tip: '鏌ョ湅璇︽儏',
- // url: '',
- // id: 13,
- // }, {
- // img: '../../static/icon/icon32.png',
- // text: '璁惧杩愯鐘舵��',
- // tip: '鏌ョ湅璇︽儏',
- // url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
- // id: 14,
- // }, {
- // img: '../../static/icon/icon6.png',
- // text: '妯″叿鐘舵�佸垎鏋�',
- // tip: '鏌ョ湅璇︽儏',
- // url: '/pages/mujvzhuangtai/mujvzhuangtai',
- // id: 15,
- // },
+
+ // 涓婃ā涓嬫ā锛坔idden涓簍rue锛屾斁鏈�鍚庯級
+ {
+ img: '../../static/icon/icon13.png',
+ text: '涓婃ā鍗�',
+ ip: '鏌ョ湅璇︽儏',
+ url: '/pages/MJGL/shangmudan/table',
+ id: 35,
+ hidden: false,
+ }, {
+ img: '../../static/icon/icon13.png',
+ text: '涓嬫ā鍗�',
+ ip: '鏌ョ湅璇︽儏',
+ url: '/pages/MJGL/xiamodan/table',
+ id: 36,
+ hidden: false,
+ }
]
}
},
--
Gitblit v1.9.1