FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhoulingpo
2023-11-21 11:03:23 +08:00
parent c84f945f42 e2b7d94b58
commit 0778a0b224
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+1 -1
View File
@@ -2181,7 +2181,7 @@ export default {
splitType: '全部章节' splitType: '全部章节'
}, },
headers:{ headers:{
token: JSON.parse(localStorage.getItem('userInfo')).token // token: JSON.parse(localStorage.getItem('userInfo')).token
} }
} }
}, },
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+3 -3
View File
@@ -2548,9 +2548,9 @@
}) })
} }
}, },
ifStandCodebyStandName(standCode,standName,taskIds,standNum){ ifStandCodebyStandName(standCode,standName,taskIds,standNum,standSort){
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject)=>{
this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName,taskIds,standNum}) this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName,taskIds,standNum,standSort})
.then(res => resolve(res)) .then(res => resolve(res))
.catch(e => { .catch(e => {
throw new Error(e) throw new Error(e)
@@ -2619,7 +2619,7 @@
this.$refs['formTongGuo'].validate((valid) => { this.$refs['formTongGuo'].validate((valid) => {
if (valid) { if (valid) {
if(this.form.standStatus === '1' || this.form.standStatus === '2'){ if(this.form.standStatus === '1' || this.form.standStatus === '2'){
this.ifStandCodebyStandName(this.form.standCode,this.form.standName,this.taskIds,this.form.standNum) this.ifStandCodebyStandName(this.form.standCode,this.form.standName,this.taskIds,this.form.standNum,this.form.standSort)
.then((res)=>{ .then((res)=>{
if(res.ok){ if(res.ok){
this.completeTask() this.completeTask()
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+2 -2
View File
@@ -18,8 +18,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" > <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<el-select v-model="form.reviseStatus" filterable @change="reveseStatusChange" <el-select v-model="form.reviseStatus" filterable @change="reveseStatusChange" disabled>
:disabled="form.reviseStatus === '3'"> <!--:disabled="form.reviseStatus === '3'">-->
<el-option <el-option
v-for="item in opinionsStand" v-for="item in opinionsStand"
:key="item.value" :key="item.value"
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+3 -3
View File
@@ -2663,9 +2663,9 @@
this.rules.commentText[0].required = true; this.rules.commentText[0].required = true;
} }
}, },
ifStandCodebyStandName(standCode,standName,taskIds,standNum){ ifStandCodebyStandName(standCode,standName,taskIds,standNum,standSort){
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject)=>{
this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName,taskIds,standNum}) this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName,taskIds,standNum,standSort})
.then(res => resolve(res)) .then(res => resolve(res))
.catch(e => { .catch(e => {
throw new Error(e) throw new Error(e)
@@ -2727,7 +2727,7 @@
this.$refs['formTongGuo'].validate((valid) => { this.$refs['formTongGuo'].validate((valid) => {
if (valid) { if (valid) {
if(this.form.reviseStatus === '1' || this.form.reviseStatus === '2'){ if(this.form.reviseStatus === '1' || this.form.reviseStatus === '2'){
this.ifStandCodebyStandName(this.form.standCode,this.form.standName,this.taskIds,this.form.standNum) this.ifStandCodebyStandName(this.form.standCode,this.form.standName,this.taskIds,this.form.standNum,this.form.standSort)
.then((res)=>{ .then((res)=>{
if(res.ok){ if(res.ok){
this.completeTask() this.completeTask()