diff --git a/pages.json b/pages.json index 8db8ee7..38f4816 100644 --- a/pages.json +++ b/pages.json @@ -37,9 +37,15 @@ } }, { - "path": "pages/shipWork/mixAdd", + "path": "pages/shipWork/peopleAdd", "style": { - "navigationBarTitleText": "杂项作业编辑" + "navigationBarTitleText": "杂项作业查看(人员信息)" + } + }, + { + "path": "pages/shipWork/shiftAdd", + "style": { + "navigationBarTitleText": "杂项作业查看(工班信息)" } }, { diff --git a/pages/shipWork/mixWork.vue b/pages/shipWork/mixWork.vue index 02ee611..ad6b278 100644 --- a/pages/shipWork/mixWork.vue +++ b/pages/shipWork/mixWork.vue @@ -5,8 +5,9 @@ {{item}} + + - + 新增 + + 新增 @@ -44,8 +46,9 @@ data() { return { tabsList: ["人员信息", "工班信息"], - tabsType: 1, + tabsType: 1, // 1是人员信息 2是工班信息 tabsIndex: 0, + // 人员信息列表 peopleInfo: [{ val1: "JK9795799", val2: "内贸", @@ -68,6 +71,7 @@ val5: "100", val6: "未上传", }], + // 工班信息列表 shiftInfo: [{ val1: "JK9795799", val6: "未上传", @@ -84,10 +88,21 @@ this.tabsType = 2; } }, - add() { - uni.navigateTo({ - url: `/pages/shipWork/mixAdd` - }) + add(state) { + const obj = { + state: state, + } + const params = encodeURIComponent(JSON.stringify(obj)); + if (this.tabsType == 1) { + uni.navigateTo({ + url: `/pages/shipWork/peopleAdd?params=${params}` + }) + } else { + uni.navigateTo({ + url: `/pages/shipWork/shiftAdd?params=${params}` + }) + } + }, } } diff --git a/pages/shipWork/mixAdd.vue b/pages/shipWork/peopleAdd.vue similarity index 50% rename from pages/shipWork/mixAdd.vue rename to pages/shipWork/peopleAdd.vue index 4a7e3e3..dc63a56 100644 --- a/pages/shipWork/mixAdd.vue +++ b/pages/shipWork/peopleAdd.vue @@ -1,5 +1,5 @@ @@ -46,6 +60,7 @@ export default { data() { return { + obj: {}, // 航次下拉框 hcValue: "", hcList: [{ @@ -80,6 +95,14 @@ workValue: 0, // 单船人数 shipValue: 0, + // 作业时间 + datetime: "", + } + }, + onLoad(options) { + if ('params' in options) { + // 获取传递的对象参数,使用decodeURIComponent解码,并转为对象 + this.obj = JSON.parse(decodeURIComponent(options.params)) } }, methods: { @@ -99,14 +122,40 @@ shipChange(val) { this.shipValue = val; }, + // 作业时间 + changeLog(e) { + this.datetime = e; + console.log(e) + }, + // 取消 + cancel() { + uni.navigateTo({ + url: '/pages/shipWork/mixWork' + }) + }, + // 保存 + save() { + uni.navigateTo({ + url: '/pages/shipWork/mixWork' + }) + }, + // 编辑 + toGo(state) { + this.obj.state = state; + const params = encodeURIComponent(JSON.stringify(this.obj)); + uni.navigateTo({ + url: `/pages/shipWork/peopleAdd?params=${params}` + }) + } } } \ No newline at end of file diff --git a/pages/shipWork/shiftAdd.vue b/pages/shipWork/shiftAdd.vue new file mode 100644 index 0000000..6c66461 --- /dev/null +++ b/pages/shipWork/shiftAdd.vue @@ -0,0 +1,337 @@ + + + + + \ No newline at end of file diff --git a/uni_modules/uni-steps/changelog.md b/uni_modules/uni-steps/changelog.md new file mode 100644 index 0000000..cb9d367 --- /dev/null +++ b/uni_modules/uni-steps/changelog.md @@ -0,0 +1,16 @@ +## 1.1.1(2021-11-22) +- 修复 vue3中某些scss变量无法找到的问题 +## 1.1.0(2021-11-19) +- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-steps](https://uniapp.dcloud.io/component/uniui/uni-steps) +## 1.0.8(2021-05-12) +- 新增 项目示例地址 +## 1.0.7(2021-05-06) +- 修复 uni-steps 横向布局时,多行文字高度不合理的 bug +## 1.0.6(2021-04-21) +- 优化 添加依赖 uni-icons, 导入后自动下载依赖 +## 1.0.5(2021-02-05) +- 优化 组件引用关系,通过uni_modules引用组件 + +## 1.0.4(2021-02-05) +- 调整为uni_modules目录规范 diff --git a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue new file mode 100644 index 0000000..a6c8f28 --- /dev/null +++ b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/uni_modules/uni-steps/package.json b/uni_modules/uni-steps/package.json new file mode 100644 index 0000000..c687b40 --- /dev/null +++ b/uni_modules/uni-steps/package.json @@ -0,0 +1,89 @@ +{ + "id": "uni-steps", + "displayName": "uni-steps 步骤条", + "version": "1.1.1", + "description": "步骤条组件,提供横向和纵向两种布局格式。", + "keywords": [ + "uni-ui", + "uniui", + "步骤条", + "时间轴" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": [ + "uni-scss", + "uni-icons" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/uni-steps/readme.md b/uni_modules/uni-steps/readme.md new file mode 100644 index 0000000..da7a4bf --- /dev/null +++ b/uni_modules/uni-steps/readme.md @@ -0,0 +1,13 @@ + + +## Steps 步骤条 +> **组件名:uni-steps** +> 代码块: `uSteps` + + +步骤条,常用于显示进度 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-steps) +#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839 + +