项目、任务、活动规则提示
This commit is contained in:
@@ -30,6 +30,9 @@
|
|||||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
|
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
|
||||||
v-hasPermi="['farm:discuss:export']">导出</el-button>
|
v-hasPermi="['farm:discuss:export']">导出</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button type="danger" size="mini" @click="dialogVisible = true">第一次进来请先看活动规则</el-button>
|
||||||
|
</el-col>
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
@@ -129,6 +132,19 @@
|
|||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
<!-- 活动规则提示 -->
|
||||||
|
<el-dialog title="活动规则提示" :visible.sync="dialogVisible" width="70%">
|
||||||
|
<el-form label-width="80px">
|
||||||
|
<el-form-item>新增活动只能选择进行中的项目下的进行中的任务</el-form-item>
|
||||||
|
<el-form-item>执行人只能从项目的成员中选择</el-form-item>
|
||||||
|
<el-form-item>提交活动后,任务自动变成已完成,并新增执行人的工时</el-form-item>
|
||||||
|
<el-form-item>如果任务类型是采收, 则会将采收数量同步到ERP对应物料数量</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
<span slot="footer" class="dialog-footer">
|
||||||
|
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
|
||||||
|
</span>
|
||||||
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -149,6 +165,8 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
//活动规则
|
||||||
|
dialogVisible: false,
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: true,
|
loading: true,
|
||||||
// 导出遮罩层
|
// 导出遮罩层
|
||||||
|
|||||||
@@ -66,6 +66,9 @@
|
|||||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
|
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
|
||||||
v-hasPermi="['farm:project:export']">导出</el-button>
|
v-hasPermi="['farm:project:export']">导出</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button type="danger" size="mini" @click="dialogVisible = true">第一次进来请先看项目规则</el-button>
|
||||||
|
</el-col>
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
@@ -210,6 +213,23 @@
|
|||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
<!-- 项目规则提示 -->
|
||||||
|
<el-dialog title="项目规则提示" :visible.sync="dialogVisible" width="70%">
|
||||||
|
<el-form label-width="80px">
|
||||||
|
<el-form-item>添加计划中的项目时,不会做任何限制,可随意添加</el-form-item>
|
||||||
|
<el-form-item>项目更改为进行中的时候,会检查区域占用情况,未占用,则更改成功,并占用区域。如果区域已占用,项目无法更改为进行中</el-form-item>
|
||||||
|
<el-form-item>项目的作物、区域、成员,将作为项目下任务所选择的基础信息</el-form-item>
|
||||||
|
<el-form-item>进行中的项目不可以修改作物、区域</el-form-item>
|
||||||
|
<el-form-item>项目更改为完成时,会检查改项目下所有任务是否完成,如果有未完成的则更改失败。更改成功会释放占用的区域</el-form-item>
|
||||||
|
<el-form-item>已完成项目不可进行任务修改</el-form-item>
|
||||||
|
<el-form-item>项目的状态只能由计划中 ——> 进行中 ——>已完成,不可逆向变更状态</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
<span slot="footer" class="dialog-footer">
|
||||||
|
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
|
||||||
|
</span>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -230,6 +250,8 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
//项目规则
|
||||||
|
dialogVisible: false,
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: true,
|
loading: true,
|
||||||
// 导出遮罩层
|
// 导出遮罩层
|
||||||
|
|||||||
@@ -84,6 +84,9 @@
|
|||||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
||||||
:loading="exportLoading" v-hasPermi="['farm:task:export']">导出</el-button>
|
:loading="exportLoading" v-hasPermi="['farm:task:export']">导出</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button type="danger" size="mini" @click="dialogVisible = true">第一次进来请先看任务规则</el-button>
|
||||||
|
</el-col>
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
@@ -227,6 +230,24 @@
|
|||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
<!-- 项目规则提示 -->
|
||||||
|
<el-dialog title="项目规则提示" :visible.sync="dialogVisible" width="70%">
|
||||||
|
<el-form label-width="80px">
|
||||||
|
<el-form-item>新增任务,只能选择进行中的任务</el-form-item>
|
||||||
|
<el-form-item>作物只能选择项目的作物,负责人只能从项目成员中选择,区域只能从项目区域中选择</el-form-item>
|
||||||
|
<el-form-item>任务状态为计划中、准备中 不检查资源占用情况</el-form-item>
|
||||||
|
<el-form-item>任务状态更改为进行中,会检查唯一资源占用情况,如果被占用,则更改失败。未被占用,则变成占用,更改成功</el-form-item>
|
||||||
|
<el-form-item>任务状态更改为完成,会返还唯一资源数量,并更改资源为未占用</el-form-item>
|
||||||
|
<el-form-item>已完成的任务不能修改任何信息</el-form-item>
|
||||||
|
<el-form-item>任务的状态只能由计划中(准备中) ——> 已开始,不可逆向变更状态</el-form-item>
|
||||||
|
<el-form-item>任务只能由提交活动变成完成状态</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
<span slot="footer" class="dialog-footer">
|
||||||
|
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
|
||||||
|
</span>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -251,6 +272,8 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
//任务规则
|
||||||
|
dialogVisible: false,
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: true,
|
loading: true,
|
||||||
// 导出遮罩层
|
// 导出遮罩层
|
||||||
|
|||||||
Reference in New Issue
Block a user