bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
liang.chao 2024-04-20 10:43:01 +08:00
parent 6207d42ee5 7b312fbffc
commit 3024ae46e7
19 changed files with 50 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-ui/src/utils/globalUrl.js
View File

@ -1,6 +1,6 @@
// const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试 const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试
const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆 // const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆
// const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏 // const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
// const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网 // const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网

6
sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
View File

@ -287,7 +287,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="200" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="100" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -600,6 +600,7 @@ export default {
typeof response.data.fileName === "string" typeof response.data.fileName === "string"
) { ) {
try { try {
if(response.data.fileUrl!=''){
let [urlArr, nameArr] = [ let [urlArr, nameArr] = [
response.data.fileUrl, response.data.fileUrl,
response.data.fileName response.data.fileName
@ -608,13 +609,16 @@ export default {
if (urlArr.length !== nameArr.length) { if (urlArr.length !== nameArr.length) {
return; return;
} }
console.log(urlArr)
let fileList = urlArr.map((url, i) => ({ let fileList = urlArr.map((url, i) => ({
name: nameArr[i], name: nameArr[i],
url: `${this.uploadUrl}${url}` url: `${this.uploadUrl}${url}`
})); }));
console.log(fileList)
this.fileList = fileList; this.fileList = fileList;
this.checkUrlList = urlArr; this.checkUrlList = urlArr;
this.checkUrlNameList = nameArr; this.checkUrlNameList = nameArr;
}
} catch (error) { } catch (error) {
console.error("处理合同照片时发生错误:", error); console.error("处理合同照片时发生错误:", error);
} }

4
sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
View File

@ -415,9 +415,9 @@
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams.time = [] this.queryParams.time = []
this.queryParams.unitId = null
this.queryParams.proId = null
this.resetForm('queryForm') this.resetForm('queryForm')
this.GetUnitData()
this.GetProData()
this.handleQuery() this.handleQuery()
}, },

2
sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
View File

@ -614,6 +614,8 @@
resetQuery() { resetQuery() {
this.queryParams.time = [] this.queryParams.time = []
this.resetForm('queryForm') this.resetForm('queryForm')
this.GetUnitData()
this.GetProData()
this.handleQuery() this.handleQuery()
}, },
handleNotice() { handleNotice() {

4
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
View File

@ -431,9 +431,9 @@
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams.time = [] this.queryParams.time = []
this.queryParams.unitId = null
this.queryParams.proId = null
this.resetForm('queryForm') this.resetForm('queryForm')
this.GetUnitData()
this.GetProData()
this.handleQuery() this.handleQuery()
}, },

6
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
View File

@ -22,7 +22,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="领料工程" prop="proId" :rules="queryParams.leaseType == '0' ? queryRules.proIdRule : [{required: false}]"> <el-form-item label="领料工程" prop="proId">
<el-select v-model="queryParams.proId" filterable clearable @change="GetUnitData" style="width: 240px" placeholder="请选择"> <el-select v-model="queryParams.proId" filterable clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
<el-option <el-option
v-for="item in proList" v-for="item in proList"
@ -306,7 +306,7 @@ export default {
required:true,message:'请选择来往单位',trigger:'change' required:true,message:'请选择来往单位',trigger:'change'
} }
], ],
proIdRule:[ proId:[
{ {
required:true,message:'请选择工程',trigger:'change' required:true,message:'请选择工程',trigger:'change'
} }
@ -618,7 +618,7 @@ export default {
if(res.code == 200){ if(res.code == 200){
this.$message({ this.$message({
type:'success', type:'success',
message: '申请成功' message: res.msg
}) })
this.$tab.closeOpenPage({ path: "/claimAndRefund/receiveByCq/receiveApply"}); this.$tab.closeOpenPage({ path: "/claimAndRefund/receiveByCq/receiveApply"});
} }

4
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
View File

@ -222,7 +222,7 @@
<el-input <el-input
placeholder="请输入审核意见" placeholder="请输入审核意见"
type="textarea" type="textarea"
maxlength="200" maxlength="100"
:autosize="{ minRows: 4, maxRows: 6}" :autosize="{ minRows: 4, maxRows: 6}"
v-model="queryParams.companyAuditRemarks" v-model="queryParams.companyAuditRemarks"
></el-input> ></el-input>
@ -252,7 +252,7 @@
<el-input <el-input
placeholder="请输入审核意见" placeholder="请输入审核意见"
type="textarea" type="textarea"
maxlength="200" maxlength="100"
:autosize="{ minRows: 4, maxRows: 6}" :autosize="{ minRows: 4, maxRows: 6}"
v-model="queryParams.companyAuditRemarks" v-model="queryParams.companyAuditRemarks"
></el-input> ></el-input>

2
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
View File

@ -488,6 +488,8 @@ export default {
resetQuery() { resetQuery() {
this.queryParams.time = [] this.queryParams.time = []
this.resetForm('queryForm') this.resetForm('queryForm')
this.GetUnitData()
this.GetProData()
this.handleQuery() this.handleQuery()
}, },
handleNotice() { handleNotice() {

4
sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
View File

@ -682,7 +682,7 @@ export default {
} }
const res = await submitRefuseBackApply(params) const res = await submitRefuseBackApply(params)
if (res.code == 200) { if (res.code == 200) {
this.$message({ type: 'success', message: '申请成功'}) this.$message({ type: 'success', message: res.msg})
setTimeout(() => { setTimeout(() => {
this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApply"}); this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApply"});
}, 1000) }, 1000)
@ -697,7 +697,7 @@ export default {
} }
const res = await submitBackApplyApi(params) const res = await submitBackApplyApi(params)
if (res.code == 200) { if (res.code == 200) {
this.$message({ type: 'success', message: '申请成功'}) this.$message({ type: 'success', message: res.msg})
setTimeout(() => { setTimeout(() => {
this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApply"}); this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApply"});
}, 1000) }, 1000)

4
sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
View File

@ -671,7 +671,7 @@ export default {
} }
const res = await submitRefuseBackApply(params) const res = await submitRefuseBackApply(params)
if (res.code == 200) { if (res.code == 200) {
this.$message({ type: 'success', message: '申请成功'}) this.$message({ type: 'success', message: res.msg})
setTimeout(() => { setTimeout(() => {
this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApplyByCq"}); this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApplyByCq"});
}, 1000) }, 1000)
@ -686,7 +686,7 @@ export default {
} }
const res = await submitBackApplyApi(params) const res = await submitBackApplyApi(params)
if (res.code == 200) { if (res.code == 200) {
this.$message({ type: 'success', message: '申请成功'}) this.$message({ type: 'success', message: res.msg})
setTimeout(() => { setTimeout(() => {
this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApplyByCq"}); this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApplyByCq"});
}, 1000) }, 1000)

2
sgzb-ui/src/views/cost/csotSettlement/costExame.vue
View File

@ -122,7 +122,7 @@
</el-form-item> </el-form-item>
<el-form-item label="原因" prop="remark"> <el-form-item label="原因" prop="remark">
<el-input <el-input
v-model="aform.remark" maxlength="200" v-model="aform.remark" maxlength="100"
placeholder="请输入" show-word-limit placeholder="请输入" show-word-limit
size="small" style="width: 350px" size="small" style="width: 350px"
type="textarea" type="textarea"

2
sgzb-ui/src/views/dashboard.vue
View File

@ -16,7 +16,7 @@
}, },
methods: { methods: {
openNewWindow() { openNewWindow() {
window.open('http://112.29.103.165:21626/index01.html?token='+localStorage.getItem('token'), '_blank'); window.open('http://192.168.0.14:21624/index01.html?token='+localStorage.getItem('token'), '_blank');
} }
} }
}; };

