Commit ae470113 authored by jingnan's avatar jingnan 👀

Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

parents 0c486281 c05eb0b5
......@@ -33,7 +33,7 @@ export default {
layConfig() {
return {
typeName: 'ExtProcessPlan',
layKey: 'instructEdit'
layKey: 'instructProcessEdit'
}
}
},
......
......@@ -608,19 +608,20 @@ export default {
}
})
this.$api.recursion('ExtProcessExecutorRoute', params, true).then(res => {
this.getData()
this.saveDuration()
})
},
saveDuration() {
const params = this.modifyData.tasks.map(task => {
const params = this.params.data.filter(p => p.type === 'project').map(task => {
return {
id: task.id,
workHour: task.duration,
workHour: Number((task.duration || 0) / 180),
operator: 'MODIFY'
}
})
this.$api.recursion('ExtProcessPlan', params, true).then(res => {
this.getData()
})
}
}
......
......@@ -14,7 +14,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="班组:">
<el-select v-model="searchFormData.group" placeholder="班组" @change="changeGroup">
<el-option
......@@ -28,9 +28,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="AO(号/名称):">
<el-input v-model="searchFormData.aoName" clearable placeholder="请输入AO(号/名称)" @clear="getTableData" @keyup.enter.native="getTableData" />
<el-input v-model="searchFormData.aoName" clearable placeholder="请输入AO(号/名称)" />
</el-form-item>
</el-col>
<el-col :span="2">
<el-button
type="primary"
@click="getTableData"
>查询</el-button>
</el-col>
</el-form>
</div>
<split-pane
......
......@@ -352,7 +352,7 @@
/>
</el-badge>
</a>
<a
<!-- <a
href="javascript:void(0)"
class="gooey-menu-item"
:disabled="isOK"
......@@ -376,7 +376,7 @@
<use xlink:href="#icon-tiaoshi" />
</svg>
</el-badge>
</a>
</a> -->
<a
href="javascript:void(0)"
class="gooey-menu-item"
......@@ -493,8 +493,9 @@
class="js-signature"
data-width="600"
data-height="200"
data-line-width="10"
data-border="1px solid black"
data-line-color="#bc0000"
data-line-color="#000000"
data-auto-fit="true"
>
<p>提示: 请在红线方框内用正楷签名!</p>
......
......@@ -102,10 +102,10 @@
<i class="icon el-icon-collection" />
<p>视图切换</p>
</dd>
<dd @click="$refs.TimeToSee.open()">
<!-- <dd @click="$refs.TimeToSee.open()">
<span class="iconfont icon-view-mode" />
<p>工时查看</p>
</dd>
</dd> -->
</dl>
</div>
<TimeToSee ref="TimeToSee" />
......
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 to comment