From 6d0ee85a6c0522f11036ec8c17c3dcb7ac8495da Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 08 四月 2025 16:28:20 +0800
Subject: [PATCH] 更新
---
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/负极叫料.vue | 291 +++++++++++++++
代码管理/NEWCode/WIDESEAWCS_PDA/pages.json | 103 ----
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/正极叫料.vue | 290 +++++++++++++++
代码管理/NEWCode/WIDESEAWCS_PDA/common/http.interceptor.js | 2
代码管理/NEWCode/WIDESEAWCS_PDA/pages/index/index.vue | 14
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs | 79 ++++
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/CZTaskDto.cs | 10
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/ITaskCZRepository.cs | 31 +
/dev/null | 194 ----------
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/PDA/PDAController.cs | 4
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskCZService.cs | 38 ++
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/TaskCZRepository.cs | 35 +
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/DtCZTask.cs | 2
13 files changed, 803 insertions(+), 290 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/common/http.interceptor.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/common/http.interceptor.js"
index 186e70a..e3caf08 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/common/http.interceptor.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/common/http.interceptor.js"
@@ -1,4 +1,4 @@
-let baseUrl = 'http://127.0.0.1:9291'
+let baseUrl = 'http://192.168.0.191:9291'
const install = (Vue, vm) => {
// 姝や负鑷畾涔夐厤缃弬鏁帮紝鍏蜂綋鍙傛暟瑙佷笂鏂硅鏄�
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages.json"
index 9bab3ba..99ce8a4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages.json"
@@ -4,112 +4,43 @@
},
"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
{
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "棣栭〉"
- }
- },
- {
- "path": "pages/home/home",
- "style": {
- "navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#E7F0FF"
- }
- },
- {
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "鐧诲綍"
}
- },
- {
- "path": "pages/createTask/CreateTask",
- "name": "createTask",
+ }, {
+ "path": "pages/index/index",
"style": {
- "navigationBarTitleText": "鍓嶆浠诲姟涓嬪彂",
- "navigationBarBackgroundColor": "#E7F0FF"
+ "navigationBarTitleText": "棣栭〉"
}
- },
- {
- "path": "pages/HCJSetting/HCJSetting",
- "name": "HCJSetting",
+ }, {
+ "path": "pages/home/home",
"style": {
- "navigationBarTitleText": "缂撳瓨鏋剁姸鎬佽缃�",
+ "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#E7F0FF"
}
}, {
- "path": "pages/setStatus/setStatus",
- "name": "setStatus",
+ "path": "pages/UpdatePassWord/UpdatePassWord",
"style": {
- "navigationBarTitleText": "缂撳瓨鏋剁姸鎬佽缃�",
- "navigationBarBackgroundColor": "#E7F0FF"
+ "navigationBarTitleText": "淇敼瀵嗙爜",
+ "enablePullDownRefresh": false
}
}, {
- "path": "pages/getTaskData/getTaskData",
- "name": "getTaskData",
+ "path": "pages/鍙枡/姝ｆ瀬鍙枡",
"style": {
- "navigationBarTitleText": "浠诲姟鏌ョ湅",
- "enablePullDownRefresh": true,
- "navigationBarBackgroundColor": "#E7F0FF"
+ "navigationBarTitleText": "姝ｆ瀬鍙枡",
+ "enablePullDownRefresh": false
}
}, {
- "path": "pages/createTask/onetotwo",
- "name": "onetotwo",
+ "path": "pages/鍙枡/璐熸瀬鍙枡",
"style": {
- "navigationBarTitleText": "鍒嗗垏鍚庝笂浜屾ゼ鏋佸嵎搴�",
- "navigationBarBackgroundColor": "#E7F0FF"
+ "navigationBarTitleText": "璐熸瀬鍙枡",
+ "enablePullDownRefresh": false
}
- }, {
- "path": "pages/createTask/jjkto1F",
- "name": "jjkto1F",
- "style": {
- "navigationBarTitleText": "涓�妤煎啿鍙犱换鍔＄敓鎴�",
- "navigationBarBackgroundColor": "#E7F0FF"
- }
- }, {
- "path": "pages/createTask/jjkto2F",
- "name": "jjkto2F",
- "style": {
- "navigationBarTitleText": "浜屾ゼ鍐插彔浠诲姟鐢熸垚",
- "navigationBarBackgroundColor": "#E7F0FF"
- }
- }, {
- "path": "pages/createTask/cbjtotb",
- "name": "cbjtotb",
- "style": {
- "navigationBarTitleText": "鎷嗗寘闂翠笅娑傚竷",
- "navigationBarBackgroundColor": "#E7F0FF"
- }
+
}
- ,{
- "path" : "pages/createTask/FQTOCD/FQTOCD",
- "style" :
- {
- "navigationBarTitleText": "鍒嗗垏->鍐插彔",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/UpdatePassWord/UpdatePassWord",
- "style" :
- {
- "navigationBarTitleText": "淇敼瀵嗙爜",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/LSMTask/LSMTask",
- "style" :
- {
- "navigationBarTitleText": "绌哄嵎绛�/閾濆鑶�",
- "enablePullDownRefresh": false
- }
-
- }
- ],
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uView",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/HCJSetting/HCJSetting.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/HCJSetting/HCJSetting.vue"
deleted file mode 100644
index 634ed06..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/HCJSetting/HCJSetting.vue"
+++ /dev/null
@@ -1,147 +0,0 @@
-<template>
- <view class="example">
- <!-- <u-tabs :list="list" :is-Scroll="false" :current="current"></u-tabs> -->
- <!-- <view v-show="current===0"> -->
- <!-- <uni-section title="缂撳瓨鏋剁姸鎬佽缃�" type="line" padding style="height: calc(100vh - 100px);"> -->
- <uni-forms ref="formup" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-easyinput v-model="baseFormData.HCJInput" focus placeholder="璇锋壂鎻忕紦瀛樻灦鏉＄爜"></uni-easyinput>
- </uni-forms-item>
- <uni-forms-item label="缂撳瓨鏋剁姸鎬�" label-width="120" required name="classes">
- <uni-data-select placeholder="璇烽�夋嫨缂撳瓨鏋剁姸鎬�" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍚敤/绂佺敤:" label-width="120" required name="status">
- <uni-data-checkbox v-model="baseFormData.status" :localdata="statuslist" />
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit">
- 璁剧疆鐘舵��
- </u-button>
- <!-- </uni-section> -->
- <!-- </view> -->
- </view>
-</template>
-<script>
- export default {
- data() {
- return {
- baseFormData: {
- HCJInput: '',
- classes: 'LocationState_Empty',
- status:0,
- ng: 0,
- pb: 0
- },
- dataTree: [{
- text: "鏈夎揣缂撳瓨鏋�",
- value: "LocationState_Stored",
- },
- {
- text: "鏃犺揣缂撳瓨鏋�",
- value: "LocationState_Empty",
- }
- ],
- formRules: {
- classes: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋剁姸鎬佷笉鑳戒负绌�'
- }]
- },
- HCJInput: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- },
- ng: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- },
- pb: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- }
- },
- list: [{
- name: '缂撳瓨鏋惰缃�'
- }],
- current: 0,
- // 鍗曢�夋暟鎹簮
- ngs: [{
- text: '鏄�',
- value: 1
- }, {
- text: '鍚�',
- value: 0
- }],
- // 鍗曢�夋暟鎹簮
- pbs: [{
- text: '鏄�',
- value: 1
- }, {
- text: '鍚�',
- value: 0
- }],
- // 鍗曢�夋暟鎹簮
- statuslist: [{
- text: '鍚敤',
- value: 0
- }, {
- text: '绂佺敤',
- value: 1
- }],
- }
- },
-
- methods: {
-
- // onClickItem(e) {
- // if (this.current != e.currentIndex) {
- // this.current = e.currentIndex;
- // }
- // },
- submit() {
- this.$refs.formup.validate().then((res) => {
- this.$t.message.loading()
- let formDataParam = {
- UpperCode: this.baseFormData.HCJInput,
- LocationState: this.baseFormData.classes,
- status:this.baseFormData.status
- // Ng: this.baseFormData.ng,
- // Pb: this.baseFormData.pb,
- }
- this.$u.post('/api/PDA/UpdateLocationState', formDataParam).then(res => {
- this.$t.message.closeLoading()
- if (res.status) {
- this.$t.message.toast(res.message)
- setTimeout(() => {
- this.baseFormData.HCJInput = ''
- this.baseFormData.classes = 'LocationState_Empty'
- }, 100);
- } else
- this.$t.message.toast(res.message)
-
- }).catch((err) => {
- this.$t.message.toast(res.message)
- })
- })
- }
-
- },
- }
-</script>
-
-<style lang="scss" scoped>
- .example {
- padding: 15px;
- background-color: #fff;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/LSMTask/LSMTask.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/LSMTask/LSMTask.vue"
deleted file mode 100644
index ec4c9b5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/LSMTask/LSMTask.vue"
+++ /dev/null
@@ -1,367 +0,0 @@
-<template>
- <view class="example">
- <!-- <u-tabs :list="list" :is-Scroll="false" :current="current2" @change="change"></u-tabs> -->
- <uni-segmented-control :current="current2" :values="list" @clickItem="change" styleType="button"
- activeColor="#4cd964"></uni-segmented-control>
- <view v-show="current2===0">
- <uni-section title="閫夋嫨鍐插彔鏈夎揣绌烘《鍥炴敹杞�,閫夋嫨鍒嗗垏鍚庢棤璐х┖妗跺洖鏀惰溅" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label-width="120" label="涓�妤�/浜屾ゼ" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-data-picker placeholder="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" popup-title="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label-width="120" label="姝ｆ瀬/璐熸瀬" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sexQ" :localdata="sexss" @change="checkboxs" />
- </uni-forms-item>
- <uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex2" :localdata="sexs2" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="1F鍐插彔鏉＄爜" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨1F鍐插彔缂撳瓨鏋舵潯鐮�" popup-title="璇烽�夋嫨1F鍐插彔缂撳瓨鏋舵潯鐮�" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit()">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- <view v-show="current2===1">
- <uni-section title="閫夋嫨鍒嗗垏鍚庢湁璐х┖妗跺洖鏀惰溅,閫夋嫨鍐插彔鏃犺揣绌烘《鍥炴敹杞�" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label-width="120" label="姝ｆ瀬/璐熸瀬" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sexQ" :localdata="sexss" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="绌烘《鍥炴敹杞�" label-width="120" required name="HCJInput">
- <uni-data-picker placeholder="璇烽�夋嫨鍒嗗垏绌烘《鍥炴敹杞�" popup-title="璇烽�夋嫨鍒嗗垏绌烘《鍥炴敹杞�" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label-width="120" label="涓�妤�/浜屾ゼ" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" @change="checkboxs" />
- </uni-forms-item>
- <uni-forms-item label="1F/2F绌烘《鍥炴敹杞�" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨1F/2F绌烘《鍥炴敹杞�" popup-title="璇烽�夋嫨1F/2F绌烘《鍥炴敹杞�" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit()">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- <view v-show="current2===2">
- <uni-section title="閫夋嫨鎷嗗寘闂存湁璐ч摑濉戣啘鏌�,閫夋嫨1F/2F鏃犺揣閾濆鑶滄煖" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label="鎷嗗寘闂撮摑濉戣啘鏌�" label-width="120" required name="HCJInput">
- <uni-data-picker placeholder="璇烽�夋嫨鎷嗗寘闂撮摑濉戣啘鏌�" popup-title="璇烽�夋嫨鎷嗗寘闂撮摑濉戣啘鏌�" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label-width="120" label="涓�妤�/浜屾ゼ" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" @change="checkboxs" />
- </uni-forms-item>
- <uni-forms-item label="1F/2F閾濆鑶滄煖" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨1F/2F閾濆鑶滄煖" popup-title="璇烽�夋嫨1F/2F閾濆鑶滄煖" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit()">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- <view v-show="current2===3">
- <uni-section title="閫夋嫨1F/2F鏈夎揣閾濆鑶滄煖,閫夋嫨鎷嗗寘闂存棤璐ч摑濉戣啘鏌�" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label-width="120" label="涓�妤�/浜屾ゼ" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="1F/2F閾濆鑶滄煖" label-width="120" required name="HCJInput">
- <uni-data-picker placeholder="璇烽�夋嫨1F/2F閾濆鑶滄煖" popup-title="璇烽�夋嫨1F/2F閾濆鑶滄煖" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label="鎷嗗寘闂撮摑濉戣啘鏌�" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨鎷嗗寘闂撮摑濉戣啘鏌�" popup-title="璇烽�夋嫨鎷嗗寘闂撮摑濉戣啘鏌�" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit()">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseFormData: {
- HCJInput: '',
- classes: '',
- sex: '1F',
- sexQ: 'ZJ'
- },
- list: ['鍐插彔绌烘《鍥炴敹', '鍒嗗垏绌烘《鍥炴敹', 'CBJ閾濆鑶滄煖', '涓閾濆鑶滄煖'],
- dataTree: [],
- HCJInputTree: [],
- sexs: [{
- text: '涓�妤�',
- value: '1F'
- }, {
- text: '浜屾ゼ',
- value: '2F'
- }],
- sexss: [{
- text: '姝ｆ瀬',
- value: 'ZJ'
- }, {
- text: '璐熸瀬',
- value: 'FJ'
- }],
- formRules: {
- classes: {
- rules: [{
- required: true,
- errorMessage: '璁惧缂栧彿涓嶈兘涓虹┖'
- }]
- },
- HCJInput: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- },
- },
- current2: 0,
- flag: false
- }
- },
- onLoad() {
- this.onload(0)
- },
- methods: {
- change(index) {
- if (this.current2 != index.currentIndex) {
- this.current2 = index.currentIndex;
- if (this.current2 === 2) {
- this.flag = true
- this.onload(this.current2)
- } else {
- this.flag = false
- this.onload(this.current2)
- }
- }
- },
- checkbox(e) {
- this.onload(this.current2)
- },
- checkboxs(e) {
- this.input(this.baseFormData.HCJInput)
- },
- onchange(e) {
- const value = e.detail.value
- this.input(value[0].value)
- },
- input(e) {
- if (e.length === 9 && e.includes('KJT')) {
- let upcode = '';
- if (this.baseFormData.sexQ == 'ZJ')
- upcode = 'ZJFQ-KJT001'
- else
- upcode = 'FJFQ-KJT001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "KJT",
- LocationState: "LocationState_Empty"
- }
- this.$u.post('/biz/location/GetDynamicAsync', formDataParam).then(res => {
- if (res.data != null) {
- this.dataTree = res.data;
- }
- })
- } else if (e.length === 11 && e.includes('FQ-KJT')) {
- let upcode = '';
- if (this.baseFormData.sex == '1F')
- upcode = '1F-KJT001'
- else
- upcode = '2F-KJT001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "KJT",
- LocationState: "LocationState_Empty"
- }
- this.$u.post('/biz/location/GetDynamicAsync', formDataParam).then(res => {
- if (res.data != null) {
- this.dataTree = res.data;
- }
- })
- } else if (e.length === 9 && e.includes('CBJLSM')) {
- let upcode = '';
- if (this.baseFormData.sex == '1F')
- upcode = '1F-LSM001'
- else
- upcode = '2F-LSM001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "LSM",
- LocationState: "LocationState_Empty"
- }
- this.$u.post('/biz/location/GetDynamicAsync', formDataParam).then(res => {
- if (res.data != null) {
- this.dataTree = res.data;
- }
- })
- } else if (e.length === 9 && e.includes('F-LSM')) {
- let formDataParam = {
- UpperCode: "CBJLSM001",
- Type: "LSM",
- LocationState: "LocationState_Empty"
- }
- this.$u.post('/biz/location/GetDynamicAsync', formDataParam).then(res => {
- if (res.data != null) {
- this.dataTree = res.data;
- }
- })
- }
- },
- submit() {
- this.$refs.form.validate().then((res) => {
- this.$t.message.loading()
- if (this.flag) {
- if (this.baseFormData.HCJInput.includes('1F-CDHCJ')) {
- let s = this.baseFormData.HCJInput.replace("SL", "XL");
- this.baseFormData.HCJInput = s
- }
- } else {
- if (this.baseFormData.HCJInput.includes('1F-CDHCJ')) {
- let s = this.baseFormData.HCJInput.replace("XL", "SL");
- this.baseFormData.HCJInput = this.baseFormData.classes
- this.baseFormData.classes = s
- }
- }
- let AgvCode = "涓AGV"
- let formDataParam = {}
- formDataParam = {
- AgvCode: AgvCode,
- AgvFromAddress: this.baseFormData.HCJInput,
- AgvToAddress: this.baseFormData.classes,
- AgvBarcode: '',
- AgvGrade: "1",
- AgvTaskQty: '1',
- AgvTaskState: "Create",
- AgvTaskType: 'TaskType_Outbound',
- AgvWorkType: '1'
- }
- this.$u.post('/biz/agvtask/CreatePDATask', formDataParam).then(res => {
- this.$t.message.closeLoading()
- if (res.code === 200) {
- this.$t.message.toast(res.data)
- setTimeout(() => {
- this.baseFormData.HCJInput = ''
- this.baseFormData.classes = ''
- }, 100);
- } else
- this.$t.message.toast(res.msg)
-
- }).catch((err) => {
- this.$t.message.toast(res.msg)
- })
- })
- },
- onload(index) {
- if (index === 0) {
- let upcode = '';
- if (this.baseFormData.sex == '1F')
- upcode = '1F-KJT001'
- else
- upcode = '2F-KJT001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "KJT",
- LocationState: "LocationState_Stored"
- }
- this.$u.post('/biz/location/GetDynamicAsync', formDataParam).then(res => {
- if (res.data != null) {
- this.HCJInputTree = res.data;
- } else {
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else if (index === 1) {
- let upcode = '';
- if (this.baseFormData.sexQ == 'ZJ')
- upcode = 'ZJFQ-KJT001'
- else
- upcode = 'FJFQ-KJT001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "KJT",
- LocationState: "LocationState_Stored"
- }
- this.$u.post('/biz/location/GetDynamicAsync', formDataParam).then(res => {
- if (res.data != null) {
- this.HCJInputTree = res.data;
- } else {
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else if (index === 2) {
- let upcode = 'CBJLSM001';
- let formDataParam = {
- UpperCode: upcode,
- Type: "LSM",
- LocationState: "LocationState_Stored"
- }
- this.$u.post('/biz/location/GetDynamicAsync', formDataParam).then(res => {
- if (res.data != null) {
- this.HCJInputTree = res.data;
- } else {
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else if (index === 3) {
- let upcode = '';
- if (this.baseFormData.sex == '1F')
- upcode = '1F-LSM001'
- else
- upcode = '2F-LSM001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "LSM",
- LocationState: "LocationState_Stored"
- }
- this.$u.post('/biz/location/GetDynamicAsync', formDataParam).then(res => {
- if (res.data != null) {
- this.HCJInputTree = res.data;
- } else {
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- }
- }
- }
- }
-</script>
-
-<style>
- .example {
- padding: 15px;
- background-color: #fff;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/CreateTask.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/CreateTask.vue"
deleted file mode 100644
index 0db5fa6..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/CreateTask.vue"
+++ /dev/null
@@ -1,366 +0,0 @@
-<template>
- <view class="example">
- <uni-segmented-control :current="current" :values="list" @clickItem="onClickItem" styleType="button"
- activeColor="#5500ff"></uni-segmented-control>
- <view v-show="current===0">
- <uni-section title="涓婃枡浠诲姟娣诲姞" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label-width="120" label="姝ｆ瀬/璐熸瀬" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sexQ" :localdata="sexss" @change="checkbox" />
-
- </uni-forms-item><uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sexQ2" :localdata="sexss2" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="璁惧绫诲瀷" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨璁惧绫诲瀷" popup-title="璇烽�夋嫨闇�瑕佷笂鏂欑殑璁惧绫诲瀷" :localdata="dataTreeType"
- v-model="baseFormData.classesType" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <!-- <uni-easyinput v-model="baseFormData.HCJInput" placeholder="璇锋壂鎻忕紦瀛樻灦鏉＄爜" /> -->
- <uni-data-picker placeholder="璇烽�夋嫨缂撳瓨鏋舵潯鐮�" popup-title="璇烽�夋嫨缂撳瓨鏋舵潯鐮�" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput" @change="input">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label="涓昏澶囩紪鍙�" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨璁惧" popup-title="璇烽�夋嫨闇�瑕佷笂鏂欑殑璁惧" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit(1,'form')">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- <view v-show="current===1">
- <uni-section title="涓嬫枡浠诲姟娣诲姞" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form1" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label-width="120" label="姝ｆ瀬/璐熸瀬" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sexQ" :localdata="sexss" @change="checkbox" />
- </uni-forms-item>
- </uni-forms-item><uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sexQ2" :localdata="sexss2" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="璁惧绫诲瀷" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨璁惧绫诲瀷" popup-title="璇烽�夋嫨闇�瑕佷笅鏂欑殑璁惧绫诲瀷" :localdata="dataTreeType1"
- v-model="baseFormData.classesType" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label="涓昏澶囩紪鍙�" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨璁惧" popup-title="璇烽�夋嫨闇�瑕佷笂鏂欑殑璁惧" :localdata="dataTree"
- v-model="baseFormData.classes" @change="input">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <!-- <uni-easyinput v-model="baseFormData.HCJInput" placeholder="璇锋壂鎻忕紦瀛樻灦鏉＄爜" /> -->
- <uni-data-picker placeholder="璇烽�夋嫨缂撳瓨鏋舵潯鐮�" popup-title="璇烽�夋嫨缂撳瓨鏋舵潯鐮�" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit(2,'form1')">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseFormData: {
- HCJInput: '',
- classes: '',
- sexQ: 'ZJ',
- sexQ2: '1',
- classesType: ''
- },
- HCJInputTree: [],
- sexss: [{
- text: '姝ｆ瀬',
- value: 'ZJ'
- }, {
- text: '璐熸瀬',
- value: 'FJ'
- }],
- sexss2: [{
- text: '涓�绾�',
- value: '1'
- }, {
- text: '浜岀嚎',
- value: '2'
- }],
- dataTreeType: [{
- text: "娑傚竷",
- value: "TB",
- },
- {
- text: "杈婂帇",
- value: "GY",
- }, {
- text: "鍒嗗垏",
- value: "FQ",
- }
- ],
- dataTreeType1: [{
- text: "娑傚竷",
- value: "TB",
- },
- {
- text: "杈婂帇",
- value: "GY",
- }
- ],
- dataTree: [],
- formRules: {
- classes: {
- rules: [{
- required: true,
- errorMessage: '璁惧缂栧彿涓嶈兘涓虹┖'
- }]
- },
- HCJInput: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- }
- },
- formRules1: {
- classes: {
- rules: [{
- required: true,
- errorMessage: '璁惧缂栧彿涓嶈兘涓虹┖'
- }]
- },
- HCJInput: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- }
- },
- list: ['涓婃枡浠诲姟', '涓嬫枡浠诲姟'],
- current: 0
- }
- },
- onLoad() {
- this.onload(0)
- },
- methods: {
- onClickItem(e) {
- if (this.current != e.currentIndex) {
- this.current = e.currentIndex;
- }
- this.dataTree = [];
- this.HCJInputTree = []
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.classesType = '';
- this.baseFormData.sexQ = 'ZJ';
- this.baseFormData.sexQ2 = '1';
- this.HCJInputTree = [];
- },
- onchange(e) {
- const value = e.detail.value
- this.onload(this.current)
- },
- checkbox(e) {
- this.onload(this.current)
- },
- submit(root, ref) {
- this.$refs[ref].validate().then((res) => {
- this.$t.message.loading()
- let bz = this.baseFormData.HCJInput.split('-')[0];
- let sbCode = bz + '-' + this.baseFormData.classes
- let AgvCode = bz == "ZJSL" ? "姝ｆ瀬1鍙稟GV" : "璐熸瀬1鍙稟GV"
- let formDataParam = {}
- if (root == 1) {
- formDataParam = {
- AgvCode: AgvCode,
- AgvFromAddress: this.baseFormData.HCJInput,
- AgvToAddress: sbCode,
- AgvBarcode: '',
- AgvGrade: "1",
- AgvTaskQty: '1',
- AgvTaskState: "Create",
- AgvTaskType: 'TaskType_Outbound',
- AgvWorkType: '1',
- AgvLine: this.baseFormData.sex2
- }
- } else {
- let sd = bz.replace('S', 'X')
- let sbCode1 = sd + '-' + this.baseFormData.classes
- formDataParam = {
- AgvCode: AgvCode,
- AgvFromAddress: sbCode1,
- AgvToAddress: this.baseFormData.HCJInput,
- AgvBarcode: '',
- AgvGrade: "1",
- AgvTaskQty: '1',
- AgvTaskState: "Create",
- AgvTaskType: 'TaskType_Outbound',
- AgvWorkType: '1',
- AgvLine: this.baseFormData.sex2
- }
- }
- this.$u.post('/api/PDA/CreatePDATask', formDataParam).then(res => {
- this.$t.message.closeLoading()
- console.log(res);
- if (res.status) {
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.classesType = '';
- this.baseFormData.sexQ = 'ZJ';
- this.baseFormData.sexQ2 = '1';
- this.$t.message.toast(res.message);
- this.HCJInputTree = [];
- // setTimeout(() => {
- console.log(this.HCJInputTree)
- // }, 100);
-
- } else {
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.classesType = '';
- this.baseFormData.sexQ = 'ZJ';
- this.baseFormData.sexQ2 = '1';
- this.HCJInputTree = [];
- this.$t.message.toast(res.message)
- }
-
-
- }).catch((err) => {
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.classesType = '';
- this.baseFormData.sexQ = 'ZJ';
- this.baseFormData.sexQ2 = '1';
- this.$t.message.toast(res.message)
- })
- })
- },
- onload(index) {
- if (index === 0) {
-
-
- let upcode = '';
- if (this.baseFormData.sexQ == 'ZJ')
- upcode = 'ZJSL-' + this.baseFormData.classesType + 'HCJ001'
- else
- upcode = 'FJSL-' + this.baseFormData.classesType + 'HCJ001'
- let formDataParam = {
- UpperCode: upcode,
- Type: this.baseFormData.classesType,
- LocationState: "LocationState_Stored",
- RunLine: this.baseFormData.sexQ2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
-
- if (res != undefined) {
- this.HCJInputTree = res;
- } else {
- this.HCJInputTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else if (index === 1) {
- if (this.baseFormData.classesType === 'TB') {
- this.dataTree = [{
- text: "娑傚竷璁惧1鍙�",
- value: "TBSB001",
- },
- {
- text: "娑傚竷璁惧2鍙�",
- value: "TBSB002",
- },
- ]
- } else if (this.baseFormData.classesType === 'GY') {
- this.dataTree = [{
- text: "杈婂帇璁惧1鍙�",
- value: "GYSB001",
- },
- {
- text: "杈婂帇璁惧2鍙�",
- value: "GYSB002",
- },
- ]
- }
- }
- },
- input() {
- if (this.current === 0) {
- if (this.baseFormData.classesType === 'TB') {
- this.dataTree = [{
- text: "娑傚竷璁惧1鍙�",
- value: "TBSB001",
- },
- {
- text: "娑傚竷璁惧2鍙�",
- value: "TBSB002",
- },
- ]
- } else if (this.baseFormData.classesType === 'GY') {
- this.dataTree = [{
- text: "杈婂帇璁惧1鍙�",
- value: "GYSB001",
- },
- {
- text: "杈婂帇璁惧2鍙�",
- value: "GYSB002",
- },
- ]
- } else if (this.baseFormData.classesType === 'FQ') {
- this.dataTree = [{
- text: "鍒嗗垏璁惧1鍙�",
- value: "FQSB001",
- },
- {
- text: "鍒嗗垏璁惧2鍙�",
- value: "FQSB002",
- }
- ]
- }
- } else if (this.current === 1) {
- let upcode = '';
- let type = ''
- if (this.baseFormData.classesType === 'TB')
- type = 'GY'
- else if (this.baseFormData.classesType === 'GY')
- type = 'FQ'
- if (this.baseFormData.sexQ == 'ZJ')
- upcode = 'ZJSL-' + type + 'HCJ001'
- else
- upcode = 'FJSL-' + type + 'HCJ001'
- let formDataParam = {
- UpperCode: upcode,
- Type: type,
- LocationState: "LocationState_Empty",
- RunLine: this.baseFormData.sexQ2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
- this.HCJInputTree = res;
- } else {
- this.HCJInputTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- }
- }
- },
-
- }
-</script>
-
-<style lang="scss" scoped>
- .example {
- padding: 15px;
- background-color: #fff;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/FQTOCD/FQTOCD.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/FQTOCD/FQTOCD.vue"
deleted file mode 100644
index ee50b92..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/FQTOCD/FQTOCD.vue"
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
- <view class="example">
- <!-- <u-tabs :list="list" :is-Scroll="false" :current="current2" @change="change"></u-tabs> -->
- <uni-segmented-control :current="current2" :values="list" @clickItem="change" styleType="button"
- activeColor="#4cd964"></uni-segmented-control>
- <view v-show="current2===0">
- <uni-section title="鎵弿鍒嗗垏缂撳瓨鏋�,閫夋嫨1F鍐插彔缂撳瓨鏋�" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-easyinput v-model="baseFormData.HCJInput" placeholder="璇锋壂鎻忓垎鍒囩紦瀛樻灦鏉＄爜" @input="input" />
- </uni-forms-item>
- <uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs2" required>
- <uni-data-checkbox v-model="baseFormData.sex2" :localdata="sexs2" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="1F鍐插彔鏉＄爜" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨1F鍐插彔缂撳瓨鏋舵潯鐮�" popup-title="璇烽�夋嫨1F鍐插彔缂撳瓨鏋舵潯鐮�" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit()">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- <view v-show="current2===1">
- <uni-section title="鎵弿鍒嗗垏缂撳瓨鏋�,閫夋嫨2F鍐插彔缂撳瓨鏋�" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-easyinput v-model="baseFormData.HCJInput" placeholder="璇锋壂鎻忓垎鍒囩紦瀛樻灦鏉＄爜" @input="input1" />
- </uni-forms-item>
- <uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs2" required>
- <uni-data-checkbox v-model="baseFormData.sex2" :localdata="sexs2" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="2F鍐插彔鏉＄爜" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨2F鍐插彔缂撳瓨鏋舵潯鐮�" popup-title="璇烽�夋嫨2F鍐插彔缂撳瓨鏋舵潯鐮�" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit()">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseFormData: {
- HCJInput: '',
- classes: '',
- sex2: '1'
- },
- list: ['涓�妤煎啿鍙�', '浜屾ゼ鍐插彔'],
- dataTree: [],
- sexs2: [{
- text: '涓�绾�',
- value: '1'
- }, {
- text: '浜岀嚎',
- value: '2'
- }],
- formRules: {
- classes: {
- rules: [{
- required: true,
- errorMessage: '璁惧缂栧彿涓嶈兘涓虹┖'
- }]
- },
- HCJInput: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- }
- },
- current2: 0,
- flag: false
- }
- },
- methods: {
- change(index) {
- if (this.current2 != index.currentIndex) {
- this.current2 = index.currentIndex;
- if (this.current2 === 2) {
- this.flag = true
- } else {
- this.flag = false
- }
- }
- this.baseFormData.HCJInput='';
- this.baseFormData.classes='';
- this.baseFormData.sex2='1';
- this.dataTree=[];
- },
- input(e) {
-
- if(!e.includes('XL-FQHCJ')){
- return this.$t.message.toast("鏉＄爜閿欒")
- }
- let formDataParam = {
- UpperCode: e,
- Type: "1-CDHCJ",
- LocationState: "LocationState_Empty",
- RunLine:this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
-
- this.dataTree = res;
- }else{
- this.dataTree =[];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- },
- input1(e) {
-
- if(!e.includes('XL-FQHCJ')){
- return this.$t.message.toast("鏉＄爜閿欒")
- }
- let formDataParam = {
- UpperCode: e,
- Type: "2-CDHCJ",
- LocationState: "LocationState_Empty",
- RunLine:this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
- this.dataTree = res;
- }else{
- this.dataTree =[];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- },
- submit() {
- this.$refs.form.validate().then((res) => {
- this.$t.message.loading()
- console.log(this.baseFormData.HCJInput)
- console.log(this.baseFormData.classes)
- let AgvCode = "涓1鍙稟GV"
- let formDataParam = {}
- formDataParam = {
- AgvCode: AgvCode,
- AgvFromAddress: this.baseFormData.HCJInput,
- AgvToAddress: this.baseFormData.classes,
- AgvBarcode: '',
- AgvGrade: "1",
- AgvTaskQty: '1',
- AgvTaskState: "Create",
- AgvTaskType: 'TaskType_Outbound',
- AgvWorkType: '1',
- AgvLine:this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/CreatePDATask', formDataParam).then(res => {
- this.$t.message.closeLoading()
- if (res.status) {
- this.$t.message.toast(res.message)
- setTimeout(() => {
- this.baseFormData.HCJInput = ''
- this.baseFormData.classes = ''
- this.baseFormData.sex2='1'
- }, 100);
- } else
- this.$t.message.toast(res.message)
-
- }).catch((err) => {
- this.$t.message.toast(res.message)
- })
- })
- }
- }
- }
-</script>
-
-<style>
- .example {
- padding: 15px;
- background-color: #fff;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/cbjtotb.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/cbjtotb.vue"
deleted file mode 100644
index 917596a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/cbjtotb.vue"
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
- <view class="example">
- <u-tabs :list="list" :is-Scroll="false" :current="current2"></u-tabs>
- <view v-show="current2===0">
- <uni-section title="涓婃枡浠诲姟娣诲姞" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label="鎻愬崌鏈轰笅鏂欏彛" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨姝ｈ礋鏋佺當鏉愭彁鍗囨満涓嬫枡鍙�" popup-title="璇烽�夋嫨姝ｈ礋鏋佹彁鍗囨満涓嬫枡鍙�" :localdata="dataTree"
- v-model="baseFormData.classes" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs2" required>
- <uni-data-checkbox v-model="baseFormData.sex2" :localdata="sexs2" @change="onchange" />
- </uni-forms-item>
-
- <uni-forms-item label="娑傚竷涓婃枡缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-data-picker placeholder="璇烽�夋嫨娑傚竷涓婃枡缂撳瓨鏋舵潯鐮�" popup-title="璇烽�夋嫨娑傚竷涓婃枡缂撳瓨鏋舵潯鐮�" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput">
- </uni-data-picker>
- </uni-forms-item>
-
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit()">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseFormData: {
- HCJInput: '',
- classes: '',
- sex2: '1'
- },
- list: [{
- name: '鎷嗗寘闂村幓娑傚竷浠诲姟娣诲姞'
- }],
- sexs2: [{
- text: '涓�绾�',
- value: '1'
- }, {
- text: '浜岀嚎',
- value: '2'
- }],
- HCJInputTree: [],
- dataTree: [{
- text: '姝ｆ瀬鎻愬崌鏈轰笅鏂欏彛',
- value: 'ZJSL-BCTSJSB001'
- }, {
- text: '璐熸瀬鎻愬崌鏈轰笅鏂欏彛',
- value: 'FJSL-BCTSJSB001'
- }],
- formRules: {
- classes: {
- rules: [{
- required: true,
- errorMessage: ' 鎻愬崌鏈轰笅鏂欏彛涓嶈兘涓虹┖'
- }]
- },
- HCJInput: {
- rules: [{
- required: true,
- errorMessage: '娑傚竷涓婃枡缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- }
- },
- current2: 0,
- }
- },
- methods: {
- onchange(){
- let upcode = '';
- if (this.baseFormData.classes.includes('ZJ') )
- {
- upcode = 'ZJSL-TBHCJ001';
-
- }
- else if(this.baseFormData.classes.includes('FJ') ){
- upcode = 'FJSL-TBHCJ001'
-
- }
- let formDataParam = {
- UpperCode: upcode,
- Type: "TBHCJ",
- LocationState: "LocationState_Empty",
- RunLine:this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
-
- if (res != undefined) {
- this.HCJInputTree = res;
- } else {
- this.HCJInputTree=[];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- },
- input(e) {
- if (e.length === 13 && e.includes('TBHCJ')) {
- let formDataParam = {
- UpperCode: e,
- Type:"TBHCJ",
- LocationState: "LocationState_Empty",
- RunLine:this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
- this.dataTree = res;
- }else{
-
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- }
- },
- submit() {
- this.$refs.form.validate().then((res) => {
- this.$t.message.loading()
- let bz = this.baseFormData.HCJInput.split('-')[0];
- let AgvCode = bz == "ZJSL" ? "姝ｆ瀬1鍙稟GV" : "璐熸瀬1鍙稟GV"
- let formDataParam = {}
- formDataParam = {
- AgvCode: AgvCode,
- AgvFromAddress:this.baseFormData.classes ,
- AgvToAddress: this.baseFormData.HCJInput,
- AgvBarcode: '',
- AgvGrade: "1",
- AgvTaskQty: '1',
- AgvTaskState: "Create",
- AgvTaskType: 'TaskType_Outbound',
- AgvWorkType: '1',
- AgvLine:this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/CreatePDATask', formDataParam).then(res => {
- this.$t.message.closeLoading()
- console.log(res);
- if (res.status) {
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes= '';
-
- this.baseFormData.sexQ2= '1';
- this.$t.message.toast(res.message);
- this.HCJInputTree=[];
- // setTimeout(() => {
- console.log(this.HCJInputTree)
- // }, 100);
-
- } else{this.baseFormData.HCJInput = '';
- this.baseFormData.classes= '';
- this.baseFormData.classesType='';
- this.baseFormData.sexQ='ZJ';
- this.baseFormData.sexQ2= '1';
- this.HCJInputTree=[];
- this.$t.message.toast(res.message)}
-
-
- }).catch((err) => {
- this.$t.message.toast(res.msg)
- })
- })
- }
- }
- }
-</script>
-
-<style>
- .example {
- padding: 15px;
- background-color: #fff;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/jjkto1F.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/jjkto1F.vue"
deleted file mode 100644
index 85df98a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/jjkto1F.vue"
+++ /dev/null
@@ -1,383 +0,0 @@
-<template>
- <view class="example">
- <!-- <u-tabs :list="list" :is-Scroll="false" :current="current2" @change="change"></u-tabs> -->
- <uni-segmented-control :current="current2" :values="list" @clickItem="change" styleType="button"
- activeColor="#4cd964"></uni-segmented-control>
- <view v-show="current2===0">
- <uni-section title="閫夋嫨鏋佸嵎搴撴湁璐х紦瀛樻灦,閫夋嫨鍐插彔杞﹂棿鏃犺揣缂撳瓨鏋�" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <!-- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-easyinput v-model="baseFormData.HCJInput" placeholder="璇锋壂鎻忕紦瀛樻灦鏉＄爜" @input="input" />
- </uni-forms-item> -->
- <uni-forms-item label-width="120" label="姝ｈ礋鏋�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex2" :localdata="sexs2" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-data-picker placeholder="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" popup-title="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label="1F鍐插彔鏉＄爜" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨1F鍐插彔缂撳瓨鏋舵潯鐮�" popup-title="璇烽�夋嫨1F鍐插彔缂撳瓨鏋舵潯鐮�" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit(0)">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- <view v-show="current2===1">
- <uni-section title="閫夋嫨鍐插彔杞﹂棿鏃犺揣缂撳瓨鏋�,閫夋嫨鏋佸嵎搴撴湁璐х紦瀛樻灦" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <!-- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-easyinput v-model="baseFormData.HCJInput" placeholder="璇锋壂鎻忕紦瀛樻灦鏉＄爜" @input="input" />
- </uni-forms-item> -->
- <uni-forms-item label-width="120" label="姝ｈ礋鏋�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex2" :localdata="sexs2" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-data-picker placeholder="璇烽�夋嫨鍐插彔杞﹂棿缂撳瓨鏋舵潯鐮�" popup-title="璇烽�夋嫨鍐插彔杞﹂棿缂撳瓨鏋舵潯鐮�" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label="鏋佸嵎搴撴潯鐮�" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" popup-title="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit(1)">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- <view v-show="current2===2">
- <uni-section title="鎵弿鍐插彔杞﹂棿缂撳瓨鏋�,閫夋嫨鍐插彔璁惧" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <!-- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-easyinput v-model="baseFormData.HCJInput" placeholder="璇锋壂鎻忕紦瀛樻灦鏉＄爜" @input="input" />
- </uni-forms-item> -->
- <uni-forms-item label-width="120" label="姝ｈ礋鏋�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex2" :localdata="sexs2" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-data-picker placeholder="璇烽�夋嫨鍐插彔杞﹂棿缂撳瓨鏋舵潯鐮�" popup-title="璇烽�夋嫨鍐插彔杞﹂棿缂撳瓨鏋舵潯鐮�" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label="1F鍐插彔璁惧" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨鍐插彔璁惧" popup-title="璇烽�夋嫨鍐插彔璁惧" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- <!-- <uni-data-picker
- placeholder="璇烽�夋嫨鍐插彔璁惧"
- popup-title="璇烽�夋嫨鍐插彔璁惧"
- :localdata="dataTree"
- v-model="baseFormData.classes"
- ></uni-data-picker> -->
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit(2)">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseFormData: {
- HCJInput: '',
- classes: '',
- sex: 'ZJ',
- sex2: '1'
- },
- list: ['鏋佸嵎搴�', '鍐插彔杞﹂棿', '鍐插彔璁惧'],
- dataTree: [],
-
- HCJInputTree: [],
- sexs: [{
- text: '姝ｆ瀬',
- value: 'ZJ'
- }, {
- text: '璐熸瀬',
- value: 'FJ'
- }],
- sexs2: [{
- text: '涓�绾�',
- value: '1'
- }, {
- text: '浜岀嚎',
- value: '2'
- }],
- formRules: {
- classes: {
- rules: [{
- required: true,
- errorMessage: '璁惧缂栧彿涓嶈兘涓虹┖'
- }]
- },
- HCJInput: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- },
- },
- current2: 0,
- flag: false
- }
- },
- onLoad() {
- this.onload(0)
- },
- methods: {
- change(index) {
- if (this.current2 != index.currentIndex) {
- if (index.currentIndex == 2) {
- this.current2 = index.currentIndex;
- this.flag = true;
- this.onload(this.current2)
- } else {
- this.current2 = index.currentIndex;
- this.flag = false
- this.onload(this.current2)
- }
-
- }
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.sex = 'ZJ';
- this.baseFormData.sex2 = '1';
- this.dataTree = [];
- this.HCJInputTree = [];
- },
- checkbox(e) {
- this.onload(this.current2)
- },
- onchange(e) {
- const value = e.detail.value
- this.input(value[0].value)
- },
- input(e) {
- // console.log(e)
- if (e.length === 13 && e.includes('JJHCJ')) {
- let formDataParam = {
- UpperCode: e,
- Type: "1-CDHCJ",
- LocationState: "LocationState_Empty",
- RunLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
- this.dataTree = [];
- this.dataTree = res;
- } else {
- this.dataTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else if (e.length === 15 && e.includes('1-') && e.includes('CDHCJ')) {
- if (this.flag) {
- let formDataParam = {
- DeviceUpCode: e
- }
- this.$u.get('/api/PDA/GetDevDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
- this.dataTree = res;
- } else {
- this.dataTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else {
- let formDataParam = {
- UpperCode: e,
- Type: "JJHCJ",
- LocationState: "LocationState_Stored",
- RunLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
- this.dataTree = res;
- } else {
- this.dataTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- }
- }
- },
- submit(index) {
- this.$refs.form.validate().then((res) => {
- debugger;
- this.$t.message.loading()
- // if (this.flag) {
- // if (this.baseFormData.HCJInput.includes('1-') && this.baseFormData.HCJInput.includes(
- // 'CDHCJ')) {
- // let s = this.baseFormData.HCJInput.replace("SL", "XL");
- // this.baseFormData.HCJInput = s
- // }
- // }
- // else {
- // if (this.baseFormData.HCJInput.includes('1F-CDHCJ')) {
- // let s = this.baseFormData.HCJInput.replace("XL", "SL");
- // this.baseFormData.HCJInput = this.baseFormData.classes
- // this.baseFormData.classes = s
- // }
- // }
- let AgvCode = "涓1鍙稟GV"
- let formDataParam = {}
- formDataParam = {
- AgvCode: AgvCode,
- AgvFromAddress: this.baseFormData.HCJInput,
- AgvToAddress: this.baseFormData.classes,
- AgvBarcode: '',
- AgvGrade: "1",
- AgvTaskQty: '1',
- AgvTaskState: "Create",
- AgvTaskType: 'TaskType_Outbound',
- AgvWorkType: '1',
- AgvLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/CreatePDATask', formDataParam).then(res => {
- this.$t.message.closeLoading()
- if (res.status) {
- this.$t.message.toast(res.message)
- // setTimeout(() => {
- // var HCJInputTreedata=this.HCJInputTree.filter(x => x.value !=this.baseFormData.HCJInput);
- // this.HCJInputTree=HCJInputTreedata;
- // var dataTreedata=this.dataTree.filter(x => x.value !=this.baseFormData.classes);
- // this.dataTree =dataTreedata;
- // }, 100);
- setTimeout(() => {
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.sex = 'ZJ';
- this.dataTree = [];
- this.HCJInputTree = [];
- this.baseFormData.sex2 = '1';
- this.onload(index);
- }, 100);
- } else {
- this.$t.message.toast(res.message)
- setTimeout(() => {
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.sex = 'ZJ';
- this.dataTree = [];
- this.HCJInputTree = [];
- this.baseFormData.sex2 = '1';
- this.onload(index);
- }, 100);
- }
-
-
- }).catch((err) => {
- this.$t.message.toast(res.message)
- setTimeout(() => {
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.sex = 'ZJ';
- this.dataTree = [];
- this.HCJInputTree = [];
- this.baseFormData.sex2 = '1';
- this.onload(index);
- }, 100);
- })
-
- });
-
- },
- onload(index) {
- if (index === 0) {
- let upcode = '';
- if (this.baseFormData.sex == 'ZJ')
- upcode = 'ZJSL-JJHCJ001'
- else
- upcode = 'FJSL-JJHCJ001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "JJHCJ",
- LocationState: "LocationState_Stored",
- RunLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
- this.HCJInputTree = res;
- console.log(this.HCJInputTree)
- } else {
- this.HCJInputTree = []
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else if (index === 1) {
- let upcode = '';
- if (this.baseFormData.sex == 'ZJ')
- upcode = '1-ZJSL-CDHCJ001'
- else
- upcode = '1-FJSL-CDHCJ001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "1-CDHCJ",
- LocationState: "LocationState_Empty",
- RunLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- console.log(res)
- if (res != undefined) {
- this.HCJInputTree = res;
- } else {
- this.HCJInputTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else if (index === 2) {
- let upcode = '';
- if (this.baseFormData.sex == 'ZJ')
- upcode = '1-ZJSL-CDHCJ001'
- else
- upcode = '1-FJSL-CDHCJ001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "1-CDHCJ",
- LocationState: "LocationState_Stored",
- RunLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
- this.HCJInputTree = res;
- } else {
- this.HCJInputTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�");
- }
- })
- }
- }
- }
- }
-</script>
-
-<style>
- .example {
- padding: 15px;
- background-color: #fff;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/jjkto2F.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/jjkto2F.vue"
deleted file mode 100644
index 6eb8f1a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/jjkto2F.vue"
+++ /dev/null
@@ -1,362 +0,0 @@
-<template>
- <view class="example">
- <uni-segmented-control :current="current2" :values="list" @clickItem="change" styleType="button"
- activeColor="#4cd964"></uni-segmented-control>
- <view v-show="current2===0">
- <uni-section title="鎵弿鏋佸嵎搴撴湁璐х紦瀛樻灦,閫夋嫨鍐插彔杞﹂棿鏃犺揣缂撳瓨鏋�" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label-width="120" label="姝ｈ礋鏋�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs2" required>
- <uni-data-checkbox v-model="baseFormData.sex2" :localdata="sexs2" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-data-picker placeholder="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" popup-title="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label="2F鍐插彔鏉＄爜" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨2F鍐插彔缂撳瓨鏋舵潯鐮�" popup-title="璇烽�夋嫨2F鍐插彔缂撳瓨鏋舵潯鐮�" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit(0)">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- <view v-show="current2===1">
- <uni-section title="鎵弿鍐插彔杞﹂棿鏃犺揣缂撳瓨鏋�,閫夋嫨鏋佸嵎搴撴湁璐х紦瀛樻灦" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label-width="120" label="姝ｈ礋鏋�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs2" required>
- <uni-data-checkbox v-model="baseFormData.sex2" :localdata="sexs2" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-data-picker placeholder="璇烽�夋嫨鍐插彔杞﹂棿缂撳瓨鏋舵潯鐮�" popup-title="璇烽�夋嫨鍐插彔杞﹂棿缂撳瓨鏋舵潯鐮�" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label="鏋佸嵎搴撴潯鐮�" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" popup-title="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit(1)">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- <view v-show="current2===2">
- <uni-section title="鎵弿鍐插彔杞﹂棿缂撳瓨鏋�,閫夋嫨鍐插彔璁惧" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label-width="120" label="姝ｈ礋鏋�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs2" required>
- <uni-data-checkbox v-model="baseFormData.sex2" :localdata="sexs2" @change="checkbox" />
- </uni-forms-item>
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-data-picker placeholder="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" popup-title="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" :localdata="HCJInputTree"
- v-model="baseFormData.HCJInput" @change="onchange">
- </uni-data-picker>
- </uni-forms-item>
- <uni-forms-item label="2F鍐插彔璁惧" label-width="120" required name="classes">
- <uni-data-picker placeholder="璇烽�夋嫨鍐插彔璁惧" popup-title="璇烽�夋嫨鍐插彔璁惧" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-picker>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit(2)">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseFormData: {
- HCJInput: '',
- classes: '',
- sex: 'ZJ',
- sex2: '1'
- },
- list: ['鏋佸嵎搴�', '鍐插彔杞﹂棿', '鍐插彔璁惧'],
- dataTree: [],
- HCJInputTree: [],
- sexs: [{
- text: '姝ｆ瀬',
- value: 'ZJ'
- }, {
- text: '璐熸瀬',
- value: 'FJ'
- }],
- sexs2: [{
- text: '涓�绾�',
- value: '1'
- }, {
- text: '浜岀嚎',
- value: '2'
- }],
- formRules: {
- classes: {
- rules: [{
- required: true,
- errorMessage: '璁惧缂栧彿涓嶈兘涓虹┖'
- }]
- },
- HCJInput: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- }
- },
- current2: 0,
- flag: false
- }
- },
- onLoad() {
- this.onload(0)
- },
- methods: {
- change(index) {
- if (this.current2 != index.currentIndex) {
- this.current2 = index.currentIndex;
- if (this.current2 === 2) {
- this.flag = true;
- this.onload(this.current2);
- } else {
- this.flag = false;
- this.onload(this.current2);
- }
- }
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.sex = 'ZJ';
- this.baseFormData.sex2 = '1';
- this.dataTree = [];
- this.HCJInputTree = [];
- },
- checkbox(e) {
- this.onload(this.current2)
- },
- onchange(e) {
- const value = e.detail.value;
- this.input(value[0].value);
- },
- input(e) {
- if (e.length === 13 && e.includes('JJHCJ')) {
- let formDataParam = {
- UpperCode: e,
- Type: "2-CDHCJ",
- LocationState: "LocationState_Empty",
- RunLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
- this.dataTree = [];
- this.dataTree = res;
- } else {
- this.dataTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else if (e.length === 15 && e.includes('2-') && e.includes('CDHCJ')) {
- if (this.flag) {
- let formDataParam = {
- DeviceUpCode: e
- }
- this.$u.get('/api/PDA/GetDevDynamicAsync', formDataParam).then(res => {
-
- if (res != undefined) {
- this.dataTree = res;
- } else {
- this.dataTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else {
- let formDataParam = {
- UpperCode: e,
- Type: "JJHCJ",
- LocationState: "LocationState_Stored",
- RunLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
-
- this.dataTree = res;
- } else {
- this.dataTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- }
- }
- },
- submit() {
- this.$refs.form.validate().then((res) => {
- this.$t.message.loading()
- if (this.flag) {
- if (this.baseFormData.HCJInput.includes('2-') && this.baseFormData.HCJInput.includes(
- 'CDHCJ')) {
- let s = this.baseFormData.HCJInput.replace("SL", "XL");
- this.baseFormData.HCJInput = s
- }
- }
- // else {
- // if (this.baseFormData.HCJInput.includes('2F-CDHCJ')) {
- // let s = this.baseFormData.HCJInput.replace("XL", "SL");
- // this.baseFormData.HCJInput = this.baseFormData.classes;
- // this.baseFormData.classes = s;
- // }
- // }
- let AgvCode = "涓1鍙稟GV"
- let formDataParam = {}
- formDataParam = {
- AgvCode: AgvCode,
- AgvFromAddress: this.baseFormData.HCJInput,
- AgvToAddress: this.baseFormData.classes,
- AgvBarcode: '',
- AgvGrade: "1",
- AgvTaskQty: '1',
- AgvTaskState: "Create",
- AgvTaskType: 'TaskType_Outbound',
- AgvWorkType: '1',
- AgvLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/CreatePDATask', formDataParam).then(res => {
- this.$t.message.closeLoading()
- if (res.status) {
- this.$t.message.toast(res.message)
- // setTimeout(() => {
- // var HCJInputTreedata=this.HCJInputTree.filter(x => x.value !=this.baseFormData.HCJInput);
- // this.HCJInputTree=HCJInputTreedata;
- // var dataTreedata=this.dataTree.filter(x => x.value !=this.baseFormData.classes);
- // this.dataTree =dataTreedata;
- // }, 100);
- setTimeout(() => {
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.sex = 'ZJ';
- this.dataTree = [];
- this.HCJInputTree = [];
- this.baseFormData.sex2 = '1';
- this.onload(index);
- }, 100);
- } else {
- this.$t.message.toast(res.message)
- setTimeout(() => {
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.sex = 'ZJ';
- this.dataTree = [];
- this.HCJInputTree = [];
- this.baseFormData.sex2 = '1';
- this.onload(index);
- }, 100);
- }
-
-
- }).catch((err) => {
- this.$t.message.toast(res.message)
- setTimeout(() => {
- this.baseFormData.HCJInput = '';
- this.baseFormData.classes = '';
- this.baseFormData.sex = 'ZJ';
- this.dataTree = [];
- this.HCJInputTree = [];
- this.baseFormData.sex2 = '1';
- this.onload(index);
- }, 100);
- })
- })
- },
- onload(index) {
- if (index === 0) {
- let upcode = '';
- if (this.baseFormData.sex == 'ZJ')
- upcode = 'ZJSL-JJHCJ001'
- else
- upcode = 'FJSL-JJHCJ001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "JJHCJ",
- LocationState: "LocationState_Stored",
- RunLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
- this.HCJInputTree = res;
- console.log(this.HCJInputTree)
- } else {
- this.HCJInputTree = []
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else if (index === 1) {
- let upcode = '';
- if (this.baseFormData.sex == 'ZJ')
- upcode = '2-ZJSL-CDHCJ001'
- else
- upcode = '2-FJSL-CDHCJ001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "2-CDHCJ",
- LocationState: "LocationState_Empty",
- RunLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- console.log(res)
- if (res != undefined) {
- this.HCJInputTree = res;
- } else {
- this.HCJInputTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- } else if (index === 2) {
- let upcode = '';
- if (this.baseFormData.sex == 'ZJ')
- upcode = '2-ZJSL-CDHCJ001'
- else
- upcode = '2-FJSL-CDHCJ001'
- let formDataParam = {
- UpperCode: upcode,
- Type: "2-CDHCJ",
- LocationState: "LocationState_Stored",
- RunLine: this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
- if (res != undefined) {
- this.HCJInputTree = res;
- } else {
- this.HCJInputTree = [];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�");
- }
- })
- }
- }
- }
- }
-</script>
-
-<style>
- .example {
- padding: 15px;
- background-color: #fff;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/onetotwo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/onetotwo.vue"
deleted file mode 100644
index 7623d61..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/createTask/onetotwo.vue"
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
- <view class="example">
- <u-tabs :list="list" :is-Scroll="false" :current="current2"></u-tabs>
- <view v-show="current2===0">
- <uni-section title="涓婃枡浠诲姟娣诲姞" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="form" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�" label-width="120" required name="HCJInput">
- <uni-easyinput v-model="baseFormData.HCJInput" placeholder="璇锋壂鎻忕紦瀛樻灦鏉＄爜" @input="input" />
- </uni-forms-item>
- <uni-forms-item label-width="120" label="鐗╂祦绾�" name="sexs" required>
- <uni-data-checkbox v-model="baseFormData.sex2" :localdata="sexs2" />
- </uni-forms-item>
-
- <uni-forms-item label="鏋佸嵎搴撴潯鐮�" label-width="120" required name="classes">
- <uni-data-select placeholder="璇烽�夋嫨鏋佸嵎搴撶紦瀛樻灦鏉＄爜" :localdata="dataTree"
- v-model="baseFormData.classes">
- </uni-data-select>
- </uni-forms-item>
- </uni-forms>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit()">
- 娣诲姞浠诲姟
- </u-button>
- </uni-section>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseFormData: {
- HCJInput: '',
- classes: '',
- sex2: '1'
- },
- list: [{
- name: '鍒嗗垏鍚庝笂浜屾ゼ鏋佸嵎搴撲换鍔℃坊鍔�'
- }],
- sexs2: [{
- text: '涓�绾�',
- value: '1'
- }, {
- text: '浜岀嚎',
- value: '2'
- }],
- dataTree: [],
- formRules: {
- classes: {
- rules: [{
- required: true,
- errorMessage: '璁惧缂栧彿涓嶈兘涓虹┖'
- }]
- },
- HCJInput: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- }
- },
- current2: 0,
- }
- },
- methods: {
- input(e) {
- if (e.length === 13 && e.includes('XL-FQHCJ')) {
- let formDataParam = {
- UpperCode: e,
- Type: "JJHCJ",
- LocationState:"LocationState_Empty",
- RunLine:this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/GetDynamicAsync', formDataParam).then(res => {
-
- if (res != undefined) {
- this.dataTree = res;
- }
- else {
- this.dataTree=[];
- this.$t.message.toast("鏆傛棤鏈夎揣缂撳瓨鏋�")
- }
- })
- }
- },
- submit() {
- this.$refs.form.validate().then((res) => {
- this.$t.message.loading()
- let bz = this.baseFormData.HCJInput.split('-')[0];
- let AgvCode = bz == "ZJSL" ? "姝ｆ瀬1鍙稟GV" : "璐熸瀬1鍙稟GV"
- let formDataParam = {}
- formDataParam = {
- AgvCode: "涓1鍙稟GV",
- AgvFromAddress: this.baseFormData.HCJInput,
- AgvToAddress: this.baseFormData.classes,
- AgvBarcode: '',
- AgvGrade: "1",
- AgvTaskQty: '1',
- AgvTaskState: "Create",
- AgvTaskType: 'TaskType_Outbound',
- AgvWorkType: '1',
- AgvLine:this.baseFormData.sex2
- }
- this.$u.post('/api/PDA/CreatePDATask', formDataParam).then(res => {
- this.$t.message.closeLoading()
- if (res.status) {
- this.$t.message.toast(res.message)
- setTimeout(() => {
- this.baseFormData.HCJInput = ''
- this.baseFormData.classes = ''
- this.baseFormData.sex2='1'
- this.dataTree=[];
- }, 100);
- } else
- this.$t.message.toast(res.message)
-
- }).catch((err) => {
- this.$t.message.toast(res.message)
- })
- })
- }
- }
- }
-</script>
-
-<style>
- .example {
- padding: 15px;
- background-color: #fff;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/getTaskData/getTaskData.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/getTaskData/getTaskData.vue"
deleted file mode 100644
index dee3ea5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/getTaskData/getTaskData.vue"
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
- <view class="example">
- <u-tabs :list="list" :is-Scroll="false" :current="current2"></u-tabs>
- <view v-show="current2===0">
- <u-button text="鏈堣惤"></u-button>
- <uni-section title="涓�妤煎簱瀛樻煡鐪�" type="line" padding style="height: calc(100vh - 100px);">
- <uni-list>
- <!-- to 灞炴�ф惡甯﹀弬鏁拌烦杞鎯呴〉闈紝褰撳墠鍙负鍙傝�� -->
- <uni-list-item direction="column" v-for="(item,index) in listData" :key="index"
- @click="handleClick(item.orderNo,item.productCode,item.number)" link>
- <!-- 閫氳繃header鎻掓Ы瀹氫箟鍒楄〃鐨勬爣棰� -->
- <template v-slot:header>
- <view class="uni-title">宸ュ崟锛歿{item.orderNo}}
- <!-- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="deleteList(item.container_barcode)">
- </uni-icons> -->
- </view>
- </template>
- <!-- 閫氳繃body鎻掓Ы瀹氫箟鍒楄〃鍐呭鏄剧ず -->
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鍨嬪彿锛歿{item.productCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鍙彨浠诲姟鏁伴噺锛歿{item.number}}</view>
- <!-- <view class="uni-note">
- 鎵挎帴杞﹀彿锛歿{item.agv_code}}
-
- 浠诲姟鐘舵�侊細{{item.agv_taskstate}}
- </view> -->
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- <uni-load-more iconType="circle" :status="status" @clickLoadMore="clickLoadMore" />
- <!-- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit">
- 鐘舵�佹煡璇�
- </u-button> -->
- </uni-section>
- </view>
- <view>
- <uni-popup ref="alertDialog" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍏抽棴" confirmText="鍚屾剰" :title="鎻愮ず" :content="content"
- @confirm="dialogConfirm" @close="dialogClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- </view>
-</template>
-<script>
- export default {
- data() {
- return {
- listData: [],
- list: [{
- name: '搴撳瓨鏌ョ湅'
- }],
- current2: 0,
- current: 1,
- size: 10,
- status: 'more',
- Modalshow: false,
- title: "鎻愮ず",
- content: '娆㈣繋浣跨敤 uni-popup!',
- msgType: 'success',
- }
- },
- onLoad() {
- this.submit()
- },
- methods: {
- onClickItem(e) {
- if (this.current != e.currentIndex) {
- this.current = e.currentIndex;
- }
- },
- submit(cb) {
- this.$t.message.loading()
- let formDataParam = {
- current: this.current,
- size: this.size
- }
- this.$u.post('/api/PDA/AGVPage', null).then(res => {
- console.log(res);
- this.$t.message.closeLoading()
- cb && cb()
- if (cb != null) this.listData = []
- this.listData = [...this.listData, ...res.data]
- console.log(this.listData);
-
- }).catch((err) => {
- this.$t.message.toast(err.message)
- })
- },
- clickLoadMore(e) {
- this.status = 'loading',
- this.current += 1;
- this.size += 10;
- this.submit();
- },
- handleClick(orderNo, productCode, number) {
- console.log(this.$refs)
- this.$refs.alertDialog.open()
- // this.content = '宸ュ崟锛�' + orderNo + \n'鍨嬪彿锛�' + productCode + \n'璇风‘璁ゆ槸鍚﹀彨浠诲姟'
- this.content = `宸ュ崟锛�${orderNo}\n鍨嬪彿锛�${productCode}\n鍙彨鏁伴噺锛�${number}\n璇风‘璁ゆ槸鍚﹀彨浠诲姟(榛樿4涓�)`;
- },
- dialogConfirm() {
- this.$t.message.loading()
- // 鎻愬彇宸ュ崟缂栧彿
- const orderNo = this.content.match(/宸ュ崟锛�(.*)\n/)[1];
-
- // 鎻愬彇鍨嬪彿
- const productCode = this.content.match(/鍨嬪彿锛�(.*)\n/)[1];
-
- // 鎻愬彇鍙彨鏁伴噺
- const availableQuantity = this.content.match(/鍙彨鏁伴噺锛�(.*)\n/)[1];
- let formDataParam = {
- DTaskId: this.generateUUID(),
- ProductCode: productCode,
- OrderNo: orderNo,
- Number: availableQuantity > 4 ? 4 : availableQuantity,
- }
- console.log(formDataParam)
- this.$u.post('/api/PDA/insertTask', formDataParam).then(res => {
- // if (res.code === 200) {
- if (res.status) {
- this.$u.post('/api/PDA/AddCZTask', formDataParam).then(res => {
- this.$t.message.closeLoading()
- if (res.status) {
- this.$t.message.toast(鍛煎彨鎴愬姛)
- this.$refs.alertDialog.close()
- this.submit()
- } else
- this.$t.message.toast(res.msg)
-
- }) ;
- this.submit()
- } else
- this.$t.message.toast(res.msg)
- }).catch((err) => {
- this.$t.message.toast(err.message)
- })
- },
- dialogClose() {
- console.log('鐐瑰嚮鍏抽棴')
- },
- generateUUID() {
- var d = new Date().getTime();
- var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
- var r = (d + Math.random() * 16) % 16 | 0;
- d = Math.floor(d / 16);
- return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
- });
- return uuid;
- },
- },
- onPullDownRefresh() {
- this.current = 1;
- this.size = 10;
- this.submit(() => uni.stopPullDownRefresh())
- },
- }
-</script>
-
-<style lang="scss" scoped>
- @import '@/common/uni-ui.scss';
-
- .example {
- padding: 15px;
- background-color: #fff;
- }
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/index/index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/index/index.vue"
index 537428f..c29ca09 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/index/index.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/index/index.vue"
@@ -18,15 +18,15 @@
data() {
return {
dynamicList: [{
- text: '涓夋ゼ鍙枡',
- url: 'pages/getTaskData/getTaskData',
+ text: '涓夋ゼ姝ｆ瀬鍙枡',
+ url: 'pages/鍙枡/姝ｆ瀬鍙枡',
image: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAHS9JREFUeF7tXQmUJEWZ/qK6ZwZH7gXp6pkRZLp6uERBhMEDEFgRYWEV8ABWVxQ5BpCFlbOr6ZlqLhFc5FxYQddF5HTBA1gOERHl1EVBmOoBnIGu5liEBVaO6QrfN5PF9nRXRkRmZVZEZsX/Xr/u9/qP4/8ivsyMiD/+X8CLR8AjEIqA8Nh4BDwC4Qh4gvjZ4RFQIOAJ4qeHR8ATxM8Bj0A8BPwbJB5uvlSHIOAJ0iED7c2Mh4AnSDzcfKkOQcATpEMG2psZDwFPkHi4+VIdgoAnSIcMtDczHgKeIPFw86U6BAFPkA4ZaG9mPAQ8QeLh5kt1CAKeIB0y0N7MeAh4gsTDzZfqEAQ8QTpkoL2Z8RDwBImHmy/VIQh4gnTIQHsz4yHgCRIPN1+qQxDwBOmQgfZmxkPAEyQebr5UhyDgCdIhA+3NjIeAJ0g83HypDkHAE6RDBtqbGQ8BT5B4uPlSHYKAJ0iHDLQ3Mx4CniDxcPOlOgQBT5AOGWhvZjwEPEHi4eZLdQgCniAdMtDezHgIdBJB3gVgDoB3T/q9FoCng59lk37/bzxYs1WqOrTumpg+fTbeEnNQELOB+mxAzIHAbEjxMoBlQmDpOOSyrjqWol5f1jf07HPZsjJeb/NOkF0BfArAfgDWjwHRIwCuBfBjAA/GKO9skZFFvR9Gob5XXYq9BTAvRkefhxTXSIEf9ZdHb4tRPhNF8kaQdQCQFA1ixCFF2MCRLD8BwMmQyQkxsrBn93oBuwuJ3SFEX4Iz9HkSRUDeNr1r+m0bnrj0zwnWbbWqvBDkHQCOBHAUgFltQPReAOcBuKINbbXcRHW4eADkCny2a7kyfQXPCCG+PWNm4bw5xzz9F7262xp5IMhXAnJsaQHqmwKi8LdzwjeG7BJHgm+MNosQ4mFZl+eVBmv/1uamE20uywT5dECMnRJFJF5lfJPwjcI3i3VZvGiD7YQo8I1xgPXOAHdK4Lz+cu16B/oSuQtZJchFAA6NbG36Bb4O4JvpNxPewuJK8RABXGyzD83alhIX9w/WDnOtX7r+ZI0gPQCuA/AhnWEW//99AF+w0f7iSu8iAVm20bZhm/d0jy/f5z1Dz48Z6ltXyxJBPgbgRgCrJ4Ta/wAYBfAqgCKAXgDTE6r7YQDbAngjofqU1cghdI90F29McK3xphAYlVLWBMTqciU2f5OQLa+Kgtyr7+SxnydUX6rVZIUgCwCcHxMJTtLbg59fA6gFxHizSX2cBJwMcwHsCIDrm/fHbJfFtgLwuxbKa4uOnD67Ty4fr2oVwxUeEcDdELjlrXp9BN3do5ue9AwfHqvII0ObTS/gxd7uQlcRhfr2QmIXKbALJGbEa1seUSqPXRCvbPtKZYEgXGj+RwxILg3OLfikeiVG+UaRjQHsEBw2fjJGPSQcSZm4LBma1V/vqj8etWIJ/ExAXD8O3L1JeTRy+UZ7j5253hpdb07/GCD3BHBw1H5A4MDSQM3prXLXCbIZAB7QRZErAfDJ9KsohQx1PwOAbzMSxlReTPDzZJU2q5UiiR/lk/MuSHlBaXDsatPOm+qtOJkXcoEEPm9aZoVel9y8dNLYo5HKtFHZZYKsDWAJgHUN8aA7CIlxi6F+K2oHAfgnAFsYVsKn5IGGukZq1UqRDwCjzQoB8bCUOLc0OHqZUeUtKFVPLe6GcbkAQvydSTUSePG18Rlztxp66iUT/XbruEyQHwL4rCEgJMYRhrpJqZUA/DuA+YYVDgA41VBXqbZ4UfEiIYy3ua8ZH+8+epOhZdyQaJtUK73nA5JvWwORV5XKY58zUGy7iqsEORvAMYZoHA/gG4a6aajdGvh+mdT9JQDfNVEM01kyXDy0LsFzIK0IgYv7BuydPSxe1HucEPJMbUepIHFOabB2rJFuG5VcJAhPyHnWYSKbAIi9yDRpwFDnWwCONtB9NnjjPGWgO0Xlj0M9G3V3id8A2EBXXgCn9pVrfGtZlScqvfPGIR8z6YQE9nHtxN1FgnDXycR9JLXdIZPBbKLDXTP6henkHACxnpTV4eLZkAZvVoFbSwO1j+s60q7/P3rqesVp9Wkmn3h3lso1nnc5I64RhBOME00n3Fb8qU7Jwv9NyP1W8BZ5KEr/qqcWt4YUv4GU05TlBB4tDdQ2j1J3O3QXL+zZQxQErwuoReJglxwcXSIIXdb5+aDzyqUrxbAOZ0v/3zDYXta53HMdwvWIsYwM914upfxHTYEXIcWupcHR3xpX3EbFkeHigJSoqJqkF/CMmYX5rrjKu0SQ4wDoFnTcyt2rjWMapyneYDTxXP1b04tXSyq9u9YhuRmgFCmwb/9AzXT9pqsulf9XF/XcqNsCFkIc3zcwanPj5W3bXSEIzzrov6R78n6iTeccrU4OXtPdR1OJMdlNJhUkrisN1vZtteNpl19xTlLHzZp2nlltvGvLOUNP85DVqrhCEBN3Ep6Q728VLfPGudC8w0CdPl9PqPSWnNL77nq3/JOuLlGQO2fFAXCkUvyB9sTdETcUVwhCXyvd5Z6PpOQ+opt7cf/PdcYXNYV5RZgXrUKluqj3IAj5HeV3O8T3+sqjuvVJXDsSL0e3FCnk3ZqKryiVa4l6H8QxxBWC0HtU5VLCna2vxjHQYpkPArhP0z6v6iodIKuVIv2mGJUlVApSbjt3cOx+i7ZGbrpaKV6icnCkC0p/uZaUi33k/jUKuEAQLrpv0FjAb2unF58h/adfmO48gj5njD01RVZ6y05Tx+YS8selgTHXNy6m2LZ4uLiPkCtCKilE7F0qj/IOkDVxgSD8fKDzX5jw3gaDvjWdRNaQM2v4nwGcpVHl7UPeQpwi1eGe/SCF0vNWSBzSN1jj0zhTsuSMddaqv7Uag8+FX1IT8rLSwNiXbRrmAkGeB7CeAgQevu1sE6QW2mYUR90Cm2/GprtPJp9X0wpv9W508gup3DdpwW6jotVFxTsgoDo5f6FUriUZ28yoXxOVbBOEbwb6J6nkRABnRLbMnQK/BMANhjDhXYimJ9/VSpGn7byV2FSkkLf3D4wxSF4mpTrcewKkPF3VeTFe38BmmFPbBPkAgAc0o8tgZ7rFrssThAQ/TdFB3olfo9n/q5Xi0iCOcFjxk0rlmnKCuQzME8M9245LoQyVJCS26RusWQv7apsgJqfODCfq5GUaw8nH7dfLNbrcwZsSrnOkUnxNAjND3yBSfql/cKwl93lDG1JRe3Joo7WXd72hDFNaF/j0vIHaj1LpgEGltgnCc4BzFf3kIk7r2m1gp00V7mLpbjkyMMR/T+zkA0O9M9fqkq+pOy52K5VH/8umca22Xa0U+YnNT+2mIoT4Wt/A6LdbbSduedsEYZA1les3v9+j3P+Oi0Oa5d4buNGo2uD11FU8XUeGe+dIKfmJFSrLZX3LTQef/X2anU+77pFK8S4JfDS8HXF2qTzK3UArYpsgVwFgIIQw4RawyR0LK+AZNsrDrhc0uocDq94SrC7q3QpCKl3il3cV1msWosewX06oVStFxu5VbOWKq0vlUdOr14nbZJsgdFrbTWEVPTp5pTbrIjUGLAQwNFGnWunZCRDK4Gqlcs32+LU8LtVKkRsY3MhoLhK3lAZrdFK1IrYB1jw98J9BAhwr4CTYqCdICJi6ey4CuLSvXLPmZmSbIHxqnqKYiH8EwNhYWRdPkJARrFaKSnccCTnYXx5TXrJKc3LYJgi/PVX5I8YBdKcJQJvq9gQJe4NUig9LgBsZTUVa3sq2TRCuP3SXZ5gqjAHksiyeIOFvEG5ghHrtCtR36Ss/a3K3JpX5YZsgJqFFeZjItUiWxROkyeiNnLXBu+TrBaWrUQFd/XPLT7cSnLuleWObIGsaeOn+SxDmsyVDLRf2BGkyAEuGi0fXJRhTLFzWeudqpaNG2pJGolknbBOEffpDmLNe0GGmDwh12LM88U2b9wRpglS1UtSFSXqwVK5tYwpyGnouEES3k0W7tXe30wAnwTo9QSaBuaQyu1TH+GIlxhJnlAZr4WckCQ5QWFUuEMTEo7flmLZtwFLVhCfIJHRGhnuPklKq/PBge4HOLrtAEJPPrJ8B2MPyJG+leU+QCegxW9W0rj/fJ4D3KUB9vlSuhToxtjIYUcq6QhBeiNK5lNAfJ/HEL1HAakHXE2QCeNVKkblVGKNYIXZ9sBodc4UgvBWnixx4V5A3sIV5aq2oJ0gA/SNDs9ed3l2/F1LyfCtUCgKHzR2oWU9n7QpBCBTj8vL2oEp48p56lqQUaOQJEoC6uNJTFhCLlO8OgacKYnz+xic/p7uOncJQrVqlSwQxia7ILWHmD7F2cBRzRDxBOGjDG8yHLPBUnIHKw0Xi2NJgTfMJFnMkIhZziSDsOhfju2ts4Jtm+4h22lbveIJwYT6j+6X7pZS66P0PvbysNn+bS8A0EdbFNYKQHCSJTm4DwOjoWZGOJ8hIpXidXPn2V788LDsnTu6cawRh/0zi9FIvSy4oHU2QxYt6zhRCML2F5ssKt/WXa049+FwkCBfq/IwyEbrKR09gb1JzsjodSxCT4HdvQy3EXqWBUaaFcEZcJAjBMQnZ2QDxTgAMraOLYGgT9I4kiIGv1QRuiCP7BkbPtzlIzdp2lSDsK3OQ/4MhYM8AOBKAtfhJ+q8HpUau7qQvrhQ3FSvHz9TR8PRSuXaS4Vi3Vc1lghAIxorS7XpMBIxxbi8AoAx20FaEVzbWEW8QBqRe/uZqCwoCjNKiyxbWQObnpcGas7GXXSfIDACvx5jQ3wuI4krOjFwTRF6NrupjvQsKQh4ugXlRxuvN8XVmbD70KCP4OymuE4SgMepg3KytjDpIFxb6cCmDsKU4OiahRxnhnGupt+Xxod71Cl2Ske9DxeZ97eeG1l/9JdG1Y0FgBykEXYW2jophYbwwb+7QM2qX96iVJqyfBYLQ5GJwsUqVhUoHDVN+8YyFqQKY1L7xm9mt0hLeddkRwE6aBniz8pXJOiPDxSelxEaKsnfW6/IX804ZWyWmVpLGkKgoiFkQ47MAMQt1OatQECY2qbrxamG88AHXyUEDskKQBtimZyRJzpG06+Kbo2mOjGql5wZAZC57lAawe0rl2ofTBjWp+rNGENp9MoDhpABwoJ6zg23tKV0ZGe45U0r9AZsDNhh1QUpc3D9YO8xI2RGlLBKE0PG7nndIsh75nfkH6VfGJDpTpHpaz2YYF78GwE+wLMtYQWChC+7rUUHMKkFoJ7/NefbBn2lRDXdEf8r5x+R+Pb6wZ6hQEKrok46Y0qwb8mVAXCiEuKhvYHSZwx0N7VqWCdIwirsnJElm8oQHHX8EwBYmk6ZaKeoiv5hU0z4dgTdQx0UF0XWhzZhWSRicB4I0cOBWIxPyMNeG68LtZ1VU+6mfW5oYti4YLAHuCF7bXei6cOOTn37YhT612oc8EaSBxcZBgAe6zuvulrSKX9TyvCHHRWosl5jHFxY/VSisyCPi0trrdUBeCYmbC9Nn3jL3hCeymK47159Yqkm6FgBuk+4NYFMATMu8etRZ3aL+4wD48xgAphKj31hseXx49qyCHD8WkPMB0faLYxJ4VQgshRR/EMCV8rmZN5XOsxf5MDaQhgXz+AbRmc6koCTKnOAnzacxHfae0HUo7v+rQ+uuCTFj+zpkakTpLuDZcchlUnYvW21a19INT1yqTLoZ1xZXy3UiQVwdC98vBxHwBHFwUHyX3EHAE8SdsfA9cRABTxAHB8V3yR0EOpUgM4OsRusB4E5XWsIDPl0K6FbbXl+TPqLV+rltSxt4xvF/rVaWtfJ5J8jEbV6ej5AQTPdFgrRLngLAQzNu8zKU5pMtNsybel8LTuF5Es/duHYJCUKikDAjAK4JUuhNcdVvV4fSbiePBHH9oHBAk7hUNeZMR+faQSH72yAK45XZupiWClfyRBCemvOUOguuJlcC2D/iiCrTJUesK011hu3hgSjJknnJA0F4W4/E+EzGRoP3Wk4z7HO2nBVXGvVdAOcBeMjQRifVskwQBpgjMb7oJLJmnfoIgF9pVE1S1Jm11n4txtclSfjDtVjmJKsE4Y1CPoGzLnwz8Lpt2E4X02Tn4cIUnTRJdOv5PqJOmCwShIvUQ6Ma6rD+WQDC4taeqfifwyaFdo0E8VduUxo5euFyAaiLEJJS86lVexOAT4bUfkPgjZxa4xYqvgeAD9qQMPD0vl0CoLuFem2E/eEtR66RVKTmVVTa10x4ZqIM+wPgF8HnSwvQKIvy3Kg3CL3U+L0LAP7ElVcBMLux0zGxaFwWPrGyHjjOZJHNbK6Tg8TxUFMZOA6AzfTYjFXGLfU9W9haLwUHjnGJlno51wnSKaFHp0RWDN46uhjDrozfBwEsiLmjyIAby1Of6TEbcAXgsO53SvDqrBOkMX60g0TZJ8J8VK3BIlSTjqrLBOmk9Ad5IUhjlpIglwAwDRVbATCYzhRvrVZXCdJpCXTyRhDOyq2CdHo8yzERbt3/q4liO3VcJMiHDE6XGxjlJQVbHgnSGCOGODLNOzgfwL3tJICuLRcJcj0Aeq3qJE9JPPNMEI6jqefDFQAO1A18O//vGkG+AIDJb3SStzTQeScIx9PUA4KHply4OyEuEWSN4NPqvRpkmAE3tTA3KY2KLsNUJxCE0DKR0X4ajJ3a1XKJIIsAlDXg0bmPyeirKU3ktKr1BFmJLE/iSQBd3kl+ZvFzy7q4QhDueNDt+x0aRL4M4DLrqEXvgCfI/2N2EIDvaCDkQp0LduviCkG+DuAbGjTuCtKZWQctRgc8QVYFjf5jO2hwdGIt4gpBTLxWPxt8w8aYn9aLeIKsOgS8/XmVZlR4yYrR+q2KCwTh4pyRMlRJcJh8cw+rSLXWuCfIVPx+qnDzpzajptCZ0aq4QBAGWyABVOLMoi3maHmCTAWO60ke9KrE5EpyzCExK+YCQb4F4GhFd5lknq7VL5qZ5KSWJ8jUYZkXxApTDRjXpcfbHFEXCMJLM6pX6XUA9rUJUgJte4I0B1EXrYV5VTZJAP/YVdgmCLO36jIS2bwUFBvYSQU9QZojyTvqh2hAZnRMZgO2IrYJQk9PJrNUCW/WcRGfZfEEaT569Lmj751KNg9Lk92OCWGbIExkebPCUBKDBMm6eII0H8G5BlduPwGAUSWtiG2C6HYyfm/glmAFuIiNeoKEA8brtl0KPL9icPIecTjM1W0TRBfQIHK6ZHPT26rpCRIO96NBgtUwDc6RhW0drQmN2SYI98H5FgkTxnflIj3r4gkSPoJMif33igGm3xbfIlbENkG4/uA6JExOB3CSFWSSbdQTJBxPXfRIrj+4DrEitglCfxxVVPbzARxpBZnkGmXgNV2Wqa0B/HZSk/Rw1kVGz8MOn+4rgndI6IdnRWwT5JsAjlVYnodDQl4AY4YplTCyIiMsThRmjtIlo+G9Cm5kZFnopf1RhQFnA2AQDytimyD01jxXYTkjmzOIQ5bl4wbblO9skv+PaeJe0xjOz1NuZGRZGPmdkSXDhOnmmJDHitgmiO6giDkl3mMFmeQaZXzeyxXVMe8fCdJMSBBVPsWsexmsDeDPGqh5g5QLeStimyAMYPyAwnI6KjL8aJblRE0mKVXwan5iqZJ0cgODGxlZlW0NwvxsA+BBWwbaJghfrXzFqoTfp4zMnlX5JQC6bYcJF+dcpDcTLtK5WA+T2wHsmlVgAJxgQPANADxny0bbBKHd3OHhTk+YnKNZyNvCzqRdLr7/pFFUbUSYRAFhIISaSWcc1LkjyLAV1jXODeaBtyYuEEQXg/cJAPTZyaKYhFBlLLDvhxjHEDkkiUroDcs4uFkTeunyzTBd0XEG6FAdJKduswsE+TyAH2gszepujUnqZi5Uw1z+eR1Z5+rNrFt7pT5Tkm+AAa6v1VS7N4Abk2/avEYXCDK7yRnAZAsuBfBVc7Oc0GTOjPs0PTEJkmbymcXF7v1OWG3eCb71Dlao8wap6tPbvKUWNF0gCLuvOyyijvX7yRFxph+ZLkU1z4EYvUMlJnGkGK6V28lZEeYo1G28OBGn1xWCmAQ3vhLA/hmZAQwlygWoTri24hpLJSYLfZbfGYAuI5WuP+36Pz+p+WmtEicCdbhCEN3FqQaQVi/PRJg9/LbWZVmKsnbgdzjzAaokK245JmP9THAPyHqgDlcIwoHnabPuMyHKpIownxNV1XkHNBpjzgxGqTcRnnXcaqDI4BYkistiQnZGMtFF2myLjS4RhPfTGZ+XuzoquQDAEW1BJ3ojGwY2zNIUjXPPxeQBwicuyTTZMzi6JemUGADAdGsqoWMn4/L+JZ0uRKvVJYKw5ycHyVZ0VjjzhJnUUa4BVDnRqf5WMAF0ruyTMeBpO1M/qCJQsgxv6DHQgWvCyJg/MegUd7Z0AeUMqklGxTWC0O+KbxH6aOmE8ZIYN8kV4Va0yc23VjwD6Pp9jIHB/ByjF7ErwsB/owaduVNzsm5QRbIqrhGE1vFyzA8NzXTFzYJbtSafffQ74+cDvZTjyEbBW4T+STo5FQA/aWyLSQTFRh+5saELA9RWe1wkCAEwTddF3T0BMBCyDaErOp96PBQ0kSTc05kNlviYCAOzHWaimJLOcQB4pdZEWnmzmtQfS8dVgtAYfmqZXpZiZiqepbRTuF3J02CeU5gIn+Z8qichUR4g1wSxj00+cZLoW6MOXpdeYFghr15/zlC3rWouE6QnSLW2uiEi3ALmDlfaQcaYBYvBthmORuVoN7HbaZwKR3mAcGeINzfbkZ2LDw4SQ3du08CHO288MH3JcJzbquYyQQiE6Yn0RNB44k6icAIlLTynITneF6HiNH2KXgFg+gBhl+nSQ2x0HsIRzHtble4jJIbuhHxy3VZDi+oMdZ0g7D9B5+s6qnBXiW8THsbpAmSr6t44SBfGzYM44WfS3Ejoj7mTx3wsXAzTH6qVnUB6G/MhxnWgyvEwDF8n3ElUg58FgrD/XNzG/TzgtV2+TRjcgP5RTLegep3zdc9IJDsGZxrvj8rMCfq8Dfi7FsqbFO1rMesvg4eTKHyY8FNsiaJRHuKSlHQc3SX4iXslmrt+fJs5LVkhCEHk9iijnCQhvKjDJyfJwgDZHHRuR/K3Kk6saducaHRBf8O0QIt63cG9CWbralXGA1wa+NDlvIGPKvqIabuvBvdXMuFYmSWCcACYaIcLXtNtVdNBS1KPtwN5S9CGmOSat9GvRpv3BE6cYzY7EaXtrBGEtvGJxnitvG3mmjCdNYPh2RReweX5h2ti+0wmFh5ZJEjD0MODQ7AtYlmebCG+1Xiafm+y1caubbsgZOsBsWtIriAPUomNUyfkpuZlmSC0kWcSPCkmWWwEduCVWQ4+f7soXJMwtnESa5Oo9nEdRmyccTyMagD1s06Qhs3rTiAKt1XTFr4pOPh8c2RB+CYhUfhmSVt42YmhQomPEy7rrRicF4JMJAqflo0fEicp4XYo3bV5rmJ60SmptpOqZyI23B5OSp4PwoM2sNGFE02q3dTryRtBJgPGcDhczPN3nFyHJAWvz9KNxVr4y5RmAU++G/hwizuqkBT082Lc3Kw+MLQ2550gEwHgHj7j3NK5cOJvBjB7OvhhnFz+3fiti0mlBTgjCkzHzfBLxGXib/5NLwTiwTjBE39bCwfaTkw7iSDtxNW3lRMEPEFyMpDejHQQ8ARJB1dfa04Q8ATJyUB6M9JBwBMkHVx9rTlBwBMkJwPpzUgHAU+QdHD1teYEAU+QnAykNyMdBDxB0sHV15oTBDxBcjKQ3ox0EPAESQdXX2tOEPAEyclAejPSQcATJB1cfa05QcATJCcD6c1IBwFPkHRw9bXmBAFPkJwMpDcjHQQ8QdLB1deaEwQ8QXIykN6MdBDwBEkHV19rThDwBMnJQHoz0kHAEyQdXH2tOUHAEyQnA+nNSAcBT5B0cPW15gQBT5CcDKQ3Ix0EPEHSwdXXmhMEPEFyMpDejHQQ8ARJB1dfa04Q8ATJyUB6M9JBwBMkHVx9rTlBwBMkJwPpzUgHAU+QdHD1teYEgb8CT3JyI01Xe9wAAAAASUVORK5CYII="
},
- // {
- // text: '涓�妤煎啿鍙犱换鍔�',
- // url: 'pages/createTask/jjkto1F',
- // image: "data:image/png;base64,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"
- // },
+ {
+ text: '涓夋ゼ璐熸瀬鍙枡',
+ url: 'pages/鍙枡/璐熸瀬鍙枡',
+ image: "data:image/png;base64,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"
+ },
// {
// text: '浜屾ゼ鍐插彔浠诲姟',
// url: 'pages/createTask/jjkto2F',
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/setStatus/setStatus.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/setStatus/setStatus.vue"
deleted file mode 100644
index 77aed26..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/setStatus/setStatus.vue"
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
- <view class="example">
- <u-tabs :list="list" :is-Scroll="false" :current="current"></u-tabs>
- <view v-show="current===0">
- <uni-section title="缂撳瓨鏋剁姸鎬佹煡鐪�" type="line" padding style="height: calc(100vh - 100px);">
- <uni-forms ref="formup" :modelValue="baseFormData" :rules="formRules">
- <uni-forms-item label="缂撳瓨鏋舵潯鐮�:" label-width="120" required name="HCJInput">
- <uni-easyinput v-model="baseFormData.HCJInput" focus placeholder="璇锋壂鎻忕紦瀛樻灦鏉＄爜"></uni-easyinput>
- </uni-forms-item>
-
- </uni-forms>
- <uni-list>
- <!-- to 灞炴�ф惡甯﹀弬鏁拌烦杞鎯呴〉闈紝褰撳墠鍙负鍙傝�� -->
- <uni-list-item direction="column" >
- <!-- 閫氳繃header鎻掓Ы瀹氫箟鍒楄〃鐨勬爣棰� -->
- <template v-slot:header>
- <view class="uni-title">鍚嶇О锛歿{listData.name}}
- <!-- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="deleteList(item.container_barcode)">
- </uni-icons> -->
- </view>
- </template>
- <!-- 閫氳繃body鎻掓Ы瀹氫箟鍒楄〃鍐呭鏄剧ず -->
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">缂撳瓨鏋剁姸鎬侊細{{listData.location_state}}</view>
- <view class="uni-title-sub uni-ellipsis-2">缂撳瓨鏋剁紪鐮侊細{{listData.upper_code}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鍚敤/绂佺敤锛歿{listData.status}}</view>
- <!-- <view class="uni-note">
- NG锛歿{item.extJson.NG+ ' 灞忚斀锛�'+item.extJson.PB}}
- </view> -->
- <!-- <view class="uni-title-sub uni-ellipsis-2">
- NG锛歿{item.extJson.NG==0?"鍚�":"鏄�"}} 灞忚斀锛歿{item.extJson.PB==0?"鍚�":"鏄�"}}
- </view> -->
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- <u-button type="success" size="default" shape="circle" :ripple="true" ripple-bg-color="#909399"
- @click="submit">
- 鐘舵�佹煡璇�
- </u-button>
- </uni-section>
- </view>
- </view>
-</template>
-<script>
- export default {
- data() {
- return {
- baseFormData: {
- HCJInput: '',
- classes: ''
- },
- formRules: {
- HCJInput: {
- rules: [{
- required: true,
- errorMessage: '缂撳瓨鏋朵笉鑳戒负绌�'
- }]
- }
- },
- listData: [],
- list: [{
- name: '鐘舵�佹煡鐪�'
- }],
- current: 0
- }
- },
- onLoad() {
-
- },
- methods: {
- // onClickItem(e) {
- // if (this.current != e.currentIndex) {
- // this.current = e.currentIndex;
- // }
- // },
- submit() {
- this.$refs.formup.validate().then((res) => {
- this.$t.message.loading()
- let formDataParam = {};
- if (this.baseFormData.HCJInput.includes("SL")) {
- formDataParam = {
- UpperCode: this.baseFormData.HCJInput,
- current: 1,
- size: 10
- }
- } else {
- formDataParam = {
- DownCode: this.baseFormData.HCJInput,
- current: 1,
- size: 10
- }
- }
- this.$u.get('/api/PDA/LoctionPage', formDataParam).then(res => {
- console.log(res)
- this.$t.message.closeLoading()
- if (res.status) {
- this.$t.message.toast(res.message)
- // res.data.records[0].extJson = JSON.parse(res.data.records[0].extJson)
- res.data.status = res.data.status ==
- "0" ? "鍚敤" : "绂佺敤"
- res.data.location_state = res.data.location_state ==
- "LocationState_Empty" ? "绌虹紦瀛樻灦" : "鏈夎揣缂撳瓨鏋�"
- this.listData = res.data
- console.log(this.listData);
- setTimeout(() => {
- this.baseFormData.HCJInput = ''
- }, 100);
- } else
- this.$t.message.toast(res.message)
-
- }).catch((err) => {
- this.$t.message.toast(res.message)
- })
- })
- }
-
- },
- }
-</script>
-
-<style lang="scss" scoped>
- @import '@/common/uni-ui.scss';
-
- .example {
- padding: 15px;
- background-color: #fff;
- }
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
new file mode 100644
index 0000000..1c7fc0a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
@@ -0,0 +1,290 @@
+<template>
+ <view class="example">
+ <u-tabs :list="list" :is-Scroll="false" :current="current2"></u-tabs>
+ <view v-show="current2 === 0">
+ <uni-section title="涓�妤煎簱瀛樻煡鐪�" type="line" padding style="height: calc(100vh - 100px);">
+ <uni-list>
+ <!-- to 灞炴�ф惡甯﹀弬鏁拌烦杞鎯呴〉闈紝褰撳墠鍙负鍙傝�� -->
+ <uni-list-item direction="column" v-for="(item, index) in listData" :key="index"
+ @click="handleClick(item.orderNo, item.productCode, item.number)" link>
+ <!-- 閫氳繃header鎻掓Ы瀹氫箟鍒楄〃鐨勬爣棰� -->
+ <template v-slot:header>
+ <view class="uni-title">宸ュ崟锛歿{item.orderNo}}
+ <!-- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
+ @click="deleteList(item.container_barcode)">
+ </uni-icons> -->
+ </view>
+ </template>
+ <!-- 閫氳繃body鎻掓Ы瀹氫箟鍒楄〃鍐呭鏄剧ず -->
+ <template v-slot:body>
+ <view class="uni-list-box">
+ <view class="uni-content">
+ <view class="uni-title-sub uni-ellipsis-2">鍨嬪彿锛歿{item.productCode}}</view>
+ <view class="uni-title-sub uni-ellipsis-2">鍙彨浠诲姟鏁伴噺锛歿{item.number}}</view>
+ </view>
+ </view>
+ </template>
+ </uni-list-item>
+ </uni-list>
+ <uni-load-more iconType="circle" :status="status" @clickLoadMore="clickLoadMore" />
+ </uni-section>
+ </view>
+ <view>
+ <u-modal v-model="Modalshow" @confirm="confirmInput" :mask-close-able="true" :show-cancel-button="true">
+ <view class="slot-content">
+ <text>{{content}}</text>
+ <u-gap height="10"></u-gap>
+ <!-- 杈撳叆妗嗭紝浣跨敤 v-model 缁戝畾杈撳叆鍊� -->
+ <uni-easyinput v-model="inputValue" placeholder="璇疯緭鍏ュ彨鏂欑殑鐑樼儰璁惧" />
+ </view>
+ </u-modal>
+ <!-- 浣跨敤 uni-popup 缁勪欢锛岃缃负瀵硅瘽妗嗙被鍨� -->
+ <uni-popup ref="popup" type="dialog" background-color="#fff" class="popup-main">
+ <!-- 浣跨敤鎻掓Ы鑷畾涔夊脊鍑烘鍐呭 -->
+ <!-- <template #content> -->
+ <view class="popup-container">
+ <!-- 鏄剧ず瀵硅瘽妗嗗唴瀹� -->
+ <view class="popup-content">{{ content }}</view>
+ <!-- 杈撳叆妗嗭紝浣跨敤 v-model 缁戝畾杈撳叆鍊� -->
+ <uni-easyinput v-model="inputValue" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <!-- 鎸夐挳缁� -->
+ <view class="button-group">
+ <!-- 鍏抽棴鎸夐挳 -->
+ <u-button class="custom-button cancel-button" @click="closePopup" type="default" shape="square"
+ size="medium">鍏抽棴</u-button>
+ <!-- 鍚屾剰鎸夐挳 -->
+ <u-button class="custom-button confirm-button" @click="confirmInput" type="primary"
+ shape="square" size="medium">鍚屾剰</u-button>
+ </view>
+ </view>
+ <!-- </template> -->
+ </uni-popup>
+ </view>
+ </view>
+</template>
+<script>
+ export default {
+ data() {
+ return {
+ listData: [],
+ list: [{
+ name: '搴撳瓨鏌ョ湅'
+ }],
+ current2: 0,
+ current: 1,
+ size: 10,
+ status: 'more',
+ Modalshow: false,
+ title: "鎻愮ず",
+ content: '娆㈣繋浣跨敤 uni-popup!',
+ msgType: 'success',
+ value: '',
+ inputValue: ''
+ };
+ },
+ onLoad() {
+ this.submit();
+ },
+ methods: {
+ onClickItem(e) {
+ if (this.current != e.currentIndex) {
+ this.current = e.currentIndex;
+ }
+ },
+ submit(cb) {
+ this.$t.message.loading();
+ let formDataParam = {
+ current: this.current,
+ size: this.size
+ };
+ // 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
+ this.$u.post('/api/PDA/AGVPage', null).then(res => {
+ console.log(res);
+ this.$t.message.closeLoading();
+ cb && cb();
+ if (cb != null) this.listData = [];
+ this.listData = [...this.listData, ...res.data];
+ console.log(this.listData);
+ }).catch((err) => {
+ this.$t.message.toast(err.message);
+ });
+ },
+ clickLoadMore(e) {
+ this.status = 'loading';
+ this.current += 1;
+ this.size += 10;
+ this.submit();
+ },
+ handleClick(orderNo, productCode, number) {
+ console.log(this.$refs);
+ // this.$refs.popup.open();
+ this.Modalshow = true;
+ this.content = `宸ュ崟锛�${orderNo}\n鍨嬪彿锛�${productCode}\n鍙彨鏁伴噺锛�${number}\n璇风‘璁ゆ槸鍚﹀彨浠诲姟(榛樿4涓�)`;
+ },
+ confirmInput() {
+ this.$t.message.loading();
+
+ // 鎻愬彇杈撳叆妗嗙殑鍊�
+ const inputValue = this.inputValue;
+ // 鎻愬彇宸ュ崟缂栧彿
+ const orderNo = this.content.match(/宸ュ崟锛�(.*)\n/)[1];
+ // 鎻愬彇鍨嬪彿
+ const productCode = this.content.match(/鍨嬪彿锛�(.*)\n/)[1];
+ // 鎻愬彇鍙彨鏁伴噺
+ const availableQuantity = this.content.match(/鍙彨鏁伴噺锛�(.*)\n/)[1];
+ if (inputValue == "") {
+ this.$t.message.toast('璇疯緭鍏ョ儤鐑よ澶�');
+ return;
+ }
+ if (availableQuantity <= 0) {
+ this.$t.message.toast('鍙彨鏁伴噺涓�0锛屾棤娉曞彨浠诲姟');
+ return;
+ }
+ let formDataParam = {
+ DTaskId: this.generateUUID(),
+ ProductCode: productCode,
+ OrderNo: orderNo,
+ Number: availableQuantity > 4 ? 4 : availableQuantity,
+ InputValue: inputValue,
+ // ...鍏朵粬闇�瑕佷紶閫掔殑鍙傛暟
+ };
+ this.$u.post('/api/PDA/AddCZTask', formDataParam).then(res => {
+ if (res.status) {
+ // 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
+ this.$u.post('/api/PDA/insertTask', formDataParam).then(res => {
+ this.$t.message.closeLoading();
+ if (res.status) {
+ this.$t.message.toast('鍛煎彨鎴愬姛');
+ this.$refs.popup.close();
+ // this.submit();
+ } else {
+ this.$t.message.toast(res.msg);
+ }
+ });
+ // this.submit();
+ } else {
+ this.$t.message.toast(res.msg);
+ }
+ }).catch((err) => {
+ this.$t.message.toast(err.message);
+ });
+ },
+ closePopup() {
+ this.$refs.popup.close();
+ },
+ generateUUID() {
+ var d = new Date().getTime();
+ var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+ var r = (d + Math.random() * 16) % 16 | 0;
+ d = Math.floor(d / 16);
+ return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+ });
+ return uuid;
+ },
+ },
+ onPullDownRefresh() {
+ this.current = 1;
+ this.size = 10;
+ this.submit(() => uni.stopPullDownRefresh());
+ },
+ };
+</script>
+
+<style lang="scss" scoped>
+ @import '@/common/uni-ui.scss';
+
+ .example {
+ padding: 15px;
+ background-color: #fff;
+ }
+
+ page {
+ display: flex;
+ flex-direction: column;
+ box-sizing: border-box;
+ background-color: #efeff4;
+ min-height: 100%;
+ height: auto;
+ }
+
+ .tips {
+ color: #67c23a;
+ font-size: 14px;
+ line-height: 40px;
+ text-align: center;
+ background-color: #f0f9eb;
+ height: 0;
+ opacity: 0;
+ transform: translateY(-100%);
+ transition: all 0.3s;
+ }
+
+ .tips-ani {
+ transform: translateY(0);
+ height: 40px;
+ opacity: 1;
+ }
+
+ .content {
+ width: 100%;
+ display: flex;
+ }
+
+ .list-picture {
+ width: 100%;
+ height: 145px;
+ }
+
+ .thumb-image {
+ width: 100%;
+ height: 100%;
+ }
+
+ .ellipsis {
+ display: flex;
+ overflow: hidden;
+ }
+
+ .uni-ellipsis-1 {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+
+ .uni-ellipsis-2 {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ }
+
+ .popup-container {
+ padding: 20px;
+ text-align: center;
+ }
+
+ .popup-content {
+ margin-bottom: 15px;
+ font-size: 16px;
+ }
+
+ .custom-button {
+ border: none;
+ border-radius: 5px;
+ font-size: 14px;
+ cursor: pointer;
+ transition: all 0.3s ease;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+ }
+
+ .confirm-button:hover {
+ background-color: #0056b3;
+ }
+
+ .slot-content {
+ font-size: 28rpx;
+ color: $u-content-color;
+ padding-left: 30rpx;
+ }
+</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
new file mode 100644
index 0000000..aa553e5
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
@@ -0,0 +1,291 @@
+<template>
+ <view class="example">
+ <u-tabs :list="list" :is-Scroll="false" :current="current2"></u-tabs>
+ <view v-show="current2 === 0">
+ <uni-section title="涓�妤煎簱瀛樻煡鐪�" type="line" padding style="height: calc(100vh - 100px);">
+ <uni-list>
+ <!-- to 灞炴�ф惡甯﹀弬鏁拌烦杞鎯呴〉闈紝褰撳墠鍙负鍙傝�� -->
+ <uni-list-item direction="column" v-for="(item, index) in listData" :key="index"
+ @click="handleClick(item.orderNo, item.productCode, item.number)" link>
+ <!-- 閫氳繃header鎻掓Ы瀹氫箟鍒楄〃鐨勬爣棰� -->
+ <template v-slot:header>
+ <view class="uni-title">宸ュ崟锛歿{item.orderNo}}
+ <!-- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
+ @click="deleteList(item.container_barcode)">
+ </uni-icons> -->
+ </view>
+ </template>
+ <!-- 閫氳繃body鎻掓Ы瀹氫箟鍒楄〃鍐呭鏄剧ず -->
+ <template v-slot:body>
+ <view class="uni-list-box">
+ <view class="uni-content">
+ <view class="uni-title-sub uni-ellipsis-2">鍨嬪彿锛歿{item.productCode}}</view>
+ <view class="uni-title-sub uni-ellipsis-2">鍙彨浠诲姟鏁伴噺锛歿{item.number}}</view>
+ </view>
+ </view>
+ </template>
+ </uni-list-item>
+ </uni-list>
+ <uni-load-more iconType="circle" :status="status" @clickLoadMore="clickLoadMore" />
+ </uni-section>
+ </view>
+ <view>
+ <u-modal v-model="Modalshow" @confirm="confirmInput" :mask-close-able="true" :show-cancel-button="true">
+ <view class="slot-content">
+ <text>{{content}}</text>
+ <u-gap height="10"></u-gap>
+ <!-- 杈撳叆妗嗭紝浣跨敤 v-model 缁戝畾杈撳叆鍊� -->
+ <uni-easyinput v-model="inputValue" placeholder="璇疯緭鍏ュ彨鏂欑殑鐑樼儰璁惧" />
+ </view>
+ </u-modal>
+ <!-- 浣跨敤 uni-popup 缁勪欢锛岃缃负瀵硅瘽妗嗙被鍨� -->
+ <uni-popup ref="popup" type="dialog" background-color="#fff" class="popup-main">
+ <!-- 浣跨敤鎻掓Ы鑷畾涔夊脊鍑烘鍐呭 -->
+ <!-- <template #content> -->
+ <view class="popup-container">
+ <!-- 鏄剧ず瀵硅瘽妗嗗唴瀹� -->
+ <view class="popup-content">{{ content }}</view>
+ <!-- 杈撳叆妗嗭紝浣跨敤 v-model 缁戝畾杈撳叆鍊� -->
+ <uni-easyinput v-model="inputValue" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <!-- 鎸夐挳缁� -->
+ <view class="button-group">
+ <!-- 鍏抽棴鎸夐挳 -->
+ <u-button class="custom-button cancel-button" @click="closePopup" type="default" shape="square"
+ size="medium">鍏抽棴</u-button>
+ <!-- 鍚屾剰鎸夐挳 -->
+ <u-button class="custom-button confirm-button" @click="confirmInput" type="primary"
+ shape="square" size="medium">鍚屾剰</u-button>
+ </view>
+ </view>
+ <!-- </template> -->
+ </uni-popup>
+ </view>
+ </view>
+</template>
+<script>
+ export default {
+ data() {
+ return {
+ listData: [],
+ list: [{
+ name: '搴撳瓨鏌ョ湅'
+ }],
+ current2: 0,
+ current: 1,
+ size: 10,
+ status: 'more',
+ Modalshow: false,
+ title: "鎻愮ず",
+ content: '娆㈣繋浣跨敤 uni-popup!',
+ msgType: 'success',
+ value: '',
+ inputValue: ''
+ };
+ },
+ onLoad() {
+ this.submit();
+ },
+ methods: {
+ onClickItem(e) {
+ if (this.current != e.currentIndex) {
+ this.current = e.currentIndex;
+ }
+ },
+ submit(cb) {
+ this.$t.message.loading();
+ let formDataParam = {
+ current: this.current,
+ size: this.size
+ };
+ // 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
+ this.$u.post('/api/PDA/AGVPage', null).then(res => {
+ console.log(res);
+ this.$t.message.closeLoading();
+ cb && cb();
+ if (cb != null) this.listData = [];
+ this.listData = [...this.listData, ...res.data];
+ console.log(this.listData);
+ }).catch((err) => {
+ this.$t.message.toast(err.message);
+ });
+ },
+ clickLoadMore(e) {
+ this.status = 'loading';
+ this.current += 1;
+ this.size += 10;
+ this.submit();
+ },
+ handleClick(orderNo, productCode, number) {
+ console.log(this.$refs);
+ // this.$refs.popup.open();
+ this.Modalshow = true;
+ this.content = `宸ュ崟锛�${orderNo}\n鍨嬪彿锛�${productCode}\n鍙彨鏁伴噺锛�${number}\n璇风‘璁ゆ槸鍚﹀彨浠诲姟(榛樿4涓�)`;
+ },
+ confirmInput() {
+ this.$t.message.loading();
+
+ // 鎻愬彇杈撳叆妗嗙殑鍊�
+ const inputValue = this.inputValue;
+ // 鎻愬彇宸ュ崟缂栧彿
+ const orderNo = this.content.match(/宸ュ崟锛�(.*)\n/)[1];
+ // 鎻愬彇鍨嬪彿
+ const productCode = this.content.match(/鍨嬪彿锛�(.*)\n/)[1];
+ // 鎻愬彇鍙彨鏁伴噺
+ const availableQuantity = this.content.match(/鍙彨鏁伴噺锛�(.*)\n/)[1];
+ if (inputValue == "") {
+ this.$t.message.toast('璇疯緭鍏ョ儤鐑よ澶�');
+ return;
+ }
+ if (availableQuantity <= 0) {
+ this.$t.message.toast('鍙彨鏁伴噺涓�0锛屾棤娉曞彨浠诲姟');
+ return;
+ }
+ let formDataParam = {
+ DTaskId: this.generateUUID(),
+ ProductCode: productCode,
+ OrderNo: orderNo,
+ Number: availableQuantity > 4 ? 4 : availableQuantity,
+ InputValue: inputValue,
+ // ...鍏朵粬闇�瑕佷紶閫掔殑鍙傛暟
+ };
+
+ // 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
+ this.$u.post('/api/PDA/insertTask', formDataParam).then(res => {
+ if (res.status) {
+ this.$u.post('/api/PDA/AddCZTask', formDataParam).then(res => {
+ this.$t.message.closeLoading();
+ if (res.status) {
+ this.$t.message.toast('鍛煎彨鎴愬姛');
+ this.$refs.popup.close();
+ // this.submit();
+ } else {
+ this.$t.message.toast(res.msg);
+ }
+ });
+ // this.submit();
+ } else {
+ this.$t.message.toast(res.msg);
+ }
+ }).catch((err) => {
+ this.$t.message.toast(err.message);
+ });
+ },
+ closePopup() {
+ this.$refs.popup.close();
+ },
+ generateUUID() {
+ var d = new Date().getTime();
+ var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+ var r = (d + Math.random() * 16) % 16 | 0;
+ d = Math.floor(d / 16);
+ return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+ });
+ return uuid;
+ },
+ },
+ onPullDownRefresh() {
+ this.current = 1;
+ this.size = 10;
+ this.submit(() => uni.stopPullDownRefresh());
+ },
+ };
+</script>
+
+<style lang="scss" scoped>
+ @import '@/common/uni-ui.scss';
+
+ .example {
+ padding: 15px;
+ background-color: #fff;
+ }
+
+ page {
+ display: flex;
+ flex-direction: column;
+ box-sizing: border-box;
+ background-color: #efeff4;
+ min-height: 100%;
+ height: auto;
+ }
+
+ .tips {
+ color: #67c23a;
+ font-size: 14px;
+ line-height: 40px;
+ text-align: center;
+ background-color: #f0f9eb;
+ height: 0;
+ opacity: 0;
+ transform: translateY(-100%);
+ transition: all 0.3s;
+ }
+
+ .tips-ani {
+ transform: translateY(0);
+ height: 40px;
+ opacity: 1;
+ }
+
+ .content {
+ width: 100%;
+ display: flex;
+ }
+
+ .list-picture {
+ width: 100%;
+ height: 145px;
+ }
+
+ .thumb-image {
+ width: 100%;
+ height: 100%;
+ }
+
+ .ellipsis {
+ display: flex;
+ overflow: hidden;
+ }
+
+ .uni-ellipsis-1 {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+
+ .uni-ellipsis-2 {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ }
+
+ .popup-container {
+ padding: 20px;
+ text-align: center;
+ }
+
+ .popup-content {
+ margin-bottom: 15px;
+ font-size: 16px;
+ }
+
+ .custom-button {
+ border: none;
+ border-radius: 5px;
+ font-size: 14px;
+ cursor: pointer;
+ transition: all 0.3s ease;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+ }
+
+ .confirm-button:hover {
+ background-color: #0056b3;
+ }
+
+ .slot-content {
+ font-size: 28rpx;
+ color: $u-content-color;
+ padding-left: 30rpx;
+ }
+</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/CZTaskDto.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/CZTaskDto.cs"
index 315110d..ba6e21e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/CZTaskDto.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/CZTaskDto.cs"
@@ -27,5 +27,15 @@
/// 鏁伴噺
/// </summary>
public int Number { get; set; }
+
+ /// <summary>
+ /// 鍙枡鏈哄彴
+ /// </summary>
+ public string InputValue { get; set; }
+
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public string TaskType { get; set; }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/ITaskCZRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/ITaskCZRepository.cs"
new file mode 100644
index 0000000..9c471f4
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/ITaskCZRepository.cs"
@@ -0,0 +1,31 @@
+锘�#region << 鐗� 鏈� 娉� 閲� >>
+/*----------------------------------------------------------------
+ * 鍛藉悕绌洪棿锛歐IDESEAWCS_ITaskInfoRepository
+ * 鍒涘缓鑰咃細鑳＄搴�
+ * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
+ * 鐗堟湰锛歏1.0.0
+ * 鎻忚堪锛�
+ *
+ * ----------------------------------------------------------------
+ * 淇敼浜猴細
+ * 淇敼鏃堕棿锛�
+ * 鐗堟湰锛歏1.0.1
+ * 淇敼璇存槑锛�
+ *
+ *----------------------------------------------------------------*/
+#endregion << 鐗� 鏈� 娉� 閲� >>
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_Model.Models;
+
+namespace WIDESEAWCS_ITaskInfoRepository
+{
+ public interface ITaskCZRepository : IRepository<DtCZTask>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskCZService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskCZService.cs"
new file mode 100644
index 0000000..dd629f6
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskCZService.cs"
@@ -0,0 +1,38 @@
+锘�#region << 鐗� 鏈� 娉� 閲� >>
+/*----------------------------------------------------------------
+ * 鍛藉悕绌洪棿锛歐IDESEAWCS_ITaskInfoService
+ * 鍒涘缓鑰咃細鑳＄搴�
+ * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
+ * 鐗堟湰锛歏1.0.0
+ * 鎻忚堪锛�
+ *
+ * ----------------------------------------------------------------
+ * 淇敼浜猴細
+ * 淇敼鏃堕棿锛�
+ * 鐗堟湰锛歏1.0.1
+ * 淇敼璇存槑锛�
+ *
+ *----------------------------------------------------------------*/
+#endregion << 鐗� 鏈� 娉� 閲� >>
+
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_Core.Enums;
+using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_Common.TaskEnum;
+
+namespace WIDESEAWCS_ITaskInfoService
+{
+ public interface ITaskCZService : IService<DtCZTask>
+ {
+ public Task<WebResponseContent> AddTaskCZAsync(CZTaskDto dto);
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/DtCZTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/DtCZTask.cs"
index f664cdf..09fbda6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/DtCZTask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/DtCZTask.cs"
@@ -6,7 +6,7 @@
using System.Threading.Tasks;
using WIDESEAWCS_Core.DB.Models;
-namespace WIDESEAWCS_Model.Models.TaskInfo
+namespace WIDESEAWCS_Model.Models
{
[SugarTable(nameof(DtCZTask), "浠诲姟淇℃伅")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/PDA/PDAController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/PDA/PDAController.cs"
index 29bbb0e..b8dc811 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/PDA/PDAController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/PDA/PDAController.cs"
@@ -15,9 +15,11 @@
public class PDAController : ApiBaseController<ITaskService, Dt_Task>
{
private readonly IHttpContextAccessor _httpContextAccessor;
- public PDAController(ITaskService service, IHttpContextAccessor httpContextAccessor) : base(service)
+ private readonly ITaskCZService _taskCZService;
+ public PDAController(ITaskService service, IHttpContextAccessor httpContextAccessor, ITaskCZService taskCZService) : base(service)
{
_httpContextAccessor = httpContextAccessor;
+ _taskCZService = taskCZService;
}
[HttpPost, Route("AGVPage"), AllowAnonymous]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/TaskCZRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/TaskCZRepository.cs"
new file mode 100644
index 0000000..f112e2b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/TaskCZRepository.cs"
@@ -0,0 +1,35 @@
+锘�#region << 鐗� 鏈� 娉� 閲� >>
+/*----------------------------------------------------------------
+ * 鍛藉悕绌洪棿锛歐IDESEAWCS_TaskInfoRepository
+ * 鍒涘缓鑰咃細鑳＄搴�
+ * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
+ * 鐗堟湰锛歏1.0.0
+ * 鎻忚堪锛�
+ *
+ * ----------------------------------------------------------------
+ * 淇敼浜猴細
+ * 淇敼鏃堕棿锛�
+ * 鐗堟湰锛歏1.0.1
+ * 淇敼璇存槑锛�
+ *
+ *----------------------------------------------------------------*/
+#endregion << 鐗� 鏈� 娉� 閲� >>
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_ITaskInfoRepository;
+using WIDESEAWCS_Model.Models;
+
+namespace WIDESEAWCS_TaskInfoRepository
+{
+ public class TaskCZRepository : RepositoryBase<DtCZTask>, ITaskCZRepository
+ {
+ public TaskCZRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
+ {
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs"
new file mode 100644
index 0000000..9a62871
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs"
@@ -0,0 +1,79 @@
+锘�#region << 鐗� 鏈� 娉� 閲� >>
+/*----------------------------------------------------------------
+ * 鍛藉悕绌洪棿锛歐IDESEAWCS_TaskInfoService
+ * 鍒涘缓鑰咃細鑳＄搴�
+ * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
+ * 鐗堟湰锛歏1.0.0
+ * 鎻忚堪锛�
+ *
+ * ----------------------------------------------------------------
+ * 淇敼浜猴細
+ * 淇敼鏃堕棿锛�
+ * 鐗堟湰锛歏1.0.1
+ * 淇敼璇存槑锛�
+ *
+ *----------------------------------------------------------------*/
+#endregion << 鐗� 鏈� 娉� 閲� >>
+
+using AutoMapper;
+using SqlSugar;
+using System.Diagnostics.CodeAnalysis;
+using WIDESEAWCS_Common.TaskEnum;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_ITaskInfoRepository;
+using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob.Models;
+using WIDESEAWCS_QuartzJob.Service;
+
+namespace WIDESEAWCS_TaskInfoService
+{
+ public class TaskCZService : ServiceBase<DtCZTask, ITaskCZRepository>, ITaskCZService
+ {
+ public TaskCZService(ITaskCZRepository BaseDal) : base(BaseDal)
+ {
+ }
+
+ public Task<WebResponseContent> AddTaskCZAsync(CZTaskDto dto)
+ {
+ var response = new WebResponseContent();
+ try
+ {
+ var task = BaseDal.QueryFirst(x => (x.TaskTaskID == dto.DTaskId) || (x.TaskEndAddress == dto.InputValue) || (x.TaskType == dto.TaskType));
+ if (task != null)
+ {
+ response.Error("浠诲姟宸插瓨鍦紝璇峰嬁閲嶅娣诲姞锛�");
+ }
+ var taskModel = new DtCZTask()
+ {
+ TaskTaskID = dto.DTaskId,
+ TaskType = dto.TaskType,
+ TaskEndAddress = dto.InputValue,
+ TaskStatus = TaskInStatusEnum.InNew.ToString(),
+ CreateDate = DateTime.Now,
+ TaskStartDate = DateTime.Now,
+ TaskEndDate = DateTime.Now.AddDays(1),
+ TaskName = dto.TaskType.ToString(),
+ TaskNumber = dto.Number,
+ TaskExecutor = "CZ",
+ TaskOrderNo = dto.OrderNo,
+ TaskOwner = "KH",
+ TaskProductCode = dto.ProductCode,
+ Creater = "KH"
+ };
+ var isTrue = BaseDal.AddData(taskModel) > 0;
+ if (isTrue)
+ response.OK("浠诲姟娣诲姞鎴愬姛锛�");
+ else
+ response.Error("浠诲姟娣诲姞澶辫触锛�");
+ }
+ catch (System.Exception ex)
+ {
+ response.Error(ex.Message);
+ }
+ return Task.FromResult(response);
+ }
+ }
+}
--
Gitblit v1.9.3