From 73cb501ad7e2e67a4f427157179ca5180424f1c5 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 28 十月 2025 14:04:46 +0800
Subject: [PATCH] 1

---
 pages.json                                |   51 
 pages/index/tab2.vue                      |   18 
 pages/MJGL/shangmudan/form.vue            |   10 
 pages/shoujishouming/table.vue            |  485 ++++
 pages/index/tab1.vue                      |    7 
 pages/MJGL/mujulingliaochukudan/table.vue |  487 ++++
 pages/MJGL/qijudiaobodan/table.vue        |  620 ++++++
 pages/MJGL/mujulingliaochukudan/form.vue  | 1035 ++++++++++
 pages/index/_index.vue                    |    6 
 pages/MJGL/mujulingliaotuikudan/form.vue  |  943 +++++++++
 pages/index/login.vue                     |    3 
 pages/MJGL/qijudiaobodan/form.vue         | 1242 ++++++++++++
 pages/MJGL/mujulingliaotuikudan/table.vue |  486 ++++
 pages/shoujishouming/form.vue             |  733 +++++++
 pages/index/index.vue                     |    1 
 15 files changed, 6,122 insertions(+), 5 deletions(-)

diff --git a/pages.json b/pages.json
index b97e612..3785993 100644
--- a/pages.json
+++ b/pages.json
@@ -841,7 +841,56 @@
             {
                 "navigationBarTitleText" : "鐢熶骇閫�鏂欏崟"
             }