2
sgzb-ui/src/views/repairTest/brokenExamine/index.vue
View File

@ -609,7 +609,7 @@
style="width: 600px" style="width: 600px"
type="textarea" type="textarea"
v-model="form.remark" v-model="form.remark"
maxlength="200" maxlength="100"
show-word-limit show-word-limit
></el-input> ></el-input>
</el-form-item> </el-form-item>

4
sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
View File

@ -103,7 +103,7 @@
> >
<el-input <el-input
v-model="domain.repairContent" v-model="domain.repairContent"
maxlength="200" maxlength="100"
placeholder="请输入" placeholder="请输入"
show-word-limit show-word-limit
size="small" size="small"
@ -246,7 +246,7 @@
> >
<el-input <el-input
v-model="domain.repairContent" v-model="domain.repairContent"
maxlength="200" maxlength="100"
placeholder="请输入" placeholder="请输入"
show-word-limit show-word-limit
size="small" size="small"

4
sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue
View File

@ -117,7 +117,7 @@
> >
<el-input <el-input
v-model="domain.repairContent" v-model="domain.repairContent"
maxlength="200" maxlength="100"
placeholder="请输入" placeholder="请输入"
show-word-limit show-word-limit
size="small" size="small"
@ -258,7 +258,7 @@
> >
<el-input <el-input
v-model="domain.repairContent" v-model="domain.repairContent"
maxlength="200" maxlength="100"
placeholder="请输入" placeholder="请输入"
show-word-limit show-word-limit
size="small" size="small"

2
sgzb-ui/src/views/repairTest/testExamine/index.vue
View File

@ -710,7 +710,7 @@
style="width: 600px" style="width: 600px"
type="textarea" type="textarea"
v-model="form.remark" v-model="form.remark"
maxlength="200" maxlength="100"
show-word-limit show-word-limit
></el-input> ></el-input>
</el-form-item> </el-form-item>

4
sgzb-ui/src/views/store/warehousing/putInStore.vue
View File

@ -114,7 +114,7 @@
v-model="codeForm.remarks" v-model="codeForm.remarks"
type="textarea" type="textarea"
placeholder="请输入备注" placeholder="请输入备注"
maxlength="200" maxlength="100"
rows="3" rows="3"
show-word-limit show-word-limit
style="width: 13vw;" style="width: 13vw;"
@ -261,7 +261,7 @@
v-model="codeForm.remarks" v-model="codeForm.remarks"
type="textarea" type="textarea"
placeholder="请输入备注" placeholder="请输入备注"
maxlength="200" maxlength="100"
rows="4" rows="4"
show-word-limit show-word-limit
style="width: 400px;" style="width: 400px;"

5
sgzb-ui/src/views/stquery/leaseRecord.vue
View File

@ -223,9 +223,8 @@ export default {
resetQuery() { resetQuery() {
this.dateRange = []; this.dateRange = [];
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams.time = null; this.getUnitList();
this.queryParams.unitId = null; this.getProList();
this.queryParams.proId = null;
this.handleQuery(); this.handleQuery();
}, },

2
sgzb-ui/src/views/system/user/index.vue
View File

@ -466,7 +466,7 @@
v-model="form.remark" v-model="form.remark"
type="textarea" type="textarea"
placeholder="请输入内容" placeholder="请输入内容"
maxlength="200" maxlength="100"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>