~jhz/STUWMS.git

parent: c2465693 | 补丁 | 提交 | ignore whitespace

zrg

2025-11-14 d51991aebd614219a10e81205e2618a2cb287fd2

优化首巡末页面排序

4个文件已修改

	pages/ZLGL/mojianjianyan/form.vue	4342 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/ZLGL/shoujianjianyan/form.vue	4215 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/ZLGL/xunjianjianyan/form.vue	76 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/index/tab2.vue	58 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages/ZLGL/mojianjianyan/form.vue

Diff too large

 pages/ZLGL/shoujianjianyan/form.vue

Diff too large

 pages/ZLGL/xunjianjianyan/form.vue

@@ -5,7 +5,8 @@
            <!-- 主表页签 -->
            <view class="bill-main-tabs">
                <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">基本信息</view>
                <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">制单信息</view>
                <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">其他信息</view>
                <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">制单信息</view>
            </view>
            <!-- 主表内容 -->
            <view class="bill-main-contents">
@@ -64,12 +65,7 @@
                            <uni-combox :candidates="GyWorkShiftNameList" placeholder="请选择生产班次"
                                v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
                        </view>
                    </view>
                    <!-- <view class="form-item">
                        <view class="left"></view>
                        <view class="right">
                            <input type="text"></view>
                    </view> -->
                    </view>                 
                    <view class="form-item">
                        <view class="left">任务单号</view>
                        <view class="right disabled">
@@ -79,24 +75,12 @@
                                @click="showSelectorModule(hform, 5)"></uni-icons></view>
                    </view>
                    <view class="form-item">
                        <view class="left">任务单数量</view>
                        <view class="right">
                            <input type="number" v-model="hform.HICMOQty" />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="left">流转卡号</view>
                        <view class="right disabled">
                            <input type="text" :value="hform.HProcExchBillNo" disabled />
                        </view>
                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
                                @click="showSelectorModule(hform, 6)"></uni-icons></view>
                    </view>
                    <view class="form-item">
                        <view class="left">流转卡数量</view>
                        <view class="right">
                            <input type="number" v-model="hform.HProcExchQty" />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="left">产品代码</view>
@@ -160,18 +144,40 @@
                                @click="showSelectorModule(hform, 8)"></uni-icons></view>
                    </view>
                    <view class="form-item">
                        <view class="left">备注</view>
                        <view class="right">
                            <input type="text" value="" />
                        </view>
                            <view class="left">备注</view>
                            <view class="right">
                                <input type="text" v-model="hform.HRemark" value="" />
                            </view>
                        </view>					
                    </view>
                    <view class="form-item">
                        <view class="left">异常临时处理方案</view>
                        <view class="right">
                            <input type="text" value="" />
                        </view>
                    <!-- 其他信息 -->
                    <view class="bill-main-content" v-if="mainTabSelected == 2">
                        <view class="form-item">
                            <view class="left">生产班次</view>
                            <view class="right">
                                <uni-combox :candidates="GyWorkShiftNameList" placeholder="请选择生产班次"
                                    v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
                            </view>
                        </view>
                        <view class="form-item">
                            <view class="left">异常临时处理方案</view>
                            <view class="right">
                                <input type="text" v-model="hform.HErrTreatment" value="" />
                            </view>
                        </view>
                        <view class="form-item">
                            <view class="left">任务单数量</view>
                            <view class="right">
                                <input type="number" v-model="hform.HICMOQty" />
                            </view>
                        </view>
                        <view class="form-item">
                            <view class="left">流转卡数量</view>
                            <view class="right">
                                <input type="number" v-model="hform.HProcExchQty" />
                            </view>
                        </view>
                    </view>
                </view>
                <!-- 制单信息 -->
                <view class="bill-main-content" v-if="mainTabSelected == 2">
                    <view class="form-item">