-        }
+        },
+		{
+		    "path": "pages/shoujishouming/table",
+		    "style": {
+		        "navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
+		        "enablePullDownRefresh": true
+		    }
+		},
+		{
+		    "path": "pages/shoujishouming/form",
+		    "style": {
+		        "navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
+		        "enablePullDownRefresh": true
+		    }
+		},
+		{
+		    "path": "pages/MJGL/mujulingliaochukudan/form",
+		    "style": {
+		        "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+		        "enablePullDownRefresh": true
+		    }
+		},
+		{
+		    "path": "pages/MJGL/mujulingliaochukudan/table",
+		    "style": {
+		        "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+		        "enablePullDownRefresh": true
+		    }
+		},
+		{
+		    "path": "pages/MJGL/mujulingliaotuikudan/table",
+		    "style": {
+		        "navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
+		        "enablePullDownRefresh": true
+		    }
+		},
+		{
+		    "path": "pages/MJGL/qijudiaobodan/table",
+		    "style": {
+		        "navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
+		        "enablePullDownRefresh": true
+		    }
+		},
+		{
+		    "path": "pages/MJGL/qijudiaobodan/form",
+		    "style": {
+		        "navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
+		        "enablePullDownRefresh": true
+		    }
+		}
     ],
     "tabBar": {
         "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
diff --git a/pages/MJGL/mujulingliaochukudan/form.vue b/pages/MJGL/mujulingliaochukudan/form.vue
new file mode 100644
index 0000000..a73f09e
--- /dev/null
+++ b/pages/MJGL/mujulingliaochukudan/form.vue
@@ -0,0 +1,1035 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)" @blur="getCode(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="right">
+					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+						@input="HWHNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撲綅:</view>
+				<view class="right" v-show="showHStockPlaceName">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<view class="righton" v-show="!showHStockPlaceName">
+					<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName"
+						placeholder="涓嶅彲鎿嶄綔" /></view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍙戞枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戞枡浜�" v-model="hform.HSactterUser"
+						@input="HScatterUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">棰嗘枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗘枡浜�" v-model="hform.HCollectUser"
+						@input="HCollectUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+			    <view class="title">閮ㄩ棬:</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">寰�鏉ョ被鍨�:</view>
+			    <view class="right">
+			        <uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
+			            @input="HSelectTypeChange"></uni-combox>
+			    </view>
+			</view>
+			<view class="form-item">
+			    <view class="title">寰�鏉ュ崟浣�:</view>
+			    <view class="right">
+			        <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.Selection"
+			            @input=""></uni-combox>
+			    </view>
+			</view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+			</view>
+			<view v-if="tabs == 0">
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<view class="picker-overlay"></view>
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
+					</view>
+				</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">鍗曟嵁ID:</view>
+					<view class="righton">
+						<input name="HInterID" disabled v-model="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view v-if="tabs==1">
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鏉$爜:</view>
+					<view class="righton">
+						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍚嶇О:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldID_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏁伴噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldCount_B" />
+					</view>
+				</view>
+			</view>
+			<view class="bottom-btn">
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+				<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 " class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			</view>
+		</view>	
+	</view>
+</template>
+
+<script>
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import { CommonUtils } from '@/utils/common';
+	
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				btnType:1,//1鏂板锛�3淇敼
+				linterid:'',
+				arrayHEmpName: [],
+				HEmpNameList: [],
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+				arrayHDeptName: [], //閮ㄩ棬
+				HDeptNameList: [],
+				arrayHSupName: [], //瀹㈡埛
+				HSupNameList: [],
+				arrayHSupplierName:[],//渚涘簲鍟�
+				HSuplierList:[],
+				linterid: '',
+				HBillNo: '',
+				arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
+				HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
+				showHStockPlaceName: true, 
+				HMouldList:[],
+				isEdit: false,
+				hform: {
+					HBarCode: '',
+					HInterID: '',
+					HBillType: 3802,
+					HWHName: getUserInfo().HWHName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
+					HSactterUserName: getUserInfo().User,
+					HSactterUserID: getUserInfo().User,
+					HCollectUserName: getUserInfo().User,
+					HCollectUserID: getUserInfo().User,
+					HDeptName: getUserInfo().HDept,
+					HDeptID: getUserInfo().HDeptID,
+					HSupName:'',
+					HSupID:'',
+					HSecManagerID:'',
+					HKeeperID:'',
+					//寰�鏉ョ被鍨�
+					TypeName:'',
+					TypeID:'',
+					Selection: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
+					SelectionID: '' ,// 寰�鏉ュ崟浣嶅搴旂殑ID
+					HSupTypeID:'',
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+					
+					HRedBlueFlag:'false',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID:uni.getStorageSync('OrganizationID'),
+					HBarCode_B:'',
+					HMouldName_B:'',
+					HMouldID_B:'',
+					HMouldCount_B:'',
+				}
+			}
+		},
+		methods: {
+			
+			//鎵爜
+			toScanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					if (this.hform.HBarCode == '*') {
+						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+					} else {
+						this.hform.HBarCode = ret.resp_result
+					}
+
+					this.getCode(this.hform.HBarCode)
+				})
+			},
+			getNewData() {
+				CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						let res1 = res.data;
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					})
+			},
+			getCode(HBarCode) { 
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sOldBarCode = HBarCode; 
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo =""
+				var sSourceBillType ="-1" 
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						uni.request({
+							url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+							data: {
+								HInterID: this.hform.HInterID,
+								HBillType: this.hform.HBillType,
+								HBarCode: sBarCode
+							},
+							success: (res) => {
+								console.log('鍒犻櫎鏉$爜', res.data);
+								this.hform.HBarCode = ''; 
+								if (res.data.count == 1) {
+									this.hform.HQty = ''
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}else
+				{
+					var sBarCode = this.hform.HBarCode
+					uni.request({
+						url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
+						data:{
+							sBarCode: sBarCode,
+							HInterID: this.hform.HInterID,
+							HBillType: this.hform.HBillType,
+							HBillNo: this.hform.HBillNo,
+							HMaker: this.hform.HMaker,
+							HWhID: sHWHID,
+							HSPID: sHSPID,
+							HSCWhID:0,
+							HSCSPID: 0,
+							HRedBlueFlag: this.hform.HRedBlueFlag,
+							HSourceBillNo: sSourceBillNo,
+							HSourceBillType: sSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HStockOutOrgID: this.hform.HStockOutOrgID,
+						},
+						success:(res)=> {
+							console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+							this.hform.HBarCode=''
+							if(res.data.count==1){
+								this.tabs = 1
+								this.DisBillEntryList()
+							}
+							else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					})
+				}
+			}, 
+			//浠撳簱鐩戝惉浜嬩欢
+			HWHNameChange(e) {
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i]["HName"] == e) {
+						this.hform.HWHName = this.HWHNameList[i]["HName"]
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+
+						this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+					}
+				}
+			},
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i]["HWhName"] == e) {
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
+					}
+				}
+			},
+			HScatterUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSactterUserID = this.HEmpNameList[i].HItemID
+						this.hform.HSactterUserName = this.HEmpNameList[i].HName
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			HCollectUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HCollectUserID = this.HEmpNameList[i].HItemID
+						this.hform.HCollectUserName = this.HEmpNameList[i].HName
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
+			getHBaseList() {
+				CommonUtils.doRequest(
+					"/Web/GetWarehouseList_Json_New", {
+						Warehouse: "",
+						HOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HWHNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHWHName[i] = data[i]["HName"]
+							}
+						} else {
+							uni.showToast({
+								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+				CommonUtils.doRequest(
+					"/WEBSController/GetStockPlaceList_Json", {
+						StockPlace: '',
+						HWhID: this.hform.HWHID,
+						HStockOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						console.log(res1)
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HStockPlaceNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHStockPlaceName[i] = data[i]["HWhName"]
+							}
+						} else {
+							uni.showToast({
+								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			/* #endregion */
+			getHEmpList() {
+				CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+						Employee: '',
+						HGroupID: 0
+					},
+					(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: '浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					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].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getHSupList() {
+				CommonUtils.doRequest(
+					"/Gy_Customer/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			getSupplier()
+			{
+				CommonUtils.doRequest(
+					"/WEBSController/GetSupplier_Json", {
+						HBarCode: uni.getStorageSync(''),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			//閫夋嫨瀹㈡埛
+			HSupNameChange(e) {
+			    for (var i = 0; i < this.HSupNameList.length; i++) {
+			        if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
+			            this.hform.HSupID = this.HSupNameList[i].HItemID
+			            this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+			        }
+			    }
+			},
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			HSelectTypeChange(e)
+			{
+				this.hform.TypeName=e;
+				this.hform.Selection = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+				this.hform.SelectionID = '';
+				if(e=='閮ㄩ棬')
+				{
+					this.hform.HSupTypeID=3;
+					this.arrayHSelectType = this.arrayHDeptName;
+					this.HSelectTypeList = this.HDeptNameList;
+				}
+				else if(e === '渚涘簲鍟�') {
+					this.hform.HSupTypeID=1;
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				} else if(e === '瀹㈡埛') {
+				// 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
+					this.hform.HSupTypeID=2;
+					this.arrayHSelectType =this.arrayHSupName;
+					this.HSelectTypeList = this.HSupNameList;
+				} else {
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				}	
+			},
+			//鍣ㄥ叿淇℃伅
+			DisBillEntryList() {
+				CommonUtils.doRequest(
+					"/MouldController/GetMouldBillEntryTmpList_Json", {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						console.log('鍣ㄥ叿', res.data)
+						var data = res.data.data
+						this.HMouldList = data.HMouldList
+						if (data.count==0) {
+							this.hform.HMouldCount_B = ''
+							this.hform.HMouldID_B = ''
+							this.hform.HMouldName_B = ''
+							
+						} else {
+							this.hform.HMouldCount_B = data[0].HQty
+							this.hform.HMouldID_B = data[0].HMouldID
+							this.hform.HMouldName_B = data[0].HMouldName
+							this.hform.HBarCode_B=data[0].HBarCode
+						}
+					},
+			
+				)
+			},
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url: '/pages/MJGL/mujulingliaochukudan/table'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			ifEdit(){
+				this.isEdit = true
+				this.hform.eventType = 'Modify'
+			},
+			//缂栬緫鍥炴樉
+			getEditData(linterid,HBillNo){				
+				//涓昏〃
+				var sWhere = " and hmainid='" + linterid + "'";
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage', 
+					data: { sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page:1,
+						size:100 },
+				    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.HCollectUserName= data.鍙戞枡浜�
+							this.hform.HCollectUserID= data.hkeeperid
+							this.hform.HKeeperID= data.hkeeperid
+							this.hform.HSactterUserName= data.棰嗘枡浜�
+							this.hform.HSactterUserID= data.hsecmanagerid
+							this.hform.HSecManagerID=data.hsecmanagerid
+							this.hform.HMangerName= data.璐熻矗浜�
+							// this.hform.HRemark= data.琛ㄥご澶囨敞						
+							this.hform.HDate = data.鏃ユ湡.substr(0,10)
+							
+							this.hform.HWHID=data.HWHID,
+							this.hform.HWHName=data.浠撳簱,
+							this.hform.HStockPlaceID=data.HSPID,
+							this.hform.HStockPlaceName=data.浠撲綅,
+							
+							this.hform.Selection=data.寰�鏉ュ崟浣�,
+							this.hform.SelectionID=data.HSupID,
+							this.hform.TypeName=data.寰�鏉ョ被鍨嬪悕绉�,				
+							this.hform.HSupTypeID=data.寰�鏉ョ被鍨�,	
+							this.hform.TypeID=data.寰�鏉ョ被鍨�,					
+														
+							this.hform.HMouldID_B=data.hmaterid,
+							// this.hform.HMouldID_B=data.妯″叿浠g爜,
+							this.hform.HMouldName_B=data.妯″叿鍚嶇О,
+							// this.hform.HMouldModel=data.妯″叿瑙勬牸,
+							this.hform.HMouldCount_B=1,
+							this.hform.HRedBlueFlag=data.绾㈣摑鍗曟爣璁�=='钃濆瓧'?false:true,
+							
+							
+							this.hform.HStockOrgID=data.HStockOrgID,
+							this.hform.HStockOrgName=data.搴撳瓨缁勭粐,
+							// 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'
+						})
+					},
+				});				
+			},
+			submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				if (!this.hform.HSactterUserName) {
+					this.hform.HSactterUserID = 0
+				}
+				else
+				{
+					this.HSecManagerID=this.hform.HSactterUserID
+				}
+				if (!this.hform.HCollectUserName) {
+					this.hform.HCollectUserID = 0
+				}
+				else
+				{
+					this.HKeeperID=this.hform.HCollectUserID 
+				}
+				if (!this.hform.HDeptName) {
+					this.hform.HDeptID = 0
+				}
+				if (!this.hform.HSupName) {
+					this.hform.HSupID = 0
+				}
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else {
+					if (this.hform.HMouldID_B == 0||this.hform.HMouldID_B ==null) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+			
+			
+						let sMainStr = JSON.stringify(this.hform);
+						console.log("涓昏〃锛�" + sMainStr)
+			
+						CommonUtils.doRequest(
+							'/MouldController/set_SaveMouldProdOutBill_Json', {
+								oMain: sMainStr
+							},
+							(res) => {
+								console.log(1, res);
+								uni.hideLoading()
+								if (res.data.count == 1) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/caigouruku/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+									uni.showModal({
+										content: res.data.Message,
+										showCancel: false,
+										complete() {
+											uni.hideLoading()
+										}
+									})
+								}
+							},
+							null,
+							"POST"
+						)
+					}
+				}
+			},
+			onLoad(e) {
+				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.getHBaseList()
+				this.getHSupList()
+				this.getHEmpList()
+				this.getHDeptList()
+				//this.getHEmpList()
+			}
+		}
+	}
+</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;
+    }
+
+    .tabs {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ddd;
+        margin: 20rpx 0;
+
+        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-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;
+            border-radius: 100%;
+            width: 52rpx;
+            height: 52rpx;
+            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;
+        }
+    }
+
+    .bottom-btn {
+        width: 100%;
+        box-sizing: border-box;
+        // 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;
+        }
+    }
+
+    .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;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujulingliaochukudan/table.vue b/pages/MJGL/mujulingliaochukudan/table.vue
new file mode 100644
index 0000000..2d2de72
--- /dev/null
+++ b/pages/MJGL/mujulingliaochukudan/table.vue
@@ -0,0 +1,487 @@
+<template>
+	<view class="content">
+		<view class="form">
+			<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.HCreateBy" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">寮�濮嬫椂闂�:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
+						<view class="picker-overlay"></view>
+						<input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">缁撴潫鏃堕棿:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
+						<view class="picker-overlay"></view>
+						<input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</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.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+				<view class="detail" v-if="item.妯″叿浠g爜">
+					<text>妯″叿浠g爜锛�</text>{{item.妯″叿浠g爜}}
+				</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.寰�鏉ョ被鍨嬪悕绉皚}
+				</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 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.鍏抽棴绫诲瀷}}
+				</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 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.婧愬崟绫诲瀷}}
+					</view>
+					<view class="detail" v-if="item.hbilltype">
+						<text>hbilltype锛�</text>{{item.hbilltype}}
+					</view>
+					<view class="detail" v-if="item.鎽樿">
+						<text>鎽樿锛�</text>{{item.鎽樿}}
+					</view>
+				</view>
+				<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',
+				hform:{
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				operations:-1,
+				
+				page:1,
+				size:100
+	        }
+	    },
+		onLoad() {
+			this.getList()
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
+		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: {
+			getPage(page,list){
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex,eindex)
+				return newList
+			},
+			getList(){
+				console.log(this.sWhere)
+				uni.showLoading({
+					title:'鍔犺浇涓�...'
+				})
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage',
+					data:{ 
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page:1,
+						size:100
+					},
+				    success: (res) => {
+						console.log(1,uni.getStorageSync('Organization'));
+				        console.log(1,res);
+						if(res.data.code ==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'
+						})
+					},
+				});
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			BenginHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.BenginHCreateDate = e.detail.value
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			EndHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.EndHCreateDate = e.detail.value
+			},
+			search(){
+				this.sWhere = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				console.log(this.hform)
+				if (this.hform.HBillNo) {
+				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				}
+				if (this.hform.HCreateBy) {
+				    this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+				}
+				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 + "'";
+				}
+				
+				this.getList()
+			},
+			creat(){
+				uni.navigateTo({
+					url:'/pages/MJGL/mujulingliaochukudan/form'
+				})
+			},
+			clear(){
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				this.sWhere = ''
+				this.showDetail = -1,
+				this.operations = -1,
+				this.hform = {
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				}
+				this.getList()
+			},
+			//TODO   瀛愯〃鍒楄〃
+			// toSon(item){
+			// 	uni.navigateTo({
+			// 		url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid 
+			// 		+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О 
+			// 		+ '&璁惧浠g爜=' + item.璁惧浠g爜,
+			// 	})
+			// },
+			
+			//缂栬緫
+			edit(item){
+				console.log(item)
+				uni.navigateTo({
+					url:'/pages/MJGL/mujulingliaochukudan/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_MouldProdOutBill/DeltetMouldProdOutBill',
+								data:{ 
+									HInterID: item.hmainid,
+									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;
+	}
+    .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: 130rpx;
+				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>
diff --git a/pages/MJGL/mujulingliaotuikudan/form.vue b/pages/MJGL/mujulingliaotuikudan/form.vue
new file mode 100644
index 0000000..37cc36d
--- /dev/null
+++ b/pages/MJGL/mujulingliaotuikudan/form.vue
@@ -0,0 +1,943 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)" @blur="getCode(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="right">
+					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+						@input="HWHNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撲綅:</view>
+				<view class="right" v-show="showHStockPlaceName">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<view class="righton" v-show="!showHStockPlaceName">
+					<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName"
+						placeholder="涓嶅彲鎿嶄綔" /></view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍙戞枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戞枡浜�" v-model="hform.HSactterUser"
+						@input="HScatterUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">棰嗘枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗘枡浜�" v-model="hform.HCollectUser"
+						@input="HCollectUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+			    <view class="title">閮ㄩ棬:</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">寰�鏉ョ被鍨�:</view>
+			    <view class="right">
+			        <uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
+			            @input="HSelectTypeChange"></uni-combox>
+			    </view>
+			</view>
+			<view class="form-item">
+			    <view class="title">寰�鏉ュ崟浣�:</view>
+			    <view class="right">
+			        <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.Selection"
+			            @input=""></uni-combox>
+			    </view>
+			</view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+			</view>
+			<view v-if="tabs == 0">
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<view class="picker-overlay"></view>
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
+					</view>
+				</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">鍗曟嵁ID:</view>
+					<view class="righton">
+						<input name="HInterID" disabled v-model="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view v-if="tabs==1">
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鏉$爜:</view>
+					<view class="righton">
+						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍚嶇О:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldID_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏁伴噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldCount_B" />
+					</view>
+				</view>
+			</view>
+			<view class="bottom-btn">
+				<button 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";
+	import { CommonUtils } from '@/utils/common';
+	
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				arrayHEmpName: [],
+				HEmpNameList: [],
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+				arrayHDeptName: [], //閮ㄩ棬
+				HDeptNameList: [],
+				arrayHSupName: [], //瀹㈡埛
+				HSupNameList: [],
+				arrayHSupplierName:[],//渚涘簲鍟�
+				HSuplierList:[],
+				linterid: '',
+				HBillNo: '',
+				arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
+				HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
+				showHStockPlaceName: true, 
+				HMouldList:[],
+				
+				hform: {
+					HBarCode: '',
+					HInterID: '',
+					HBillType: 3802,
+					HWHName: getUserInfo().HWHName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
+					HSactterUserName: getUserInfo().User,
+					HSactterUserID: getUserInfo().User,
+					HCollectUserName: getUserInfo().User,
+					HCollectUserID: getUserInfo().User,
+					HDeptName: getUserInfo().HDept,
+					HDeptID: getUserInfo().HDeptID,
+					HSupName:'',
+					HSupID:'',
+					HSecManagerID:'',
+					HKeeperID:'',
+					//寰�鏉ョ被鍨�
+					TypeName:'',
+					TypeID:'',
+					Selection: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
+					SelectionID: '' ,// 寰�鏉ュ崟浣嶅搴旂殑ID
+					HSupTypeID:'',
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+					
+					HRedBlueFlag:'false',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID:uni.getStorageSync('OrganizationID'),
+					HBarCode_B:'',
+					HMouldName_B:'',
+					HMouldID_B:'',
+					HMouldCount_B:''
+				}
+			}
+		},
+		methods: {
+			
+			//鎵爜
+			toScanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					if (this.hform.HBarCode == '*') {
+						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+					} else {
+						this.hform.HBarCode = ret.resp_result
+					}
+
+					this.getCode(this.hform.HBarCode)
+				})
+			},
+			getNewData() {
+				CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						let res1 = res.data;
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					})
+			},
+			getCode(HBarCode) { 
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sOldBarCode = HBarCode; 
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo =""
+				var sSourceBillType ="-1" 
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						uni.request({
+							url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+							data: {
+								HInterID: this.hform.HInterID,
+								HBillType: this.hform.HBillType,
+								HBarCode: sBarCode
+							},
+							success: (res) => {
+								console.log('鍒犻櫎鏉$爜', res.data);
+								this.hform.HBarCode = ''; 
+								if (res.data.count == 1) {
+									this.hform.HQty = ''
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}else
+				{
+					var sBarCode = this.hform.HBarCode
+					uni.request({
+						url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
+						data:{
+							sBarCode: sBarCode,
+							HInterID: this.hform.HInterID,
+							HBillType: this.hform.HBillType,
+							HBillNo: this.hform.HBillNo,
+							HMaker: this.hform.HMaker,
+							HWhID: sHWHID,
+							HSPID: sHSPID,
+							HSCWhID:0,
+							HSCSPID: 0,
+							HRedBlueFlag: this.hform.HRedBlueFlag,
+							HSourceBillNo: sSourceBillNo,
+							HSourceBillType: sSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HStockOutOrgID: this.hform.HStockOutOrgID,
+						},
+						success:(res)=> {
+							console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+							this.hform.HBarCode=''
+							if(res.data.count==1){
+								this.tabs = 1
+								this.DisBillEntryList()
+							}
+							else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					})
+				}
+			}, 
+			//浠撳簱鐩戝惉浜嬩欢
+			HWHNameChange(e) {
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i]["HName"] == e) {
+						this.hform.HWHName = this.HWHNameList[i]["HName"]
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+
+						this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+					}
+				}
+			},
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i]["HWhName"] == e) {
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
+					}
+				}
+			},
+			HScatterUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSactterUserID = this.HEmpNameList[i].HItemID
+						this.hform.HSactterUserName = this.HEmpNameList[i].HName
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			HCollectUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HCollectUserID = this.HEmpNameList[i].HItemID
+						this.hform.HCollectUserName = this.HEmpNameList[i].HName
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
+			getHBaseList() {
+				CommonUtils.doRequest(
+					"/Web/GetWarehouseList_Json_New", {
+						Warehouse: "",
+						HOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HWHNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHWHName[i] = data[i]["HName"]
+							}
+						} else {
+							uni.showToast({
+								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+				CommonUtils.doRequest(
+					"/WEBSController/GetStockPlaceList_Json", {
+						StockPlace: '',
+						HWhID: this.hform.HWHID,
+						HStockOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						console.log(res1)
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HStockPlaceNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHStockPlaceName[i] = data[i]["HWhName"]
+							}
+						} else {
+							uni.showToast({
+								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			/* #endregion */
+			getHEmpList() {
+				CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+						Employee: '',
+						HGroupID: 0
+					},
+					(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: '浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					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].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getHSupList() {
+				CommonUtils.doRequest(
+					"/Gy_Customer/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			getSupplier()
+			{
+				CommonUtils.doRequest(
+					"/WEBSController/GetSupplier_Json", {
+						HBarCode: uni.getStorageSync(''),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			//閫夋嫨瀹㈡埛
+			HSupNameChange(e) {
+			    for (var i = 0; i < this.HSupNameList.length; i++) {
+			        if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
+			            this.hform.HSupID = this.HSupNameList[i].HItemID
+			            this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+			        }
+			    }
+			},
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			HSelectTypeChange(e)
+			{
+				this.hform.TypeName=e;
+				this.hform.Selection = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+				this.hform.SelectionID = '';
+				if(e=='閮ㄩ棬')
+				{
+					this.hform.HSupTypeID=3;
+					this.arrayHSelectType = this.arrayHDeptName;
+					this.HSelectTypeList = this.HDeptNameList;
+				}
+				else if(e === '渚涘簲鍟�') {
+					this.hform.HSupTypeID=1;
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				} else if(e === '瀹㈡埛') {
+					this.hform.HSupTypeID=2;
+					this.arrayHSelectType =this.arrayHSupName;
+					this.HSelectTypeList = this.HSupNameList;
+				} else {
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				}	
+			},
+			//鍣ㄥ叿淇℃伅
+			DisBillEntryList() {
+				CommonUtils.doRequest(
+					"/MouldController/GetMouldBillEntryTmpList_Json", {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						console.log('鍣ㄥ叿', res.data)
+						var data = res.data.data
+						this.HMouldList = data.HMouldList
+						if (data.count==0) {
+							this.hform.HMouldCount_B = ''
+							this.hform.HMouldID_B = ''
+							this.hform.HMouldName_B = ''
+							
+						} else {
+							this.hform.HMouldCount_B = data[0].HQty
+							this.hform.HMouldID_B = data[0].HMouldID
+							this.hform.HMouldName_B = data[0].HMouldName
+							this.hform.HBarCode_B=data[0].HBarCode
+						}
+					},
+			
+				)
+			},
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url: '/pages/MJGL/mujulingliaochukudan/table'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				if (!this.hform.HSactterUserName) {
+					this.hform.HSactterUserID = 0
+				}
+				else
+				{
+					this.HSecManagerID=this.hform.HSactterUserID
+				}
+				if (!this.hform.HCollectUserName) {
+					this.hform.HCollectUserID = 0
+				}
+				else
+				{
+					this.HKeeperID=this.hform.HCollectUserID 
+				}
+				if (!this.hform.HDeptName) {
+					this.hform.HDeptID = 0
+				}
+				if (!this.hform.HSupName) {
+					this.hform.HSupID = 0
+				}
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else {
+					if (this.hform.HMouldID_B == 0||this.hform.HMouldID_B ==null) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+			
+			
+						let sMainStr = JSON.stringify(this.hform);
+						console.log("涓昏〃锛�" + sMainStr)
+			
+						CommonUtils.doRequest(
+							'/MouldController/set_SaveMouldProdBackBill_Json', {
+								oMain: sMainStr
+							},
+							(res) => {
+								console.log(1, res);
+								uni.hideLoading()
+								if (res.data.count == 1) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/caigouruku/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+									uni.showModal({
+										content: res.data.Message,
+										showCancel: false,
+										complete() {
+											uni.hideLoading()
+										}
+									})
+								}
+							},
+							null,
+							"POST"
+						)
+					}
+				}
+			},
+			onLoad(e) {
+				console.log(e, this.userInfo)
+				
+				if (e.HInterID) {
+					// this.HInterID_Temp = e.HInterID
+					// this.btnType = 1
+					this.RoadBillMain(e.HInterID)
+				} else {
+					this.getNewData()
+				}
+			
+				this.getHBaseList()
+				this.getHSupList()
+				this.getHEmpList()
+				this.getHDeptList()
+				//this.getHEmpList()
+			}
+		}
+	}
+</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;
+    }
+
+    .tabs {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ddd;
+        margin: 20rpx 0;
+
+        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-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;
+            border-radius: 100%;
+            width: 52rpx;
+            height: 52rpx;
+            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;
+        }
+    }
+
+    .bottom-btn {
+        width: 100%;
+        box-sizing: border-box;
+        // 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;
+        }
+    }
+
+    .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;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujulingliaotuikudan/table.vue b/pages/MJGL/mujulingliaotuikudan/table.vue
new file mode 100644
index 0000000..86e54a8
--- /dev/null
+++ b/pages/MJGL/mujulingliaotuikudan/table.vue
@@ -0,0 +1,486 @@
+<template>
+	<view class="content">
+		<view class="form">
+			<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.HCreateBy" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">寮�濮嬫椂闂�:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
+						<view class="picker-overlay"></view>
+						<input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">缁撴潫鏃堕棿:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
+						<view class="picker-overlay"></view>
+						<input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</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.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+				<view class="detail" v-if="item.妯″叿浠g爜">
+					<text>妯″叿浠g爜锛�</text>{{item.妯″叿浠g爜}}
+				</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.寰�鏉ョ被鍨嬪悕绉皚}
+				</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 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.鍏抽棴绫诲瀷}}
+				</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 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.婧愬崟绫诲瀷}}
+					</view>
+					<view class="detail" v-if="item.hbilltype">
+						<text>hbilltype锛�</text>{{item.hbilltype}}
+					</view>
+					<view class="detail" v-if="item.鎽樿">
+						<text>鎽樿锛�</text>{{item.鎽樿}}
+					</view>
+				</view>
+				<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="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',
+				hform:{
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				operations:-1,
+				
+				page:1,
+				size:100
+	        }
+	    },
+		onLoad() {
+			this.getList()
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
+		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: {
+			getPage(page,list){
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex,eindex)
+				return newList
+			},
+			getList(){
+				console.log(this.sWhere)
+				uni.showLoading({
+					title:'鍔犺浇涓�...'
+				})
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldProdBackBill/list_byPage',
+					data:{ 
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page:1,
+						size:100
+					},
+				    success: (res) => {
+						console.log(1,uni.getStorageSync('Organization'));
+				        console.log(1,res);
+						if(res.data.code ==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'
+						})
+					},
+				});
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			BenginHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.BenginHCreateDate = e.detail.value
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			EndHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.EndHCreateDate = e.detail.value
+			},
+			search(){
+				this.sWhere = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				console.log(this.hform)
+				if (this.hform.HBillNo) {
+				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				}
+				if (this.hform.HCreateBy) {
+				    this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+				}
+				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 + "'";
+				}
+				
+				this.getList()
+			},
+			creat(){
+				uni.navigateTo({
+					url:'/pages/MJGL/mujulingliaochukudan/form'
+				})
+			},
+			clear(){
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				this.sWhere = ''
+				this.showDetail = -1,
+				this.operations = -1,
+				this.hform = {
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				}
+				this.getList()
+			},
+			//TODO   瀛愯〃鍒楄〃
+			// toSon(item){
+			// 	uni.navigateTo({
+			// 		url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid 
+			// 		+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О 
+			// 		+ '&璁惧浠g爜=' + item.璁惧浠g爜,
+			// 	})
+			// },
+			
+			//缂栬緫
+			edit(item){
+				console.log(item)
+				uni.navigateTo({
+					url:'/pages/baoyangjilu/form?hmainid=' + item.hmainid 
+				})
+			},
+			//鍒犻櫎
+			del(item){
+				console.log(item)
+				uni.showModal({
+				    title: '鎻愮ず',
+				    content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+				    success: (res) => {
+				        if (res.confirm) {
+				            console.log('鐢ㄦ埛鐐瑰嚮纭畾',);
+							uni.request({
+							    url: this.serverUrl + '/Sc_MouldProdOutBill/DeltetMouldProdOutBill',
+								data:{ 
+									HInterID: item.hmainid,
+									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;
+	}
+    .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: 130rpx;
+				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>
diff --git a/pages/MJGL/qijudiaobodan/form.vue b/pages/MJGL/qijudiaobodan/form.vue
new file mode 100644
index 0000000..f651461
--- /dev/null
+++ b/pages/MJGL/qijudiaobodan/form.vue
@@ -0,0 +1,1242 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)" @blur="getCode(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="right">
+			        <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HSCWHName"
+			            @input="HSCWHNameChange" @confirm="HWHNameOutScan"></uni-combox>
+			    </view>
+			</view>
+			<view class="form-item">
+			    <view class="title">璋冨嚭浠撲綅:</view>
+			    <view class="right" v-show="HSCIsStockMgr">
+			        <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+			            v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
+			            @confirm="HStockPlaceOutNameScan"></uni-combox>
+			    </view>
+			    <view class="righton" v-show="!HSCIsStockMgr">
+			        <input v-model="hform.HOutStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+			    </view>
+			</view>
+			
+			
+			<view class="form-item">
+			    <view class="title">璋冨叆浠撳簱:</view>
+			    <view class="right">
+			        <uni-combox :candidates="arrayHWHInName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+			            @input="HWHInNameChange" @confirm="HWHNameInScan"></uni-combox>
+			    </view>
+			</view>
+			<view class="form-item">
+			    <view class="title">璋冨叆浠撲綅:</view>
+			    <view class="right" v-show="HIsStockMgr">
+			        <uni-combox :candidates="arrayHStockPlaceInNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+			            v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
+			            @confirm="HStockPlaceNameInScan"></uni-combox>
+			    </view>
+			    <view class="righton" v-show="!HIsStockMgr">
+			        <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+			    </view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍙戞枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戞枡浜�" v-model="hform.HSactterUser"
+						@input="HScatterUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">棰嗘枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗘枡浜�" v-model="hform.HCollectUser"
+						@input="HCollectUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+			    <view class="title">閮ㄩ棬:</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">璋冩嫧绫诲瀷:</view>
+			    <view class="righton">
+			        <input name="HStockStyle" disabled v-model="hform.HStockStyle" placeholder="璇烽�夋嫨璋冩嫧绫诲瀷" />
+			    </view>
+			</view>
+			<view class="form-item">
+				<view class="title">璋冨嚭缁勭粐:</view>
+				<view class="right">
+					<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+				</view>
+			</view>
+			<view class="form-item">
+                    <view class="title">璋冨叆缁勭粐:</view>
+                    <view class="right" v-show="!HIsStockInner">
+                        <uni-combox :candidates="arrayHOrgName" placeholder="璇烽�夋嫨璋冨叆缁勭粐" v-model="hform.HStockInOrgName"
+                            @input="HStockInOrgNameChange"></uni-combox>
+                    </view>
+                    <view class="righton" v-show="HIsStockInner">
+                        <input name="HStockInOrgName" disabled v-model="hform.HStockInOrgName" />
+                    </view>
+            </view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+			</view>
+			<view v-if="tabs == 0">
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<view class="picker-overlay"></view>
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
+					</view>
+				</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">鍗曟嵁ID:</view>
+					<view class="righton">
+						<input name="HInterID" disabled v-model="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view v-if="tabs==1">
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鏉$爜:</view>
+					<view class="righton">
+						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍚嶇О:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldID_B" />
+					</view>
+				</view>
+			</view>
+			<view class="bottom-btn">
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+				<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 " class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			</view>
+		</view>	
+	</view>
+</template>
+
+<script>
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import { CommonUtils } from '@/utils/common';
+	
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				btnType:1,//1鏂板锛�3淇敼
+				linterid:'',
+				arrayHEmpName: [],
+				HEmpNameList: [],
+				
+				
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHWHInName:[],//璋冨叆浠撳簱浠撲綅
+				HWHInNameList: [],
+                arrayHStockPlaceInName: [], //璋冨叆浠撲綅
+				arrayHStockPlaceName:[],
+                HStockPlaceInNameList: [],
+				HStockPlaceNameList:[],
+				
+				arrayHDeptName: [], //閮ㄩ棬
+				HDeptNameList: [],
+				arrayHSupName: [], //瀹㈡埛
+				HSupNameList: [],
+				arrayHSupplierName:[],//渚涘簲鍟�
+				HSuplierList:[],
+				linterid: '',
+				HBillNo: '',
+				HStockStyleArray: ["缁勭粐鍐呰皟鎷�", "璺ㄧ粍缁囪皟鎷�"],
+				showHStockPlaceName: true, 
+				arrayHOrgName: [], // 缁勭粐
+                arrayHOrgValue: [], // 缁勭粐瀵瑰簲ID
+				
+				HSCIsStockMgr: false,
+				HIsStockMgr: false,
+				
+				HMouldList:[],
+				isEdit: false,
+				hform: {
+					HBarCode: '',
+					HInterID: '',
+					HBillType: 3814,
+					//璋冨叆浠撳簱
+					HWHName: getUserInfo().HWHName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
+					//璋冨嚭浠撳簱浠撲綅
+					HSCWHName: getUserInfo().HWHName,
+					HSCWHID: getUserInfo().HWhID,
+					HOutStockPlaceName: getUserInfo().HSPName,
+					HOutStockPlaceID: getUserInfo().HSPID,
+					//
+					HSactterUserName: getUserInfo().User,
+					HSactterUserID: getUserInfo().User,
+					HCollectUserName: getUserInfo().User,
+					HCollectUserID: getUserInfo().User,
+					HDeptName: getUserInfo().HDept,
+					HDeptID: getUserInfo().HDeptID,
+					HSupName:'',
+					HSupID:'',
+					HSecManagerID:'',
+					HKeeperID:'',
+					HStockStyle: '',
+					//HSupTypeID:'',
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+					//zuzhi
+					HStockInOrgName: uni.getStorageSync('Organization'),
+					HStockInOrgID: uni.getStorageSync('OrganizationID'),
+					//
+					HRedBlueFlag:'false',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID:uni.getStorageSync('OrganizationID'),
+					HBarCode_B:'',
+					HMouldName_B:'',
+					HMouldID_B:'',
+				}
+			}
+		},
+		computed: {
+		  HIsStockInner: {
+			get: function() {
+			  if (this.hform.HStockStyle == '缁勭粐鍐呰皟鎷�') {
+				return true
+			  }
+			  return false
+			}
+		  },
+		  arrayHStockPlaceNameComputed: {
+			get() {
+			  if (!this.HStockPlaceNameList || !Array.isArray(this.HStockPlaceNameList)) {
+				return []
+			  }
+			  // 鍔ㄦ�佽绠楀搴旇皟鍑轰粨搴撶殑浠撲綅
+			  return this.HStockPlaceNameList
+				.filter(e => e['鎵�灞炰粨搴�'] == this.hform.HSCWHName)
+				.map(e => e['浠撲綅鍚嶇О'])
+			}
+		  },
+		  arrayHStockPlaceInNameComputed: {
+			get() {
+			  if (!this.HStockPlaceInNameList || !Array.isArray(this.HStockPlaceInNameList)) {
+				return []
+			  }
+			  // 鍔ㄦ�佽绠楀搴旇皟鍏ヤ粨搴撶殑浠撲綅
+			  return this.HStockPlaceInNameList
+				.filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+				.map(e => e['浠撲綅鍚嶇О'])
+			}
+		  }
+		},
+		methods: {
+			
+			//鎵爜
+			toScanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					if (this.hform.HBarCode == '*') {
+						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+					} else {
+						this.hform.HBarCode = ret.resp_result
+					}
+
+					this.getCode(this.hform.HBarCode)
+				})
+			},
+			getNewData() {
+				CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						let res1 = res.data;
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					})
+			},
+			getCode(HBarCode) { 
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sHWHID = this.hform.HWHID
+                var sHSPID = this.hform.HStockPlaceID
+                var sHSCWHID = this.hform.HSCWHID
+                var sHOUTSPID = this.hform.HOutStockPlaceID
+				var sOldBarCode = HBarCode; 
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo =""
+				var sSourceBillType ="-1" 
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						uni.request({
+							url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+							data: {
+								HInterID: this.hform.HInterID,
+								HBillType: this.hform.HBillType,
+								HBarCode: sBarCode
+							},
+							success: (res) => {
+								console.log('鍒犻櫎鏉$爜', res.data);
+								this.hform.HBarCode = ''; 
+								if (res.data.count == 1) {
+									this.hform.HQty = ''
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}else
+				{
+					var sBarCode = this.hform.HBarCode
+					uni.request({
+						url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
+						data:{
+							sBarCode: sBarCode,
+							HInterID: this.hform.HInterID,
+							HBillType: this.hform.HBillType,
+							HBillNo: this.hform.HBillNo,
+							HMaker: this.hform.HMaker,
+							HWhID: sHWHID,
+							HSPID: sHSPID,
+							HSCWhID:sHSCWHID,
+							HSCSPID: sHOUTSPID,
+							HRedBlueFlag: this.hform.HRedBlueFlag,
+							HSourceBillNo: sSourceBillNo,
+							HSourceBillType: sSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HStockOutOrgID: this.hform.HStockOutOrgID,
+						},
+						success:(res)=> {
+							console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+							this.hform.HBarCode=''
+							if(res.data.count==1){
+								this.tabs = 1
+								this.DisBillEntryList()
+							}
+							else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					})
+				}
+			}, 
+			//浠撳簱鐩戝惉浜嬩欢
+			HWHNameChange(e) {
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i]["HName"] == e) {
+						this.hform.HWHName = this.HWHNameList[i]["HName"]
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+						this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+					}
+				}
+			},
+			// 璋冨叆浠撳簱淇敼
+			HStockPlaceInNameChange(e) {
+			    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].HMainID
+			        }
+			    }
+			},
+			// 璋冨叆浠撲綅淇敼
+			HWHInNameChange(e) {
+			    console.log('e: ', e);
+			    for (var i = 0; i < this.HWHInNameList.length; i++) {
+			        if (this.HWHInNameList[i].浠撳簱鍚嶇О == e) {
+			            this.hform.HWHName = this.HWHInNameList[i].浠撳簱鍚嶇О
+			            this.hform.HWHID = this.HWHInNameList[i].HItemID
+			
+			            if (this.HWHInNameList[i]['鍚敤浠撲綅'] == 'Y') {
+			                this.HIsStockMgr = true
+			            } else {
+			                // this.hform.HStockPlaceName = ''
+			                this.HIsStockMgr = false
+			            }
+			        }
+			    }
+			},
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i]["HWhName"] == e) {
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
+					}
+				}
+			},
+			HOutStockPlaceNameChange(e) {
+			    for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+			        if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+			            this.hform.HOutStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+			            this.hform.HOutStockPlaceID = this.HStockPlaceNameList[i].HMainID
+			        }
+			    }
+			},
+			HStockInOrgNameChange(e) {
+			    let index = this.arrayHOrgName.findIndex(elem => elem == e)
+			    if (index != -1) {
+			        this.hform.HStockInOrgID = this.arrayHOrgValue[index]
+			    }
+				//alert 锛堝湪鐩存帴璋冩嫧鍗曚腑锛屾澶勫悗杩樻洿鏀逛簡璋冨叆浠撳簱鐨勯�昏緫锛屽湪鏈鏆傛椂娌″姞锛�
+			},
+			HScatterUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSactterUserID = this.HEmpNameList[i].HItemID
+						this.hform.HSactterUserName = this.HEmpNameList[i].HName
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			HCollectUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HCollectUserID = this.HEmpNameList[i].HItemID
+						this.hform.HCollectUserName = this.HEmpNameList[i].HName
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
+		//鍩虹浠撳簱璧勬枡
+		getHBaseList({
+		  sWhere = ''
+		} = {}) {
+		  uni.request({
+		    url: this.serverUrl + '/Gy_Warehouse/list',
+		    data: {
+		      sWhere: sWhere,
+		      user: uni.getStorageSync('HUserName'),
+		      Organization: uni.getStorageSync('Organization')
+		    },
+		    success: (res) => {
+		      if (res.data.count == 1) {
+		        this.HWHNameList = res.data.data
+		        this.HWHInNameList = res.data.data
+		        this.arrayHWHName = [] // 纭繚鏁扮粍鍒濆鍖�
+		        this.arrayHWHInName = [] // 纭繚鏁扮粍鍒濆鍖�
+		        for (var i = 0; i < res.data.data.length; i++) {
+		          this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+		          this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
+		        }
+		      } else {
+		        uni.showToast({
+		          title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+		          icon: 'none'
+		        })
+		      }
+		    },
+		    fail: (res) => {
+		      console.log(res);
+		      uni.showToast({
+		        title: '鎺ュ彛璇锋眰澶辫触',
+		        icon: 'none'
+		      })
+		    },
+		  });
+		
+		  uni.request({
+		    url: this.serverUrl + '/Gy_StockPlace/list',
+		    data: {
+		      sWhere: "",
+		      user: uni.getStorageSync('HUserName'),
+		      Organization: uni.getStorageSync('Organization')
+		    },
+		    success: (res) => {
+		      if (res.data.count == 1) {
+		        this.HStockPlaceNameList = res.data.data
+		        this.arrayHStockPlaceName = [] // 纭繚鏁扮粍鍒濆鍖�
+		        for (var i = 0; i < res.data.data.length; i++) {
+		          this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+		        }
+		      } else {
+		        uni.showToast({
+		          title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+		          icon: 'none'
+		        })
+		      }
+		    },
+		    fail: (res) => {
+		      console.log(res);
+		      uni.showToast({
+		        title: '鎺ュ彛璇锋眰澶辫触',
+		        icon: 'none'
+		      })
+		    },
+		  });
+		},
+			/* #endregion */
+			getHEmpList() {
+				CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+						Employee: '',
+						HGroupID: 0
+					},
+					(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: '浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					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].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getOrganization() {
+			    return new Promise((resolve, reject) => {
+			        CommonUtils.doRequest2({
+			            url: '/Web/GetOrganizations',
+			            resFunction: (res) => {
+			                console.log("Organizations: ", res.data)
+			                let {
+			                    data,
+			                    count,
+			                    Message
+			                } = res.data
+			                if (count == 1) {
+			                    this.arrayHOrgName = []
+			                    this.arrayHOrgValue = []
+			                    Array.from(data).forEach(e => {
+			                        this.arrayHOrgName.push(e.Name)
+			                        this.arrayHOrgValue.push(e.ID)
+			                    })
+			                    resolve()
+			                } else {
+			                    uni.showToast({
+			                        icon: 'none',
+			                        title: Message
+			                    })
+			                    reject()
+			                }
+			
+			            }
+			        })
+			    })
+			},
+			getHSupList() {
+				CommonUtils.doRequest(
+					"/Gy_Customer/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			getSupplier()
+			{
+				CommonUtils.doRequest(
+					"/WEBSController/GetSupplier_Json", {
+						HBarCode: uni.getStorageSync(''),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			//#region 璋冨叆璋冨嚭浠撳簱浠撲綅method
+			// 璋冨嚭浠撳簱淇敼
+			HSCWHNameChange(e) {
+			    for (var i = 0; i < this.HWHNameList.length; i++) {
+			        if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+			            this.hform.HSCWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+			            this.hform.HSCWHID = this.HWHNameList[i].HItemID
+			
+			            if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+			                this.HSCIsStockMgr = true
+			            } else {
+			                this.hform.HOutStockPlaceName = ''
+			                this.hform.HOutStockPlaceID = ''
+			                this.HSCIsStockMgr = false
+			            }
+			        }
+			    }
+			},
+			// 璋冨叆浠撳簱璧勬枡
+			getHWarehouseInList(Organizaiton) {
+			  Organizaiton = Organizaiton || uni.getStorageSync("Organization")
+			  CommonUtils.doRequest2({
+			    url: '/Gy_Warehouse/list',
+			    data: {
+			      sWhere: "",
+			      user: uni.getStorageSync('HUserName'),
+			      Organization: Organizaiton
+			    },
+			    resFunction: (res) => {
+			      console.log('璋冨叆浠撳簱 res: ', res.data.data);
+			      if (res.data.count == 1) {
+			        this.HWHInNameList = res.data.data
+			        this.arrayHWHInName = [] // 纭繚鏁扮粍鍒濆鍖�
+			        for (var i = 0; i < res.data.data.length; i++) {
+			          this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
+			        }
+			      } else {
+			        uni.showToast({
+			          title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+			          icon: 'none'
+			        })
+			      }
+			    }
+			  });
+			
+			  uni.request({
+			    url: this.serverUrl + '/Gy_StockPlace/list',
+			    data: {
+			      sWhere: "",
+			      user: uni.getStorageSync('HUserName'),
+			      Organization: Organizaiton
+			    },
+			    success: (res) => {
+			      if (res.data.count == 1) {
+			        this.HStockPlaceInNameList = res.data.data
+			        this.arrayHStockPlaceInName = [] // 纭繚鏁扮粍鍒濆鍖�
+			        for (var i = 0; i < res.data.data.length; i++) {
+			          this.arrayHStockPlaceInName[i] = res.data.data[i].浠撲綅鍚嶇О
+			        }
+			      } else {
+			        uni.showToast({
+			          title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+			          icon: 'none'
+			        })
+			      }
+			    },
+			    fail: (res) => {
+			      console.log(res);
+			      uni.showToast({
+			        title: '鎺ュ彛璇锋眰澶辫触',
+			        icon: 'none'
+			      })
+			    },
+			  });
+			},
+			//#endregion
+
+			//鍣ㄥ叿淇℃伅
+			DisBillEntryList() {
+				CommonUtils.doRequest(
+					"/MouldController/GetMouldBillEntryTmpList_Json", {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						console.log('鍣ㄥ叿', res.data)
+						var data = res.data.data
+						this.HMouldList = data.HMouldList
+						if (data.count==0) {
+
+							this.hform.HMouldID_B = ''
+							this.hform.HMouldName_B = ''
+							
+						} else {
+
+							this.hform.HMouldID_B = data[0].HMouldID
+							this.hform.HMouldName_B = data[0].HMouldName
+							this.hform.HBarCode_B=data[0].HBarCode
+						}
+					},
+			
+				)
+			},
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url: '/pages/MJGL/mujulingliaochukudan/table'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			ifEdit(){
+				this.isEdit = true
+				this.hform.eventType = 'Modify'
+			},
+			//缂栬緫鍥炴樉
+			getEditData(linterid,HBillNo){				
+				//涓昏〃
+				var sWhere = " and hmainid='" + linterid + "'";
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage', 
+					data: { sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page:1,
+						size:100 },
+				    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.HCollectUserName= data.鍙戞枡浜�
+							this.hform.HCollectUserID= data.hkeeperid
+							this.hform.HKeeperID= data.hkeeperid
+							this.hform.HSactterUserName= data.棰嗘枡浜�
+							this.hform.HSactterUserID= data.hsecmanagerid
+							this.hform.HSecManagerID=data.hsecmanagerid
+							this.hform.HMangerName= data.璐熻矗浜�
+							// this.hform.HRemark= data.琛ㄥご澶囨敞						
+							this.hform.HDate = data.鏃ユ湡.substr(0,10)
+							
+							this.hform.HWHID=data.HWHID,
+							this.hform.HWHName=data.浠撳簱,
+							this.hform.HStockPlaceID=data.HSPID,
+							this.hform.HStockPlaceName=data.浠撲綅,
+							
+										
+														
+							this.hform.HMouldID_B=data.hmaterid,
+							// this.hform.HMouldID_B=data.妯″叿浠g爜,
+							this.hform.HMouldName_B=data.妯″叿鍚嶇О,
+							// this.hform.HMouldModel=data.妯″叿瑙勬牸,
+							this.hform.HRedBlueFlag=data.绾㈣摑鍗曟爣璁�=='钃濆瓧'?false:true,
+							
+							
+							this.hform.HStockOrgID=data.HStockOrgID,
+							this.hform.HStockOrgName=data.搴撳瓨缁勭粐,
+							// 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'
+						})
+					},
+				});				
+			},
+			submit() {
+				if(this.hform.HStockInOrgName==uni.getStorageSync("Organization"))
+				{
+					this.hform.HStockStyle='缁勭粐鍐呰皟鎷�'
+				}
+				else
+					this.hform.HStockStyle='璺ㄧ粍缁囪皟鎷�'
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				if (!this.hform.HSactterUserName) {
+					this.hform.HSactterUserID = 0
+				}
+				else
+				{
+					this.HSecManagerID=this.hform.HSactterUserID
+				}
+				if (!this.hform.HCollectUserName) {
+					this.hform.HCollectUserID = 0
+				}
+				else
+				{
+					this.HKeeperID=this.hform.HCollectUserID 
+				}
+				if (!this.hform.HDeptName) {
+					this.hform.HDeptID = 0
+				}
+				if (!this.hform.HSupName) {
+					this.hform.HSupID = 0
+				}
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else {
+					if (this.hform.HMouldID_B == 0||this.hform.HMouldID_B ==null) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+			
+			
+						let sMainStr = JSON.stringify(this.hform);
+						console.log("涓昏〃锛�" + sMainStr)
+			
+						CommonUtils.doRequest(
+							'/MouldController/set_SaveMouldProdMoveBill_Json', {
+								oMain: sMainStr
+							},
+							(res) => {
+								console.log(1, res);
+								uni.hideLoading()
+								if (res.data.count == 1) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/caigouruku/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+									uni.showModal({
+										content: res.data.Message,
+										showCancel: false,
+										complete() {
+											uni.hideLoading()
+										}
+									})
+								}
+							},
+							null,
+							"POST"
+						)
+					}
+				}
+			},
+			onLoad(e) {
+				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.getHBaseList()
+				this.getHSupList()
+				this.getHEmpList()
+				this.getHDeptList()
+				this.getHWarehouseInList()
+				this.getOrganization()
+			}
+		}
+	}
+</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;
+    }
+
+    .tabs {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ddd;
+        margin: 20rpx 0;
+
+        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-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;
+            border-radius: 100%;
+            width: 52rpx;
+            height: 52rpx;
+            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;
+        }
+    }
+
+    .bottom-btn {
+        width: 100%;
+        box-sizing: border-box;
+        // 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;
+        }
+    }
+
+    .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;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/qijudiaobodan/table.vue b/pages/MJGL/qijudiaobodan/table.vue
new file mode 100644
index 0000000..f38a578
--- /dev/null
+++ b/pages/MJGL/qijudiaobodan/table.vue
@@ -0,0 +1,620 @@
+<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">
+						<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">
+						<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">
+						<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>
+			<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">
+		<!-- todo  HProcExchBillNo-->
+			<uni-card :title="item.HProcExchBillNo" :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>妯″叿浠g爜锛�</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['璋冨叆缁勭粐']}}
+					</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 -->
+				
+				<!-- #ifdef MP-WEIXIN -->
+				<uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+					
+					<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['妯″叿鍚嶇О']}}
+						</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>
+					<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['鍒跺崟浜�']}}
+						</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: '',
+					HEndDate: '',
+					HBillNo: '',
+					HProcExchBillNo: '',					
+				},
+				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: {
+			getPage(page, list) {
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex, eindex)
+				return newList
+			},
+			getList() {
+				uni.showLoading({
+					title: '鍔犺浇涓�...'
+				})
+				if(this.sWhere=='')
+				this.sWhere='and 1=1'
+				uni.request({
+					url: this.serverUrl + '/Sc_MouldProdMoveBill/page',
+					data: {
+						sWhere: this.sWhere,
+						//sWhere: 'and 1=1',
+						user: uni.getStorageSync('HUserName'),
+						//Organization:uni.getStorageSync('Organization'),
+						page:1,
+						size:100
+					},
+					success: (res) => {
+						console.log(1, res.data);
+						//todo 姝ゅ鍙兘鏈夐棶棰橈紙res.data.code锛�
+						if (res.data.code == 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.sWhere = ''
+				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.HProcExchBillNo) {
+					this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
+				}
+
+				this.getList()
+			},
+			//鏂板
+			creat() {
+				uni.navigateTo({
+					url: '/pages/MJGL/qijudiaobodan/form'
+				})
+			},
+			//閲嶇疆
+			clear() {
+				this.listData = []
+				this.page = 1
+				this.showList = []
+
+				this.showmore = false
+				this.sWhere = ''
+				this.showDetail = -1,
+					this.operations = -1,
+					this.hform = {
+						HStatus: '鍏ㄩ儴',
+						HBeginDate: '',
+						HEndDate: '',
+						HBillNo: '',
+						HProcExchBillNo: '',						
+					}
+				this.getList()
+			},
+
+			//缂栬緫
+			edit(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: '/pages/MJGL/shangmudan/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_MouldProdMoveBill/DeltetMouldProdMoveBill',
+								data: {
+									//HInterID: item.hmainid + "_" + item.hsubid,
+									HInterID: item.hmainid ,
+									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/MJGL/shangmudan/form.vue b/pages/MJGL/shangmudan/form.vue
index 8a02218..b95e93f 100644
--- a/pages/MJGL/shangmudan/form.vue
+++ b/pages/MJGL/shangmudan/form.vue
@@ -2,11 +2,13 @@
 	<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="璇锋壂鎻忔潯鐮�"/>
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)" @blur="getCode(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>
+				<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>
diff --git a/pages/index/_index.vue b/pages/index/_index.vue
index 3d4f26f..530edaf 100644
--- a/pages/index/_index.vue
+++ b/pages/index/_index.vue
@@ -125,6 +125,12 @@
 						text: '鏉$爜鎷嗙爜',
 						url: '/pages/tiaomachaima/tiaomachaima',
 						id: 20,
+					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鎵嬫満瀵垮懡',
+						url: '/pages/shoujishouming/plan',
+						id: 20,
 					}
 				]
 			}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a33bcf1..fc8fbee 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -245,6 +245,7 @@
                         id: 26,
                         hidden: false,
                     },
+					
                     
 
                 ],
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 3ac4a53..3c98079 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -85,6 +85,9 @@
                     "娓╁窞娴疯瘹鍏夊": 'http://122.228.39.234:7177/API/',
                     "瀹佹尝鎯犲悍宸ヤ笟": 'http://172.16.72.30:6699/API/',
                     "浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
