linweidong
/
besure_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!17 移除element-plus

Browse Source 
Merge pull request !17 from guopeiyu/guopeiyu
main
guopeiyu 2 years ago committed by Gitee
parent 947a4fc212 f9ad9772c2
commit e9eec7986a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 832 additions and 2817 deletions
Show Stats Download Patch File Download Diff File

2
package.json
Unescape Escape View File

@ -56,13 +56,11 @@
"@dcloudio/uni-mp-xhs": "3.0.0-4020320240708001", "@dcloudio/uni-mp-xhs": "3.0.0-4020320240708001",
"@dcloudio/uni-quickapp-webview": "3.0.0-4020320240708001", "@dcloudio/uni-quickapp-webview": "3.0.0-4020320240708001",
"@dcloudio/uni-ui": "^1.5.6", "@dcloudio/uni-ui": "^1.5.6",
"@element-plus/icons-vue": "^2.3.1",
"@jridgewell/sourcemap-codec": "^1.4.15", "@jridgewell/sourcemap-codec": "^1.4.15",
"@qiun/wx-ucharts": "2.5.0-20230101", "@qiun/wx-ucharts": "2.5.0-20230101",
"@ttou/uview-typings": "^2.0.5", "@ttou/uview-typings": "^2.0.5",
"clipboard": "^2.0.11", "clipboard": "^2.0.11",
"dayjs": "^1.11.9", "dayjs": "^1.11.9",
"element-plus": "^2.7.6",
"mqtt": "4.1.0", "mqtt": "4.1.0",
"pinia": "2.0.28", "pinia": "2.0.28",
"pinia-plugin-persistedstate": "^3.1.0", "pinia-plugin-persistedstate": "^3.1.0",

11
src/main.js
Unescape Escape View File

