diff --git a/src/pages.json b/src/pages.json index 5074a96..4439509 100644 --- a/src/pages.json +++ b/src/pages.json @@ -413,7 +413,8 @@ { "path": "pages/repair/testExamine/index", "style": { - "navigationBarTitleText": "修试审核" + // "navigationBarTitleText": "修试审核" + "navigationStyle": "custom" } }, //修试审核-详情 diff --git a/src/pages/back/addBack.vue b/src/pages/back/addBack.vue index a01d859..67ee544 100644 --- a/src/pages/back/addBack.vue +++ b/src/pages/back/addBack.vue @@ -33,8 +33,8 @@ @clear="clearPro" > - - + + @@ -59,6 +59,8 @@ import { getAgreementInfoById, } from '../../services/back.js' import eselect from '@/components/tree-select/eselect.vue' +import { useMemberStore } from '@/stores' +const memberStore = useMemberStore() const treeSelect = ref(null) const treeSelect2 = ref(null) const formData = ref({}) @@ -167,7 +169,7 @@ const confirmAdd = () => { if (agreementId.value == '') { uni.showToast({ title: '请确认退料单位,退料工程!', icon: 'none' }) } else if (backPerson.value == '') { - uni.showToast({ title: '请确认制单人!', icon: 'none' }) + uni.showToast({ title: '请确认退料人!', icon: 'none' }) } else { let obj = { backApplyInfo: { @@ -207,6 +209,7 @@ onLoad((options) => { getUnit() getProject() // formData.value = JSON.parse(options.item) + backPerson.value = memberStore.userInfo.nickName }) diff --git a/src/pages/back/backCode.vue b/src/pages/back/backCode.vue index 7c9ada3..6aca969 100644 --- a/src/pages/back/backCode.vue +++ b/src/pages/back/backCode.vue @@ -22,7 +22,7 @@ taskInfo.code }} - + {{ taskInfo.backPerson }} diff --git a/src/pages/back/backCodeAdd.vue b/src/pages/back/backCodeAdd.vue index a536d32..0ebcbb1 100644 --- a/src/pages/back/backCodeAdd.vue +++ b/src/pages/back/backCodeAdd.vue @@ -37,9 +37,9 @@ - 制单人: + 退料人: - + @@ -103,6 +103,8 @@ import { onLoad } from '@dcloudio/uni-app' import { getMachine, insertBack, getMachineByQrCodeApi } from '../../services/back.js' import ScanQrCode from '@/pages/devicesSearch/ScanQrCode.vue' import { baseURL } from '@/utils/http' +import { useMemberStore } from '@/stores' +const memberStore = useMemberStore() const backPerson = ref('') const phone = ref('') const apDetection = ref('完好') //外观判定 @@ -313,6 +315,7 @@ const getMaInfoScan = async () => { onLoad((options) => { console.log(options) + backPerson.value = memberStore.userInfo.nickName }) diff --git a/src/pages/back/backNumDetail.vue b/src/pages/back/backNumDetail.vue index 8787917..b1cb908 100644 --- a/src/pages/back/backNumDetail.vue +++ b/src/pages/back/backNumDetail.vue @@ -14,7 +14,7 @@ {{ taskInfo.code }} - + {{ taskInfo.backPerson }} diff --git a/src/pages/back/index.vue b/src/pages/back/index.vue index fb7cc72..2f206f7 100644 --- a/src/pages/back/index.vue +++ b/src/pages/back/index.vue @@ -111,7 +111,7 @@ > - 制单人: + 退料人:
{{ item.backPerson }}
diff --git a/src/pages/repair/fieldMaintenance/added.vue b/src/pages/repair/fieldMaintenance/added.vue index 967b49b..2bd8daa 100644 --- a/src/pages/repair/fieldMaintenance/added.vue +++ b/src/pages/repair/fieldMaintenance/added.vue @@ -153,7 +153,7 @@ const confirmAdd = () => { if (agreementId.value == '') { uni.showToast({ title: '请确认单位名称,工程名称!', icon: 'none' }) } else if (fieldPerson.value == '') { - uni.showToast({ title: '请确认制单人!', icon: 'none' }) + uni.showToast({ title: '请确认退料人!', icon: 'none' }) } else if (phone.value == '') { uni.showToast({ title: '请确认联系电话!', icon: 'none' }) } else { diff --git a/src/pages/repair/repairManage/code-operate.vue b/src/pages/repair/repairManage/code-operate.vue index 107e842..bc0d209 100644 --- a/src/pages/repair/repairManage/code-operate.vue +++ b/src/pages/repair/repairManage/code-operate.vue @@ -477,7 +477,7 @@ const formMiddle = ref({ //待报废 const formRight = ref({ // scrapNum:0, - scrapType: 0, + scrapType: 1, scrapId: null, // 报废原因id scrapReason: '', // 报废原因 fileList: [], diff --git a/src/pages/repair/repairManage/num-operate.vue b/src/pages/repair/repairManage/num-operate.vue index a86008e..e42a2eb 100644 --- a/src/pages/repair/repairManage/num-operate.vue +++ b/src/pages/repair/repairManage/num-operate.vue @@ -436,7 +436,7 @@ const delMidPart = (index) => { //待报废 const formRight = ref({ scrapNum: 0, - scrapType: 0, + scrapType: 1, scrapReason: '', fileList:[] }) diff --git a/src/pages/repair/testExamine/index.vue b/src/pages/repair/testExamine/index.vue index 05bd776..d7ed74e 100644 --- a/src/pages/repair/testExamine/index.vue +++ b/src/pages/repair/testExamine/index.vue @@ -1,5 +1,6 @@