+					 //"llj": 'http://localhost:8082/LuBaoAPI/',
+			
+
                 },
                 serverUrlName: '娴欐睙鏅轰簯杩堟��',
 
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index 5fbbe68..65664f4 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -142,6 +142,13 @@
 						id: 15,
 						hidden: true,
 					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鎵嬫満瀵垮懡',
+						url: '/pages/shoujishouming/table',
+						id: 16,
+						hidden: false,
+					},
 				]
 				// itemData: [{
 				// 	//  img:'../../static/icon0.png',
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 917ed45..b472b1f 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -250,6 +250,24 @@
                     url: `/pages/zutuosaoma/table`,
                     id: 34,
                     hidden: false,
+                },{
+                    img: '../../static/icon/icon8.png',
+                    text: '妯″叿棰嗘枡鍑哄簱鍗�',
+                    url: `/pages/MJGL/mujulingliaochukudan/table`,
+                    id: 35,
+                    hidden: false,
+                },{
+                    img: '../../static/icon/icon8.png',
+                    text: '妯″叿棰嗘枡閫�搴撳崟',
+                    url: `/pages/MJGL/mujulingliaotuikudan/table`,
+                    id: 36,
+                    hidden: false,
+                },{
+                    img: '../../static/icon/icon8.png',
+                    text: '鍣ㄥ叿璋冩嫧鍗�',
+                    url: `/pages/MJGL/qijudiaobodan/table`,
+                    id: 37,
+                    hidden: false,
                 }
                 // {
                 // 	img: '../../static/icon/icon8.png',