@@ -1631,12 +1637,12 @@

            },
            checkSubmitValidate() {
                if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
                    CommonUtils.showTips({
                        message: "任务单数量不能为空且不能小于等于0！",
                    });
                    return false;
                }
                // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
                //     CommonUtils.showTips({
                //         message: "任务单数量不能为空且不能小于等于0！",
                //     });
                //     return false;
                // }

                if (this.hform.HFirstCheckEmp == 0) {
                    CommonUtils.showTips({

 pages/index/tab2.vue

@@ -349,7 +349,7 @@
                    },
                    {
                        "img": "../../static/icon/icon13.png",
                        "text": "首件检验单缓存",
                        "text": "首件检验单列表",
                        "url": "/pages/ZLGL/shoujianjianyan/table",
                        "id": 41,
                        "hidden": false
@@ -362,72 +362,72 @@
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "巡检检验单单",
                        "url": "/pages/ZLGL/xunjianjianyan/form?operationType=1",
                        "id": 43,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "末件检验单列表",
                        "url": "/pages/ZLGL/mojianjianyan/table",
                        "id": 44,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "末件检验单",
                        "url": "/pages/ZLGL/mojianjianyan/form?operationType=1",
                        "id": 45,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon5.png",
                        "text": "模具点检记录单列表",
                        "url": "/pages/MJGL/mujudianjianjiludan/table",
                        "id": 43,
                        "id": 46,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon5.png",
                        "text": "模具保养记录单列表",
                        "url": "/pages/MJGL/mujubaoyangjiludan/table",
                        "id": 44,
                        "id": 47,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "模具领料出库单列表",
                        "url": "/pages/MJGL/mujulingliaochukudan/table",
                        "id": 45,
                        "id": 48,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "模具领料退库单列表",
                        "url": "/pages/MJGL/mujulingliaotuikudan/table",
                        "id": 46,
                        "id": 49,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "模具调拨单列表",
                        "url": "/pages/MJGL/qijudiaobodan/table",
                        "id": 47,
                        "id": 50,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "装箱单暂存列表",
                        "url": "/pages/zhuangxiangdan/table",
                        "id": 48,
                        "id": 51,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "巡检单暂存列表",
                        "text": "巡检单列表",
                        "url": "/pages/ZLGL/xunjianjianyan/table",
                        "id": 49,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "巡检单",
                        "url": "/pages/ZLGL/xunjianjianyan/form?operationType=1",
                        "id": 50,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "末件检验单列表",
                        "url": "/pages/ZLGL/mojianjianyan/table",
                        "id": 51,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "末件检验单",
                        "url": "/pages/ZLGL/mojianjianyan/form?operationType=1",
                        "id": 52,
                        "hidden": false
                    }

			@@ -5,7 +5,8 @@
			<!-- 主表页签 -->
			<view class="bill-main-tabs">
			<view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">基本信息</view>
			<view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">制单信息</view>
			<view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">其他信息</view>
			<view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">制单信息</view>
			</view>
			<!-- 主表内容 -->
			<view class="bill-main-contents">
			@@ -64,12 +65,7 @@
			<uni-combox :candidates="GyWorkShiftNameList" placeholder="请选择生产班次"
			v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
			</view>
			</view>
			<!-- <view class="form-item">
			<view class="left"></view>
			<view class="right">
			<input type="text"></view>
			</view> -->
			</view>
			<view class="form-item">
			<view class="left">任务单号</view>
			<view class="right disabled">
			@@ -79,24 +75,12 @@
			@click="showSelectorModule(hform, 5)"></uni-icons></view>
			</view>
			<view class="form-item">
			<view class="left">任务单数量</view>
			<view class="right">
			<input type="number" v-model="hform.HICMOQty" />
			</view>
			</view>
			<view class="form-item">
			<view class="left">流转卡号</view>
			<view class="right disabled">
			<input type="text" :value="hform.HProcExchBillNo" disabled />
			</view>
			<view class="icon-wrapper-big"><uni-icons type="search" size="20"
			@click="showSelectorModule(hform, 6)"></uni-icons></view>
			</view>
			<view class="form-item">
			<view class="left">流转卡数量</view>
			<view class="right">
			<input type="number" v-model="hform.HProcExchQty" />
			</view>
			</view>
			<view class="form-item">
			<view class="left">产品代码</view>
			@@ -160,18 +144,40 @@
			@click="showSelectorModule(hform, 8)"></uni-icons></view>
			</view>
			<view class="form-item">
			<view class="left">备注</view>
			<view class="right">
			<input type="text" value="" />
			</view>
			<view class="left">备注</view>
			<view class="right">
			<input type="text" v-model="hform.HRemark" value="" />
			</view>
			</view>
			</view>
			<view class="form-item">
			<view class="left">异常临时处理方案</view>
			<view class="right">
			<input type="text" value="" />
			</view>
			<!-- 其他信息 -->
			<view class="bill-main-content" v-if="mainTabSelected == 2">
			<view class="form-item">
			<view class="left">生产班次</view>
			<view class="right">
			<uni-combox :candidates="GyWorkShiftNameList" placeholder="请选择生产班次"
			v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
			</view>
			</view>
			<view class="form-item">
			<view class="left">异常临时处理方案</view>
			<view class="right">
			<input type="text" v-model="hform.HErrTreatment" value="" />
			</view>
			</view>
			<view class="form-item">
			<view class="left">任务单数量</view>
			<view class="right">
			<input type="number" v-model="hform.HICMOQty" />
			</view>
			</view>
			<view class="form-item">
			<view class="left">流转卡数量</view>
			<view class="right">
			<input type="number" v-model="hform.HProcExchQty" />
			</view>
			</view>
			</view>
			</view>
			<!-- 制单信息 -->
			<view class="bill-main-content" v-if="mainTabSelected == 2">
			<view class="form-item">
			@@ -1631,12 +1637,12 @@

			},
			checkSubmitValidate() {
			if (this.hform.HICMOQty == "" \|\| this.hform.HICMOQty <= 0) {
			CommonUtils.showTips({
			message: "任务单数量不能为空且不能小于等于0！",
			});
			return false;
			}
			// if (this.hform.HICMOQty == "" \|\| this.hform.HICMOQty <= 0) {
			// CommonUtils.showTips({
			// message: "任务单数量不能为空且不能小于等于0！",
			// });
			// return false;
			// }

			if (this.hform.HFirstCheckEmp == 0) {
			CommonUtils.showTips({

			@@ -349,7 +349,7 @@
			},
			{
			"img": "../../static/icon/icon13.png",
			"text": "首件检验单缓存",
			"text": "首件检验单列表",
			"url": "/pages/ZLGL/shoujianjianyan/table",
			"id": 41,
			"hidden": false
			@@ -362,72 +362,72 @@
			"hidden": false
			},
			{
			"img": "../../static/icon/icon8.png",
			"text": "巡检检验单单",
			"url": "/pages/ZLGL/xunjianjianyan/form?operationType=1",
			"id": 43,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon8.png",
			"text": "末件检验单列表",
			"url": "/pages/ZLGL/mojianjianyan/table",
			"id": 44,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon8.png",
			"text": "末件检验单",
			"url": "/pages/ZLGL/mojianjianyan/form?operationType=1",
			"id": 45,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon5.png",
			"text": "模具点检记录单列表",
			"url": "/pages/MJGL/mujudianjianjiludan/table",
			"id": 43,
			"id": 46,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon5.png",
			"text": "模具保养记录单列表",
			"url": "/pages/MJGL/mujubaoyangjiludan/table",
			"id": 44,
			"id": 47,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon8.png",
			"text": "模具领料出库单列表",
			"url": "/pages/MJGL/mujulingliaochukudan/table",
			"id": 45,
			"id": 48,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon8.png",
			"text": "模具领料退库单列表",
			"url": "/pages/MJGL/mujulingliaotuikudan/table",
			"id": 46,
			"id": 49,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon8.png",
			"text": "模具调拨单列表",
			"url": "/pages/MJGL/qijudiaobodan/table",
			"id": 47,
			"id": 50,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon8.png",
			"text": "装箱单暂存列表",
			"url": "/pages/zhuangxiangdan/table",
			"id": 48,
			"id": 51,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon8.png",
			"text": "巡检单暂存列表",
			"text": "巡检单列表",
			"url": "/pages/ZLGL/xunjianjianyan/table",
			"id": 49,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon8.png",
			"text": "巡检单",
			"url": "/pages/ZLGL/xunjianjianyan/form?operationType=1",
			"id": 50,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon8.png",
			"text": "末件检验单列表",
			"url": "/pages/ZLGL/mojianjianyan/table",
			"id": 51,
			"hidden": false
			},
			{
			"img": "../../static/icon/icon8.png",
			"text": "末件检验单",
			"url": "/pages/ZLGL/mojianjianyan/form?operationType=1",
			"id": 52,
			"hidden": false
			}