@ -2,15 +2,8 @@ import App from './App.vue'
import plugins from './plugins' import plugins from './plugins'
import store from './store' import store from './store'
import uviewPlus from 'uview-plus' import uviewPlus from 'uview-plus'
import ElementPlus from 'element-plus' //添加
import 'element-plus/dist/index.css' //添加
import locale from "element-plus/es/locale/lang/zh-cn"
import * as ElementPlusIconsVue from '@element-plus/icons-vue'
import { createSSRApp } from 'vue' import { createSSRApp } from 'vue'
import directive from './directive' // directive import directive from './directive' // directive
import { useDict } from '@/utils/dict' import { useDict } from '@/utils/dict'
import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi' import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi'
@ -21,10 +14,6 @@ export function createApp() {
app.use(store) app.use(store)
app.use(uviewPlus) app.use(uviewPlus)
app.use(plugins) app.use(plugins)
app.use(ElementPlus, {locale})
for (const [key, component] of Object.entries(ElementPlusIconsVue)){
app.component(key, component)
}
directive(app) directive(app)
// 全局方法挂载 // 全局方法挂载

4
src/page_report/planProgress.vue
Unescape Escape View File

@ -21,9 +21,9 @@
width="40rpx" width="40rpx"
height="40rpx" height="40rpx"
/> />
<el-text class="u-m-l-10">{{planDo.productName}}</el-text> <u-text type="primary" class="u-m-l-10" :text="planDo.productName"></u-text>
</view> </view>
<el-text type="success">{{planDo.code}}</el-text> <view><u-text type="success" :text="planDo.code"></u-text></view>
</view> </view>
</uni-card> </uni-card>
<uni-table ref="table" stripe emptyText="暂无数据"> <uni-table ref="table" stripe emptyText="暂无数据">

1
src/page_report/replaceForm.vue
Unescape Escape View File

@ -224,6 +224,7 @@ export default {
update(this.customFormData).then(response => { update(this.customFormData).then(response => {
modal.msgSuccess("修改成功") modal.msgSuccess("修改成功")
tab.navigateBack() tab.navigateBack()
uni.$emit('success', true)
}) })
}else{ }else{
this.customFormData.id = null this.customFormData.id = null

2
src/page_report/reportForm.vue
Unescape Escape View File

@ -14,7 +14,7 @@
/> />
</u-sticky> </u-sticky>
<uni-card :is-shadow="false" is-full> <uni-card :is-shadow="false" is-full>
<el-text type="warning" class="uni-h6">如个人无法填报，请寻找主管代为报工</el-text> <u-text type="warning" class="uni-h6" text="如个人无法填报，请寻找主管代为报工"></u-text>
</uni-card> </uni-card>
<view class="container"> <view class="container">
<!-- 自定义表单校验 --> <!-- 自定义表单校验 -->

127
src/pages/index.vue
Unescape Escape View File

@ -41,37 +41,35 @@
width="40rpx" width="40rpx"
height="40rpx" height="40rpx"
/> />
<text class="name"> <u-text type="primary" :text=" item.productName" class="u-m-l-10"> </u-text>
{{ item.productName }}
</text>
</view> </view>
<el-text type="success">{{item.code}}</el-text> <view><u-text type="success" :text="item.code"></u-text></view>
</view> </view>
<view class="flex-box"> <view class="u-flex u-flex-between u-m-t-30">
<el-text>计划数:{{ item.planNumber }}</el-text> <u-text :text="`计划数： ${ item.planNumber }`" size="13"></u-text>
<el-text>入库数:{{ item.finishNumber }}</el-text> <u-text :text="`入库数： ${ item.finishNumber }`" size="13"></u-text>
</view> </view>
<view class="flex-box"> <view class="u-flex u-flex-between u-m-t-30">
<el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text> <u-text :text="`计划开始时间： ${ timestampToTime(item.planStartTime) }`" size="13"></u-text>
<el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text> <u-text :text="`计划结束时间： ${ timestampToTime(item.planEndTime) }`" size="13"></u-text>
</view> </view>
<view class="text"> <view class="text">
<el-text>备注:</el-text> <u-text text="备注：" size="13"/>
</view> </view>
<view class="remark"> <view class="remark">
<el-text>{{ item.remark }}</el-text> <u-text :text="item.remark"></u-text>
</view> </view>
<view class="u-m-t-30 u-m-b-30"><u-line/></view> <view class="u-m-t-30 u-m-b-30"><u-line/></view>
<view class="u-flex justify-end"> <view class="u-flex justify-end">
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4" class="u-m-r-30"> <view v-if="auth.hasPermi('mes:plan:update')" class="u-m-r-30">
<u-button type="success" plain @click="updatePlan(item.id, item.code,'end')">完工</u-button> <u-button type="success" plain @click="updatePlan(item.id, item.code,'end')">完工</u-button>
</el-col> </view>
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4" class="u-m-r-30"> <view v-if="auth.hasPermi('mes:plan:update')" class="u-m-r-30">
<u-button type="error" plain @click="updatePlan(item.id,item.code,'pause')">暂停</u-button> <u-button type="error" plain @click="updatePlan(item.id,item.code,'pause')">暂停</u-button>
</el-col> </view>
<el-col :span="4"> <view>
<u-button type="info" plain @click="planProgress(item)">进度</u-button> <u-button type="info" plain @click="planProgress(item)">进度</u-button>
</el-col> </view>
</view> </view>
</view> </view>
</u-list-item> </u-list-item>
@ -92,37 +90,35 @@
width="40rpx" width="40rpx"
height="40rpx" height="40rpx"
/> />
<text class="name"> <u-text type="primary" :text=" item.productName" class="u-m-l-10"> </u-text>
{{ item.productName }}
</text>
</view> </view>
<el-text type="success">{{item.code}}</el-text> <view><u-text type="success" :text="item.code"></u-text></view>
</view> </view>
<view class="flex-box"> <view class="u-flex u-flex-between u-m-t-30">
<el-text>计划数:{{ item.planNumber }}</el-text> <u-text :text="`计划数： ${ item.planNumber }`" size="13"></u-text>
<el-text>入库数:{{ item.finishNumber }}</el-text> <u-text :text="`入库数： ${ item.finishNumber }`" size="13"></u-text>
</view> </view>
<view class="flex-box"> <view class="u-flex u-flex-between u-m-t-30">
<el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text> <u-text :text="`计划开始时间： ${ timestampToTime(item.planStartTime) }`" size="13"></u-text>
<el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text> <u-text :text="`计划结束时间： ${ timestampToTime(item.planEndTime) }`" size="13"></u-text>
</view> </view>
<view class="text"> <view class="text">
<el-text>备注:</el-text> <u-text text="备注：" size="13"/>
</view> </view>
<view class="remark"> <view class="remark">
<el-text>{{ item.remark }}</el-text> <u-text :text="item.remark"></u-text>
</view> </view>
<view class="u-m-t-30 u-m-b-30"><u-line/></view> <view class="u-m-t-30 u-m-b-30"><u-line/></view>
<view class="u-flex justify-end"> <view class="u-flex justify-end">
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4"> <view v-if="auth.hasPermi('mes:plan:update')">
<u-button type="info" plain @click="updatePlan(item.id,item.code, 'start')">开工</u-button> <u-button type="info" plain @click="updatePlan(item.id,item.code, 'start')">开工</u-button>
</el-col> </view>
</view> </view>
</view> </view>
</u-list-item> </u-list-item>
</u-list> </u-list>
</view> </view>
<!-- 计划中--> <!--计划中-->
<view v-if="current === 2" class="container" > <view v-if="current === 2" class="container" >
<u-list> <u-list>
<u-list-item <u-list-item
@ -137,31 +133,29 @@
width="40rpx" width="40rpx"
height="40rpx" height="40rpx"
/> />
<text class="name"> <u-text type="primary" :text=" item.productName" class="u-m-l-10"> </u-text>
{{ item.productName }}
</text>
</view> </view>
<el-text type="success">{{item.code}}</el-text> <view><u-text type="success" :text="item.code"></u-text></view>
</view> </view>
<view class="flex-box"> <view class="u-flex u-flex-between u-m-t-30">
<el-text>计划数:{{ item.planNumber }}</el-text> <u-text :text="`计划数： ${ item.planNumber }`" size="13"></u-text>
<el-text>入库数:{{ item.finishNumber }}</el-text> <u-text :text="`入库数： ${ item.finishNumber }`" size="13"></u-text>
</view> </view>
<view class="flex-box"> <view class="u-flex u-flex-between u-m-t-30">
<el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text> <u-text :text="`计划开始时间： ${ timestampToTime(item.planStartTime) }`" size="13"></u-text>
<el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text> <u-text :text="`计划结束时间： ${ timestampToTime(item.planEndTime) }`" size="13"></u-text>
</view> </view>
<view class="text"> <view class="text">
<el-text>备注:</el-text> <u-text text="备注：" size="13"/>
</view> </view>
<view class="remark"> <view class="remark">
<el-text>{{ item.remark }}</el-text> <u-text :text="item.remark"></u-text>
</view> </view>
<view class="u-m-t-30 u-m-b-30"><u-line/></view> <view class="u-m-t-30 u-m-b-30"><u-line/></view>
<view class="u-flex justify-end"> <view class="u-flex justify-end">
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4"> <view v-if="auth.hasPermi('mes:plan:update')">
<u-button type="primary" plain>派工</u-button> <u-button type="primary" plain>派工</u-button>
</el-col> </view>
</view> </view>
</view> </view>
</u-list-item> </u-list-item>
@ -182,42 +176,37 @@
width="40rpx" width="40rpx"
height="40rpx" height="40rpx"
/> />
<text class="name"> <u-text type="primary" :text=" item.productName" class="u-m-l-10"> </u-text>
{{ item.productName }}
</text>
</view> </view>
<el-text type="success">{{item.code}}</el-text> <view><u-text type="success" :text="item.code"></u-text></view>
</view> </view>
<view class="flex-box"> <view class="u-flex u-flex-between u-m-t-30">
<el-text>计划数:{{ item.planNumber }}</el-text> <u-text :text="`计划数： ${ item.planNumber }`" size="13"></u-text>
<el-text>入库数:{{ item.finishNumber }}</el-text> <u-text :text="`入库数： ${ item.finishNumber }`" size="13"></u-text>
</view> </view>
<view class="flex-box"> <view class="u-flex u-flex-between u-m-t-30">
<el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text> <u-text :text="`计划开始时间： ${ timestampToTime(item.planStartTime) }`" size="13"></u-text>
<el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text> <u-text :text="`计划结束时间： ${ timestampToTime(item.planEndTime) }`" size="13"></u-text>
</view> </view>
<view class="text"> <view class="text">
<el-text>备注:</el-text> <u-text text="备注：" size="13"/>
</view> </view>
<view class="remark"> <view class="remark">
<el-text>{{ item.remark }}</el-text> <u-text :text="item.remark"></u-text>
</view> </view>
<view class="u-m-t-30 u-m-b-30"><u-line/></view> <view class="u-m-t-30 u-m-b-30"><u-line/></view>
<view class="u-flex justify-end"> <view class="u-flex justify-end">
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4" class="u-m-r-30"> <view v-if="auth.hasPermi('mes:plan:update')" :span="4" class="u-m-r-30">
<u-button type="info" plain @click="updatePlan(item.id, item.code,'start')">开工</u-button> <u-button type="info" plain @click="updatePlan(item.id, item.code,'start')">开工</u-button>
</el-col> </view>
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4"> <view v-if="auth.hasPermi('mes:plan:update')" :span="4">
<u-button type="success" plain @click="updatePlan(item.id,item.code, 'end')">完工</u-button> <u-button type="success" plain @click="updatePlan(item.id,item.code, 'end')">完工</u-button>
</el-col> </view>
</view> </view>
</view> </view>
</u-list-item> </u-list-item>
</u-list> </u-list>
</view> </view>
<!-- <view class="charts-box">-->
<!-- <qiun-data-charts :chartData="chartData" type="column"/>-->
<!-- </view>-->
</view> </view>
</template> </template>
@ -351,12 +340,6 @@ function planProgress(plan){
.title { .title {
display: flex; display: flex;
align-items: center; align-items: center;
.name {
font-size: 28rpx;
font-weight: bold;
margin-left: 16rpx;
color: #333333;
}
} }
} }
.flex-box { .flex-box {

109
src/pages/work.vue
Unescape Escape View File

@ -41,41 +41,39 @@
width="40rpx" width="40rpx"
height="40rpx" height="40rpx"
/> />
<el-text type="success" class="u-m-l-10"> <u-text class="u-m-l-10" type="primary" :text="timestampToTime(item.feedingTime)"></u-text>
{{ timestampToTime(item.feedingTime) }} </view>
</el-text> <view><u-text type="warning" :text="findTextByValue(pipelineTypes, item.feedingPipeline)"></u-text></view>
<view><u-text type="info" :text="findTextByValue(feedingTypes, item.feedingType)"></u-text></view>
</view>
<view class="u-m-t-30"><u-text :text="item.feedingRecordCode"></u-text></view>
<view class="u-flex u-flex-between u-m-t-30 u-m-b-30">
<view class="u-flex">记录人：
<u-text type="success" :text="item.userName"></u-text>
</view>
<view class="u-flex" v-if="item.feedingType !=='org'">重量/kg：
<u-text :text="item.weight"></u-text>
</view>
</view>
<view v-for="(item2, index2) in draftList[index].detailList" :key="index2" class="u-flex u-flex-between u-m-b-30">
<view class="u-flex flex_1">原料：
<u-text type="warning" :text="item2.itemName"></u-text>
</view>
<view class="u-flex flex_1">数量：
<u-text type="success" :text="item2.weight"></u-text>
</view>
<view class="u-flex flex_1">单位：
<u-text :text="item2.unitName"></u-text>
</view> </view>
<el-text type="warning">{{ findTextByValue(pipelineTypes, item.feedingPipeline)}}</el-text>
<el-text type="info">{{findTextByValue(feedingTypes, item.feedingType) }}</el-text>
</view> </view>
<view class="u-m-t-30"><el-text size="large">{{item.feedingRecordCode}}</el-text></view>
<el-row class="u-m-t-30 u-m-b-30">
<el-col :span="8">记录人:
<el-text type="success">{{ item.userName }}</el-text>
</el-col>
<el-col :span="8" v-if="item.feedingType !=='org'">重量/kg:
<el-text>{{ item.weight }} </el-text>
</el-col>
</el-row>
<el-row v-for="(item2, index2) in draftList[index].detailList" :key="index2" class="u-m-b-30">
<el-col :span="8">原料:
<el-text type="warning">{{item2.itemName}}</el-text>
</el-col>
<el-col :span="8">数量:
<el-text type="success">{{ item2.weight }}</el-text>
</el-col>
<el-col :span="8">单位:
<el-text>{{item2.unitName }} </el-text>
</el-col>
</el-row>
<view class="u-m-t-30 u-m-b-30"><u-line/></view> <view class="u-m-t-30 u-m-b-30"><u-line/></view>
<view class="u-flex justify-end"> <view class="u-flex justify-end">
<el-col :span="4" class="u-m-r-30"> <text class="u-m-r-30">
<u-button type="info" @click="handleUpdate(item.id)">提交</u-button> <u-button type="info" @click="handleUpdate(item.id)">提交</u-button>
</el-col> </text>
<el-col :span="4"> <text>
<u-button type="error" @click="handleDelete(item.id)">删除</u-button> <u-button type="error" @click="handleDelete(item.id)">删除</u-button>
</el-col> </text>
</view> </view>
</view> </view>
</u-list-item> </u-list-item>
@ -96,33 +94,33 @@
width="40rpx" width="40rpx"
height="40rpx" height="40rpx"
/> />
<el-text type="success" class="u-m-l-10"> <u-text type="primary" class="u-m-l-10" :text="timestampToTime(item.feedingTime)"></u-text>
{{ timestampToTime(item.feedingTime) }} </view>
</el-text> <view><u-text type="warning" :text="findTextByValue(pipelineTypes, item.feedingPipeline)"></u-text></view>
<view><u-text type="info" :text="findTextByValue(feedingTypes, item.feedingType)"></u-text></view>
</view>
<view class="u-m-t-30">
<u-text :text="item.feedingRecordCode"></u-text>
</view>
<view class="u-flex u-flex-between u-m-t-30 u-m-b-30">
<view class="u-flex">记录人：
<u-text type="success" :text="item.userName" class="u-m-l-10"></u-text>
</view>
<view v-if="item.feedingType !=='org'" class="u-flex">重量/kg：
<u-text :text="item.weight" class="u-flex"> </u-text>
</view>
</view>
<view v-for="(item2, index2) in finishList[index].detailList" :key="index2" class="u-flex u-flex-between u-m-b-30">
<view class="u-flex flex_1">原料：
<u-text type="warning" :text="item2.itemName" class="u-m-l-10"></u-text>
</view>
<view class="u-flex flex_1">数量：
<u-text type="success" :text="item2.weight" class="u-m-l-10"></u-text>
</view>
<view class="u-flex flex_1">单位：
<u-text :text="item2.unitName" class="u-m-l-10"></u-text>
</view> </view>
<el-text type="warning">{{ findTextByValue(pipelineTypes, item.feedingPipeline)}}</el-text>
<el-text type="info">{{findTextByValue(feedingTypes, item.feedingType) }}</el-text>
</view> </view>
<view class="u-m-t-30"><el-text size="large">{{item.feedingRecordCode}}</el-text></view>
<el-row class="u-m-t-30 u-m-b-30">
<el-col :span="8">记录人:
<el-text type="success">{{ item.userName }}</el-text>
</el-col>
<el-col :span="8" v-if="item.feedingType !=='org'">重量/kg:
<el-text>{{ item.weight }} </el-text>
</el-col>
</el-row>
<el-row v-for="(item2, index2) in finishList[index].detailList" :key="index2" class="u-m-b-30">
<el-col :span="8">原料:
<el-text type="warning">{{item2.itemName}}</el-text>
</el-col>
<el-col :span="8">数量:
<el-text type="success">{{ item2.weight }}</el-text>
</el-col>
<el-col :span="8">单位:
<el-text>{{item2.unitName }} </el-text>
</el-col>
</el-row>
</view> </view>
</u-list-item> </u-list-item>
</u-list> </u-list>
@ -262,4 +260,7 @@ onLoad(() => {
.u-button { .u-button {
height: 60rpx height: 60rpx
} }
.flex_1 {
flex: 1;
}
</style> </style>

3391
yarn.lock
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save