Skip to content

Chatopera OpenSource / ferry_web

Go to a project
Commit f1bc7067 by Mr. Lan
Options

fix bug.

parent 544c1088
Inline Side-by-side
Showing with 21 additions and 159 deletions
package.json
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
"vue-quill-editor": "^3.0.6", "vue-quill-editor": "^3.0.6",
"vue-router": "3.0.2", "vue-router": "3.0.2",
"vue-splitpane": "1.0.4", "vue-splitpane": "1.0.4",
"vue2-editor": "^2.10.2",
"vuedraggable": "2.20.0", "vuedraggable": "2.20.0",
"vuex": "3.1.0", "vuex": "3.1.0",
"xlsx": "0.14.1" "xlsx": "0.14.1"
......
src/components/VueFormMaking/components/GenerateFormItem.vue
...@@ -188,6 +188,7 @@ ...@@ -188,6 +188,7 @@
<template v-if="widget.type == 'editor'"> <template v-if="widget.type == 'editor'">
<vue-editor <vue-editor
v-model="dataModel" v-model="dataModel"
:disabled="widget.options.disabled"
:style="{width: widget.options.width}" :style="{width: widget.options.width}"
/> />
</template> </template>
......
src/main.js
...@@ -30,6 +30,10 @@ import VueCodeMirror from 'vue-codemirror' ...@@ -30,6 +30,10 @@ import VueCodeMirror from 'vue-codemirror'
import 'codemirror/lib/codemirror.css' import 'codemirror/lib/codemirror.css'
Vue.use(VueCodeMirror) Vue.use(VueCodeMirror)
// 富文本编辑器
import VueEditor from 'vue2-editor'
Vue.use(VueEditor)
// 全局方法挂载 // 全局方法挂载
Vue.prototype.parseTime = parseTime Vue.prototype.parseTime = parseTime
Vue.prototype.resetForm = resetForm Vue.prototype.resetForm = resetForm
......
src/views/process/list/all.vue
...@@ -41,21 +41,23 @@ ...@@ -41,21 +41,23 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-permisaction="['process:admin:classify:edit']" v-permisaction="['process:list:all:select']"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleView(scope.row)" @click="handleView(scope.row)"
>查看</el-button> >查看</el-button>
<el-button <el-button
v-permisaction="['process:admin:classify:edit']" v-if="scope.row.is_end===0"
v-permisaction="['process:list:all:inversion']"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-position" icon="el-icon-position"
@click="handleInversion(scope.row)" @click="handleInversion(scope.row)"
>转交</el-button> >转交</el-button>
<el-button <el-button
v-permisaction="['process:admin:classify:edit']" v-if="scope.row.is_end===0"
v-permisaction="['process:list:all:end']"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-switch-button" icon="el-icon-switch-button"
......
src/views/process/list/my-create.vue
...@@ -41,26 +41,12 @@ ...@@ -41,26 +41,12 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-permisaction="['process:admin:classify:edit']" v-permisaction="['process:list:myCreate:select']"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleView(scope.row)" @click="handleView(scope.row)"
>查看</el-button> >查看</el-button>
<el-button
v-permisaction="['process:admin:classify:edit']"
size="mini"
type="text"
icon="el-icon-position"
@click="handleInversion(scope.row)"
>转交</el-button>
<el-button
v-permisaction="['process:admin:classify:edit']"
size="mini"
type="text"
icon="el-icon-switch-button"
@click="handleUnity(scope.row)"
>结单</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -103,8 +89,7 @@ ...@@ -103,8 +89,7 @@
</template> </template>
<script> <script>
import { workOrderList, unityWorkOrder, inversionWorkOrder } from '@/api/process/work-order' import { workOrderList } from '@/api/process/work-order'
import { listUser } from '@/api/system/sysuser'
export default { export default {
data() { data() {
return { return {
...@@ -155,52 +140,7 @@ export default { ...@@ -155,52 +140,7 @@ export default {
handleView(row) { handleView(row) {
this.$router.push({ name: 'ProcessListHandle', query: { workOrderId: row.id, processId: row.process }}) this.$router.push({ name: 'ProcessListHandle', query: { workOrderId: row.id, processId: row.process }})
}, },
handleUnity(row) { handleSelectionChange() {}
this.$confirm('此操作将会结束该工单, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
unityWorkOrder({
work_oroder_id: row.id
}).then(response => {
if (response.code === 200) {
this.getList()
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
})
})
},
handleInversion(row) {
this.dialogVisible = true
this.ruleForm.work_order_id = row.id
this.nodeList = row.state
if (this.nodeList.length === 1) {
this.ruleForm.node_id = this.nodeList[0].id
}
listUser({
pageSize: 999999
}).then(response => {
this.users = response.data.list
})
},
handleSelectionChange() {},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
inversionWorkOrder(this.ruleForm).then(response => {
if (response.code === 200) {
this.getList()
this.dialogVisible = false
}
})
}
})
}
} }
} }
</script> </script>
......
src/views/process/list/related.vue
...@@ -41,26 +41,12 @@ ...@@ -41,26 +41,12 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-permisaction="['process:admin:classify:edit']" v-permisaction="['process:list:related:select']"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleView(scope.row)" @click="handleView(scope.row)"
>查看</el-button> >查看</el-button>
<el-button
v-permisaction="['process:admin:classify:edit']"
size="mini"
type="text"
icon="el-icon-position"
@click="handleInversion(scope.row)"
>转交</el-button>
<el-button
v-permisaction="['process:admin:classify:edit']"
size="mini"
type="text"
icon="el-icon-switch-button"
@click="handleUnity(scope.row)"
>结单</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -103,8 +89,7 @@ ...@@ -103,8 +89,7 @@
</template> </template>
<script> <script>
import { workOrderList, unityWorkOrder, inversionWorkOrder } from '@/api/process/work-order' import { workOrderList } from '@/api/process/work-order'
import { listUser } from '@/api/system/sysuser'
export default { export default {
data() { data() {
return { return {
...@@ -155,52 +140,7 @@ export default { ...@@ -155,52 +140,7 @@ export default {
handleView(row) { handleView(row) {
this.$router.push({ name: 'ProcessListHandle', query: { workOrderId: row.id, processId: row.process }}) this.$router.push({ name: 'ProcessListHandle', query: { workOrderId: row.id, processId: row.process }})
}, },
handleUnity(row) { handleSelectionChange() {}
this.$confirm('此操作将会结束该工单, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
unityWorkOrder({
work_oroder_id: row.id
}).then(response => {
if (response.code === 200) {
this.getList()
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
})
})
},
handleInversion(row) {
this.dialogVisible = true
this.ruleForm.work_order_id = row.id
this.nodeList = row.state
if (this.nodeList.length === 1) {
this.ruleForm.node_id = this.nodeList[0].id
}
listUser({
pageSize: 999999
}).then(response => {
this.users = response.data.list
})
},
handleSelectionChange() {},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
inversionWorkOrder(this.ruleForm).then(response => {
if (response.code === 200) {
this.getList()
this.dialogVisible = false
}
})
}
})
}
} }
} }
</script> </script>
......
src/views/process/list/upcoming.vue
...@@ -41,26 +41,20 @@ ...@@ -41,26 +41,20 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-permisaction="['process:admin:classify:edit']" v-permisaction="['process:list:upcoming:select']"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleView(scope.row)" @click="handleView(scope.row)"
>查看</el-button> >查看</el-button>
<el-button <el-button
v-permisaction="['process:admin:classify:edit']" v-if="scope.row.is_end===0"
v-permisaction="['process:list:upcoming:inversion']"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-position" icon="el-icon-position"
@click="handleInversion(scope.row)" @click="handleInversion(scope.row)"
>转交</el-button> >转交</el-button>
<el-button
v-permisaction="['process:admin:classify:edit']"
size="mini"
type="text"
icon="el-icon-switch-button"
@click="handleUnity(scope.row)"
>结单</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -103,7 +97,7 @@ ...@@ -103,7 +97,7 @@
</template> </template>
<script> <script>
import { workOrderList, unityWorkOrder, inversionWorkOrder } from '@/api/process/work-order' import { workOrderList, inversionWorkOrder } from '@/api/process/work-order'
import { listUser } from '@/api/system/sysuser' import { listUser } from '@/api/system/sysuser'
export default { export default {
data() { data() {
...@@ -155,26 +149,6 @@ export default { ...@@ -155,26 +149,6 @@ export default {
handleView(row) { handleView(row) {
this.$router.push({ name: 'ProcessListHandle', query: { workOrderId: row.id, processId: row.process }}) this.$router.push({ name: 'ProcessListHandle', query: { workOrderId: row.id, processId: row.process }})
}, },
handleUnity(row) {
this.$confirm('此操作将会结束该工单, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
unityWorkOrder({
work_oroder_id: row.id
}).then(response => {
if (response.code === 200) {
this.getList()
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
})
})
},
handleInversion(row) { handleInversion(row) {
this.dialogVisible = true this.dialogVisible = true
this.ruleForm.work_order_id = row.id this.ruleForm.work_order_id = row.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment