diff --git a/common/http/config.ts b/common/http/config.ts
index d505333..ca492a4 100644
--- a/common/http/config.ts
+++ b/common/http/config.ts
@@ -1,18 +1,18 @@
export default {
//正式接口
- // base_scm:'/api',
- // base_auth:'',//登录
- // base_mes:'/mes',//面料
- // base_process:'/mes',//工艺
+ base_scm:'/api',
+ base_auth:'',//登录
+ base_mes:'/mes',//面料
+ base_process:'/mes',//工艺
//本地服务
- // base_scm: 'http://192.168.1.222:7002',
- base_scm: 'https://scm.goodsilk.cn/api',
- base_auth:'https://oauth.goodsilk.cn/api',//登录
- base_mes:'https://scm.goodsilk.cn/mes',//面料
- base_process:'https://scm.goodsilk.cn/mes',//工艺
+ // // base_scm: 'http://192.168.1.222:7002',
+ // base_scm: 'https://scm.goodsilk.cn/api',
+ // base_auth:'https://oauth.goodsilk.cn/api',//登录
+ // base_mes:'https://scm.goodsilk.cn/mes',//面料
+ // base_process:'https://scm.goodsilk.cn/mes',//工艺
}
\ No newline at end of file
diff --git a/pages/colorBlank/ColorBlankQuality.vue b/pages/colorBlank/ColorBlankQuality.vue
index f877d45..3c81670 100644
--- a/pages/colorBlank/ColorBlankQuality.vue
+++ b/pages/colorBlank/ColorBlankQuality.vue
@@ -22,7 +22,7 @@
form.value = JSON.parse(option.item)
form.value.testTime = formatDate(new Date())
for (let i = 0; i < form.value.ps; i++) {
- listData.value.push({})
+ listData.value.push({gcsh:'01'})
}
if (form.value.status) {
listData.value = form.value.mlxqs
@@ -142,36 +142,34 @@
// 验布分数
const ifReturn = ref(false)
const ms = ref()
- const zfs = ref()
- const yjksms = ref()
+ const zfs = ref(100)
+ const yjksms = ref(0)
const dialogList = ref([] as any[])
const openDialog = (index : any) => {
if (!form.value.width) return showToast('请先填写门幅!')
showDialog.value = true
indexData.value = index
ms.value = listData.value[indexData.value].ms
- zfs.value = listData.value[indexData.value].zfs
- yjksms.value = listData.value[indexData.value].yjksms
+ zfs.value = listData.value[indexData.value].zfs?listData.value[indexData.value].zfs:100
+ yjksms.value = listData.value[indexData.value].yjksms?listData.value[indexData.value].yjksms:0
ifReturn.value = listData.value[indexData.value].ifReturn
- dialogList.value = listData.value[indexData.value].dialogList ? listData.value[indexData.value].dialogList : []
+ dialogList.value = listData.value[indexData.value].dialogList ? listData.value[indexData.value].dialogList : [{}]
}
const dialogCancel = () => {
ms.value = ''
- zfs.value = ''
- yjksms.value = ''
+ yjksms.value = 0
ifReturn.value = false
dialogList.value = []
showDialog.value = false
}
const dialogSubmit = () => {
- listData.value[indexData.value] = { ms: ms.value, zfs: zfs.value, yjksms: yjksms.value, ifReturn: ifReturn.value, dialogList: dialogList.value }
+ listData.value[indexData.value] = { ms: ms.value, zfs: zfs.value, yjksms: yjksms.value, ifReturn: ifReturn.value, dialogList: dialogList.value,gcsh:'01' }
if (ifReturn.value) {
listData.value[indexData.value].code = '回修'
}
showDialog.value = false
ms.value = ''
- zfs.value = ''
- yjksms.value = ''
+ yjksms.value = 0
ifReturn.value = false
dialogList.value = []
}
@@ -191,10 +189,15 @@
chooseItem.value = dialogList.value[indexType.value]
}
const popupSubmit = () => {
- if (!chooseItem.value.wz || !chooseItem.value.kfs || !chooseItem.value.xc) return showToast('请填写完整信息!')
+ if (!chooseItem.value.xc || !chooseItem.value.kfs) return showToast('请填写完整信息!')//!chooseItem.value.wz || !chooseItem.value.kfs ||
+ showPop.value = false
+ cultFs()
+ }
+
+ const cultFs =()=>{
let fs = 100
dialogList.value.forEach((l : any) => {
- fs = fs - l.kfs
+ fs = fs - (l.kfs?l.kfs:0)
})
zfs.value = fs
if (form.value.width >= 120) {
@@ -210,7 +213,6 @@
yjksms.value = 0
}
}
- showPop.value = false
}
//提交
@@ -312,7 +314,6 @@
//申请审核
const application = () => {
listData1.value = JSON.parse(JSON.stringify(listData.value))
- console.log(listData1.value);
let tj = false
listData1.value.forEach((l : any) => {
if ((!l.ms || !l.code || !l.gcsh) && !l.ifReturn) {
@@ -359,6 +360,17 @@
}
})
}
+
+ const closePopup = () =>{
+ showPop.value=false
+ chooseItem.value={}
+ cultFs()
+ }
+
+ const delectList = (index:any) =>{
+ dialogList.value.splice(index,1)
+ cultFs()
+ }
@@ -467,11 +479,17 @@
{{item.name}} 4 {{item.name}} 4 请选择需要主管审核的面料: 其他要求 其他要求
预计扣损米数
d?ee(e,r,i,!0,!1,p):$(t,n,o,r,i,l,s,c,p)},X=(e,t,n,o,r,i,l,s,c)=>{let u=0;const d=t.length;let p=e.length-1,f=d-1;for(;u<=p&&u<=f;){const o=e[u],a=t[u]=c?pr(t[u]):dr(t[u]);if(!nr(o,a))break;x(o,a,n,null,r,i,l,s,c),u++}for(;u<=p&&u<=f;){const o=e[p],a=t[f]=c?pr(t[f]):dr(t[f]);if(!nr(o,a))break;x(o,a,n,null,r,i,l,s,c),p--,f--}if(u>p){if(u<=f){const e=f+1,a=e d?ee(e,r,i,!0,!1,p):$(t,n,o,r,i,l,s,c,p)},X=(e,t,n,o,r,i,l,s,c)=>{let u=0;const d=t.length;let p=e.length-1,f=d-1;for(;u<=p&&u<=f;){const o=e[u],a=t[u]=c?pr(t[u]):dr(t[u]);if(!nr(o,a))break;x(o,a,n,null,r,i,l,s,c),u++}for(;u<=p&&u<=f;){const o=e[p],a=t[f]=c?pr(t[f]):dr(t[f]);if(!nr(o,a))break;x(o,a,n,null,r,i,l,s,c),p--,f--}if(u>p){if(u<=f){const e=f+1,a=e>1,e[n[l]]0&&(t[o]=n[r-1]),n[r]=o)}}r=n.length,i=n[r-1];for(;r-- >0;)n[r]=i,i=t[i];return n}(S):a;for(g=k.length-1,u=b-1;u>=0;u--){const e=m+u,a=t[e],p=e+1Kr(t)+Kr(e[n]))))}function Kr(e){return"auto"===e?0:1e3*Number(e.slice(0,-1).replace(",","."))}const Gr=Symbol("_vod"),Zr=Symbol("_vsh"),Jr={beforeMount(e,{value:t},{transition:n}){e[Gr]="none"===e.style.display?"":e.style.display,n&&t?n.beforeEnter(e):Qr(e,t)},mounted(e,{value:t},{transition:n}){n&&t&&n.enter(e)},updated(e,{value:t,oldValue:n},{transition:o}){!t!=!n&&(o?t?(o.beforeEnter(e),Qr(e,!0),o.enter(e)):o.leave(e,(()=>{Qr(e,!1)})):Qr(e,t))},beforeUnmount(e,{value:t}){Qr(e,t)}};function Qr(e,t){e.style.display=t?e[Gr]:"none",e[Zr]=!t}const ei=Symbol(""),ti=/(^|;)\s*display\s*:/;const ni=/\s*!important$/;function oi(e,t,n){if(f(n))n.forEach((n=>oi(e,t,n)));else if(null==n&&(n=""),n=fi(n),t.startsWith("--"))e.setProperty(t,n);else{const o=function(e,t){const n=ri[t];if(n)return n;let o=O(t);if("filter"!==o&&o in e)return ri[t]=o;o=A(o);for(let a=0;a=0&&(s=-1),s>-1&&(o=t.slice(0,s),r=t.slice(s+1,l>-1?l:t.length),a=e(r)),l>-1&&(o=o||t.slice(0,l),i=t.slice(l,t.length)),o=function(e,t){if(e.startsWith("/"))return e;if(!e)return t;const n=t.split("/"),o=e.split("/"),a=o[o.length-1];".."!==a&&"."!==a||o.push("");let r,i,l=n.length-1;for(r=0;r>1,e[n[l]]0&&(t[o]=n[r-1]),n[r]=o)}}r=n.length,i=n[r-1];for(;r-- >0;)n[r]=i,i=t[i];return n}(S):a;for(g=k.length-1,u=b-1;u>=0;u--){const e=m+u,a=t[e],p=e+1Kr(t)+Kr(e[n]))))}function Kr(e){return"auto"===e?0:1e3*Number(e.slice(0,-1).replace(",","."))}const Gr=Symbol("_vod"),Zr=Symbol("_vsh"),Jr={beforeMount(e,{value:t},{transition:n}){e[Gr]="none"===e.style.display?"":e.style.display,n&&t?n.beforeEnter(e):Qr(e,t)},mounted(e,{value:t},{transition:n}){n&&t&&n.enter(e)},updated(e,{value:t,oldValue:n},{transition:o}){!t!=!n&&(o?t?(o.beforeEnter(e),Qr(e,!0),o.enter(e)):o.leave(e,(()=>{Qr(e,!1)})):Qr(e,t))},beforeUnmount(e,{value:t}){Qr(e,t)}};function Qr(e,t){e.style.display=t?e[Gr]:"none",e[Zr]=!t}const ei=Symbol(""),ti=/(^|;)\s*display\s*:/;const ni=/\s*!important$/;function oi(e,t,n){if(f(n))n.forEach((n=>oi(e,t,n)));else if(null==n&&(n=""),n=fi(n),t.startsWith("--"))e.setProperty(t,n);else{const o=function(e,t){const n=ri[t];if(n)return n;let o=O(t);if("filter"!==o&&o in e)return ri[t]=o;o=A(o);for(let a=0;a=0&&(s=-1),s>-1&&(o=t.slice(0,s),r=t.slice(s+1,l>-1?l:t.length),a=e(r)),l>-1&&(o=o||t.slice(0,l),i=t.slice(l,t.length)),o=function(e,t){if(e.startsWith("/"))return e;if(!e)return t;const n=t.split("/"),o=e.split("/"),a=o[o.length-1];".."!==a&&"."!==a||o.push("");let r,i,l=n.length-1;for(r=0;r