diff --git a/pages/shoujishouming/form.vue b/pages/shoujishouming/form.vue
new file mode 100644
index 0000000..3cebf53
--- /dev/null
+++ b/pages/shoujishouming/form.vue
@@ -0,0 +1,733 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)" @blur="getCode(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="arrayHDisplayName" placeholder="璇烽�夋嫨璋冩暣浜�" v-model="hform.HDisplayName" @input="HDisplayNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>璋冩暣鍘熷洜:</view>
+				<view class="right">
+					<input v-model="hform.HReason" placeholder="璋冩暣鍘熷洜" />
+				</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="righton">
+					<input name="HMaterCode" v-model="hform.HMaterCode" disabled placeholder="璇疯緭鍏ュ櫒鍏风紪鐮�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍣ㄥ叿鍚嶇О:</view>
+				<view class="righton">
+					<input name="HMaterName" v-model="hform.HMaterName" disabled placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍣ㄥ叿鍨嬪彿:</view>
+				<view class="righton">
+					<input name="HMaterSpec" v-model="hform.HMaterSpec" disabled placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">妯℃不鍏疯鏍�::</view>
+				<view class="righton">
+					<input name="HModel" v-model="hform.HModel" disabled placeholder="璇疯緭鍏ヨ鏍�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">璁捐瀵垮懡:</view>
+				<view class="right">
+					<textarea name="HDesignLife"  v-model="hform.HDesignLife" auto-height placeholder="璇疯緭鍏ヨ璁″鍛�"></textarea>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍓╀綑瀵垮懡:</view>
+				<view class="right">
+					<textarea name="HLeaveLife"  v-model="hform.HLeaveLife" auto-height placeholder="璇疯緭鍏ュ墿浣欏鍛�"></textarea>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鏂板墿浣欏鍛�:</view>
+				<view class="right">
+					<textarea name="HNewLeaveLife"  v-model="hform.HNewLeaveLife" auto-height placeholder="璇疯緭鍏ュ墿浣欏鍛�"></textarea>
+				</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://localhost:8082/LuBaoAPI/',
+				linterid:'',
+				HBillNo:'',
+				btnType:1,//1鏂板锛�3淇敼
+				showmore: false,
+				
+				arrayHDeptName:[],//閮ㄩ棬
+				HDeptNameList:[],
+				arrayHEmpName:[],//鍙戠幇浜�/璐熻矗浜�
+				arrayHDisplayName:[],//璋冩暣浜�
+				HEmpNameList:[],
+				HSourceNameList:[],
+				
+				
+				isEdit: false,
+				hform:{
+					HInterID:'',
+					HBillNo:'',
+					HDate:getDateTime.dateTimeStr('y-m-d'),
+					HBarCode:'',
+					HEmpName:'',
+					HEmpID:'',
+					HMangerName:'',
+					HMangerID:'',
+					HDisplayName:'',
+					HDisplayID:'',
+					HSourceName:'',
+					HSourceID:'',
+
+					HOrgID:uni.getStorageSync('OrganizationID'),
+					
+					HMaker:uni.getStorageSync('HUserName'),
+					HMakeDate:getDateTime.dateTimeStr('y-m-d'),
+					HUpDater:'',
+					HUpDateDate:'',		
+					HChecker:'',
+					HCheckDate:'',
+					HCloseMan:'',
+					HCloseDate:'',		
+					HDeleteMan:'',
+					HDeleteDate:'',
+					
+					eventType:'Add',
+					
+					//new
+					HMaterID:'',
+					HMaterCode:'',
+					HMaterName:'',
+					HMaterSpec:'',
+					HDesignLife:'',
+					HLeaveLife:'',
+					HDeptID:'',
+					HDeptName:'',
+					HGroupID:'',
+					HNewLeaveLife:'',
+					
+					HInnerBillNo:''
+				}
+            }
+        },
+		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()
+		},
+        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
+			},	
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			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
+					}
+				}
+			},
+			//鎿嶄綔鍛樸�佽礋璐d汉
+			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.arrayHDisplayName[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
+					}
+				}
+			},
+			HDisplayNameChange(e){
+				for(var i=0;i<this.HEmpNameList.length;i++){
+					if(this.HEmpNameList[i].HName == e){
+						this.hform.HDisplayID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			ifEdit(){
+				this.isEdit = true
+				this.hform.eventType = 'Modify'
+			},
+			//缂栬緫鍥炴樉
+			getEditData(linterid,HBillNo){				
+				//涓昏〃
+				console.log(linterid)
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldLifeChangeBill/Sc_GetMouldLifeChangeBillListCheckDetai', 
+					data: { HID: linterid },
+				    success: (res) => {
+				        console.log(1,res.data.data.h_v_Sc_MouldLifeChangeBillList_Edit[0]);
+						var data = res.data.data.h_v_Sc_MouldLifeChangeBillList_Edit[0];
+						console.log(1,data);
+						if(res.data.code == 1){				
+							this.btnType=3
+							this.hform.HInterID= data.hmainid
+							this.hform.HBillNo= data.鍗曟嵁鍙�
+							this.hform.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
+							this.hform.HReason= data.璋冩暣鍘熷洜
+							this.hform.HDeptID= data.HDeptID
+							this.hform.HDeptName= data.閮ㄩ棬
+							this.hform.HEmpID= data.HEmpID
+							this.hform.HEmpName= data.璋冩暣浜�
+							
+							this.hform.HDisplayName= data.璋冩暣浜�
+							this.hform.HMangerID= data.HMangerID
+							this.hform.HMangerName= data.璐熻矗浜�
+							this.hform.HRemark= data.澶囨敞						
+							this.hform.HDate = data.鏃ユ湡.substr(0,10)				
+													
+							this.hform.HMaterID=data.HMaterID,
+							this.hform.HMaterCode=data.妯″叿浠g爜,
+							this.hform.HMouldName=data.妯″叿,
+							this.hform.HMaterSpec=data.瑙勬牸鍨嬪彿
+							this.hform.HDesignLife=data.璁捐瀵垮懡
+							this.hform.HLeaveLife=data.鍘熷墿浣欏鍛�
+							
+							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: '3846' },
+				    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.btnType=1
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			getCode(HBarCode) {
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				//璋冩暣浜�
+				var sDisplayName = this.hform.HDisplayName
+				var sDisplayID = this.hform.HDisplayID
+				
+				//
+				var sOldBarCode = HBarCode; 
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo =""
+				var sSourceBillType ="-1" 
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						uni.request({
+							url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+							data: {
+								HInterID: this.hform.HInterID,
+								HBillType: this.hform.HBillType,
+								HBarCode: sBarCode
+							},
+							success: (res) => {
+								console.log('鍒犻櫎鏉$爜', res.data);
+								this.hform.HBarCode = ''; 
+								if (res.data.count == 1) {
+									this.hform.HQty = ''
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}else
+				{
+					
+					var sBarCode = this.hform.HBarCode
+					var sWhere = " and 鏉$爜缂栧彿='" + sBarCode + "'";
+					uni.request({
+						url: this.serverUrl + '/Gy_Mould/list1',
+						data:{
+							sWhere:sWhere,
+							ModRightNameSelect:"Gy_MouldTypeList",
+							user: uni.getStorageSync('HUserName')
+						},
+						success:(res)=> {
+							console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+							this.hform.HBarCode=''
+							if(res.data.count==1){
+								this.tabs = 1
+								var LoadData = res.data.data;
+								this.hform.HMaterID=LoadData[0].hmainid
+								this.hform.HMaterCode=LoadData[0].鏉$爜缂栧彿
+								this.hform.HMaterName=LoadData[0].妯″叿鍚嶇О
+								this.hform.HMaterSpec=LoadData[0].妯″叿鍨嬪彿
+								this.hform.HModel=LoadData[0].褰撳墠妯″叿瑙勬牸
+								this.hform.HDesignLife=LoadData[0].鍒濆璁捐瀵垮懡
+								this.hform.HLeaveLife=LoadData[0].鍓╀綑瀵垮懡
+								this.hform.HDeptID=LoadData[0].HDeptID
+								this.hform.HDeptName=LoadData[0].浣跨敤閮ㄩ棬
+							}
+							else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					})
+				}
+			}, 
+            submit() {
+				var refSav = "";
+				// if (OperationType == 1) {
+				//     refSav = "Add";
+				// } else {
+				//     refSav = "Update";
+				// }
+    //         	if(!this.hform.HBarCode){
+    //         		uni.showToast({
+    //         			title:'璇锋壂鎻忔潯褰㈢爜',
+    //         			icon:'none'
+    //         		})}
+				  if(!this.hform.HDeptID){
+					uni.showToast({
+						title:'璇烽�夋嫨閮ㄩ棬',
+						icon:'none'
+					})
+				}else if(!this.hform.HEmpName){
+					uni.showToast({
+						title:'璋冩暣浜烘湭閫夋嫨',
+						icon:'none'
+					})
+            	}else if(!this.hform.HMangerID){
+					uni.showToast({
+						title:'璐熻矗浜烘湭閫夋嫨',
+						icon:'none'
+					})
+            	}
+				
+				else{
+            		uni.showLoading({
+            			title:'璇风◢鍊�'
+            		})
+					 var numData = [{ "HMaterID": this.hform.HMaterID, "HPropertyID": 0, "HSecUnitID": 0, "HSecUnitRate": 0, "HDeptID": this.hform.HDeptID, "HUnitID": 0, "HDesignLife": this.hform.HDesignLife, "HLeaveLife": this.hform.HLeaveLife, "HNewLeaveLife":this.hform.HNewLeaveLife }]
+					var sMainStr = JSON.stringify(this.hform);
+					var sSubStr = JSON.stringify(numData);
+					var sMainSub = sMainStr + ";" + sSubStr+";"+uni.getStorageSync('HUserName');
+            		console.log(sMainSub);
+            		uni.request({
+            		    url: this.serverUrl + '/Sc_MouldLifeChangeBill/SaveGetMouldLifeChangeBillList',
+            			method:'POST',
+            			dataType:"json",
+            			data:{ msg: 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/weiwaigxIn/form?linterid=' + this.linterid + '&HBillNo=' + this.linterid
+										})
+									},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/shoujishouming/table.vue b/pages/shoujishouming/table.vue
new file mode 100644
index 0000000..60318fa
--- /dev/null
+++ b/pages/shoujishouming/table.vue
@@ -0,0 +1,485 @@
+<template>
+	<view class="content">
+		<view class="form">
+			<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.HCreateBy" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">寮�濮嬫椂闂�:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
+						<input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">缁撴潫鏃堕棿:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
+						<input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</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.鍗曟嵁鍙�"  style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+				<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.鍐呴儴鍗曟嵁鍙穧}
+					</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 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.鍏宠仈鏁伴噺}}
+					</view>
+					<view class="detail" v-if="item.鍏抽棴绫诲瀷">
+						<text>鍏抽棴绫诲瀷锛�</text>{{item.鍏抽棴绫诲瀷}}
+					</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 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.婧愬崟绫诲瀷}}
+					</view>
+					<view class="detail" v-if="item.hbilltype">
+						<text>hbilltype锛�</text>{{item.hbilltype}}
+					</view>
+					<view class="detail" v-if="item.鎽樿">
+						<text>鎽樿锛�</text>{{item.鎽樿}}
+					</view>
+				</view>
+				
+				<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="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button> -->
+					<!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
+					<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://localhost:8082/LuBaoAPI',
+				hform:{
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				operations:-1,
+				
+				page:1,
+				size:100
+	        }
+	    },
+		onLoad() {
+			this.getList()
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
+		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: {
+			getPage(page,list){
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex,eindex)
+				return newList
+			},
+			getList(){
+				console.log(this.sWhere)
+				uni.showLoading({
+					title:'鍔犺浇涓�...'
+				})
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldLifeChangeBill/page',
+					data:{ 
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						page:1,
+						size:100
+					},
+				    success: (res) => {
+				        console.log(1,res);
+						if(res.data.count >0){
+							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'
+						})
+					},
+				});
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			BenginHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.BenginHCreateDate = e.detail.value
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			EndHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.EndHCreateDate = e.detail.value
+			},
+			search(){
+				this.sWhere = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				console.log(this.hform)
+				if (this.hform.HBillNo) {
+				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				}
+				if (this.hform.HCreateBy) {
+				    this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+				}
+				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 + "'";
+				}
+				
+				this.getList()
+			},
+			creat(){
+				uni.navigateTo({
+					url:'/pages/shoujishouming/form'
+				})
+			},
+			clear(){
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				this.sWhere = ''
+				this.showDetail = -1,
+				this.operations = -1,
+				this.hform = {
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				}
+				this.getList()
+			},
+			toSon(item){
+				uni.navigateTo({
+					url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid 
+					+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О 
+					+ '&璁惧浠g爜=' + item.璁惧浠g爜,
+				})
+			},
+			
+			//缂栬緫
+			edit(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: '/pages/shoujishouming/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_MouldLifeChangeBill/DeltetMouldLifeChangeBill',
+								data:{ 
+									HInterID: item.hmainid,
+									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;
+	}
+    .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: 130rpx;
+				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>

--
Gitblit v1.9.1