productDev/dmMes.git

Mr.Shi

2023-09-13 26c8212a1e8ba902798be21e97629c9295b2f405

小程序

已删除1个文件

已修改4个文件

已重命名2个文件

	minipro_standard/common/css/iconfont.css	2281 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	minipro_standard/main.js	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	minipro_standard/pages.json	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	minipro_standard/pages/index/index.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	minipro_standard/pages_adjust/components/multipleMaterial.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	minipro_standard/pages_inspect/pages/InOperation/InOperation.vue	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 minipro_standard/common/css/iconfont.css

ÎÄ¼þÒÑÉ¾³ý

 minipro_standard/main.js


 minipro_standard/pages.json

@@ -108,20 +108,6 @@
                "enablePullDownRefresh": false

            }



        }, {

            "path": "pages/OutOperation/OutOperation",

            "style": {

                "navigationBarTitleText": "åºåºæä½",

                "enablePullDownRefresh": false

            }



        }, {

            "path": "pages/InOperation/InOperation",

            "style": {

                "navigationBarTitleText": "å¥åºæä½",

                "enablePullDownRefresh": false

            }



        }

    ],

    "subPackages": [{

@@ -259,6 +245,19 @@
            "root": "pages_inspect",

            "pages": [

                {

                    "path": "pages/OutOperation/OutOperation",

                    "style": {

                        "navigationBarTitleText": "åºåºæä½",

                        "enablePullDownRefresh": false

                    }

                }, {

                    "path": "pages/InOperation/InOperation",

                    "style": {

                        "navigationBarTitleText": "å¥åºæä½",

                        "enablePullDownRefresh": false

                    }

                },

                {

                    "path": "pages/InspectionRecords/InspectionRecords",

                    "style": {

                        "navigationBarTitleText": "æ£éªè®°å½",


 minipro_standard/pages/index/index.vue

@@ -237,7 +237,7 @@
                    case 0: case 2: case 5: {
                        if (item.status === 0) {
                            uni.navigateTo({
                                url: `/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7`
                                url: `/pages_inspect/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7`
                            })
                        } else {
                            uni.navigateTo({
@@ -262,7 +262,7 @@
                    case 1: case 6: {
                        if (item.status === 0) {
                            uni.navigateTo({
                                url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=7`
                                url: `/pages_inspect/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=7`
                            })
                        } else {
                            uni.navigateTo({
@@ -274,7 +274,7 @@
                    case 9: {
                        if (item.status === 0) {
                            uni.navigateTo({
                                url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9`
                                url: `/pages_inspect/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9`
                            })
                        } else{
                            uni.navigateTo({

 minipro_standard/pages_adjust/components/multipleMaterial.vue

@@ -5,20 +5,12 @@
            <v-Search @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="æç´¢ç©æåç§°/ç¼ç " />
            <div class="content_total">å±{{form.total}}æ¡æ°æ®</div>
            <view class="scroll-content">
                <!-- refresher-enabled="true"
                :refresher-triggered="refreshing"
                @refresherrefresh="onRefresh" -->
                <scroll-view
                scroll-y="true"
                @scrolltolower="loadMore">
                    <view v-for="(item1, index) in list" :key="index" class="flex mb20" @click="jump(index)">
<<<<<<< HEAD
                        <view class="img36 mr20 pt10" style="position: relative;">
                            <u-checkbox-group style="display: block;" name="">
=======
                        <view class="img36 mr20 pt10">
                            <u-checkbox-group style="display: block;" name="" @change="jump(index)">
>>>>>>> 041c81a20c93a6b8238e810fe9a1adfee9c9d86f
                                <u-checkbox :checked="item1.isActive"></u-checkbox>
                            </u-checkbox-group>
                            <view style="width: 18px; height: 18px; position: absolute; top: 0; left: 0; z-index: 99;"></view>

 minipro_standard/pages_inspect/pages/InOperation/InOperation.vue


 minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue

ÎÄ¼þÃû´Ó minipro_standard/pages/OutOperation/OutOperation.vue ÐÞ¸Ä
@@ -178,9 +178,6 @@
    import {

        getDB

    } from '@/util/api/agencyAPI'

    import {

        logout

    } from '../../util/api'

    export default {

        components: {

            InOutInfo,

			@@ -108,20 +108,6 @@
			"enablePullDownRefresh": false
			}

			}, {
			"path": "pages/OutOperation/OutOperation",
			"style": {
			"navigationBarTitleText": "åºåºæä½",
			"enablePullDownRefresh": false
			}

			}, {
			"path": "pages/InOperation/InOperation",
			"style": {
			"navigationBarTitleText": "å¥åºæä½",
			"enablePullDownRefresh": false
			}

			}
			],
			"subPackages": [{
			@@ -259,6 +245,19 @@
			"root": "pages_inspect",
			"pages": [
			{
			"path": "pages/OutOperation/OutOperation",
			"style": {
			"navigationBarTitleText": "åºåºæä½",
			"enablePullDownRefresh": false
			}
			}, {
			"path": "pages/InOperation/InOperation",
			"style": {
			"navigationBarTitleText": "å¥åºæä½",
			"enablePullDownRefresh": false
			}
			},
			{
			"path": "pages/InspectionRecords/InspectionRecords",
			"style": {
			"navigationBarTitleText": "æ£éªè®°å½",

			@@ -237,7 +237,7 @@
			case 0: case 2: case 5: {
			if (item.status === 0) {
			uni.navigateTo({
			url: `/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7`
			url: `/pages_inspect/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7`
			})
			} else {
			uni.navigateTo({
			@@ -262,7 +262,7 @@
			case 1: case 6: {
			if (item.status === 0) {
			uni.navigateTo({
			url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=7`
			url: `/pages_inspect/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=7`
			})
			} else {
			uni.navigateTo({
			@@ -274,7 +274,7 @@
			case 9: {
			if (item.status === 0) {
			uni.navigateTo({
			url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9`
			url: `/pages_inspect/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9`
			})
			} else{
			uni.navigateTo({

			@@ -5,20 +5,12 @@
			<v-Search @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="æç´¢ç©æåç§°/ç¼ç " />
			<div class="content_total">å±{{form.total}}æ¡æ°æ®</div>
			<view class="scroll-content">
			<!-- refresher-enabled="true"
			:refresher-triggered="refreshing"
			@refresherrefresh="onRefresh" -->
			<scroll-view
			scroll-y="true"
			@scrolltolower="loadMore">
			<view v-for="(item1, index) in list" :key="index" class="flex mb20" @click="jump(index)">
			<<<<<<< HEAD
			<view class="img36 mr20 pt10" style="position: relative;">
			<u-checkbox-group style="display: block;" name="">
			=======
			<view class="img36 mr20 pt10">
			<u-checkbox-group style="display: block;" name="" @change="jump(index)">
			>>>>>>> 041c81a20c93a6b8238e810fe9a1adfee9c9d86f
			<u-checkbox :checked="item1.isActive"></u-checkbox>
			</u-checkbox-group>
			<view style="width: 18px; height: 18px; position: absolute; top: 0; left: 0; z-index: 99;"></view>

ÎÄ¼þÃû´Ó minipro_standard/pages/OutOperation/OutOperation.vue ÐÞ¸Ä
			@@ -178,9 +178,6 @@
			import {
			getDB
			} from '@/util/api/agencyAPI'
			import {
			logout
			} from '../../util/api'
			export default {
			components: {
			InOutInfo,