Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem-admin

src/api/common.ts

@@ -24,3 +24,4 @@ export function apiVillageList(params: any) {
 export function apiBrigadeList() {
     return request.get({ url: '/common/brigade' })
 }
+

src/api/task.ts

@@ -11,4 +11,11 @@ export function apiTaskIndex(params: any) {
 export function apiTaskCreat(params: any) {
   return request.post({ url: "/task/create", params });
 }
-
+//添加任务
+export function apiTaskAdd(params: any) {
+  return request.post({ url: "/task.task/add", params });
+}
+//任务排期-任务添加  
+export function apiTaskScheduling(params: any) {
+  return request.post({ url: "/task_scheduling.task_scheduling/add", params });
+}

src/views/contract/contractDetil.vue

@@ -272,8 +272,8 @@
                 />
             </el-form-item> -->
         </el-form>
-    </el-card>
+    </el-card >
-    <el-card v-if="basicdata.check_status == 1">
+    <el-card v-if="isshow">
         <el-form>
             <el-form-item label="合同上传" prop="field127">
                 <el-upload
@@ -330,6 +330,7 @@ const persen = ref([])
 const persenimg = ref([])
 const show = ref(true)
 const flag = ref(true)
+const isshow=ref(true)
 const route = useRoute()
 const userStore = useUserStore()
 
@@ -338,6 +339,7 @@ async function render() {
     const res = await apiContractDetail({ id: query.id })
     compeny.value = res.party_a_info
     basicdata.value = res
+     if(basicdata.value.status==1){isshow.value=false}
     try {
         res.party_a_info.qualification.bank_account = JSON.parse(
             res.party_a_info.qualification.bank_account

src/views/permission/admin/edit.vue

@@ -205,8 +205,8 @@
             </el-col>
           </el-row>
         </el-col>
-        <div style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
+        <div v-if="disabledPartyA" style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
-        <div style="display: flex; justify-content: space-between">
+        <div v-if="disabledPartyA" style="display: flex; justify-content: space-between">
           <div>
             <el-form-item label="身份证" prop="id_card">
               <el-upload

src/views/task/Taskform.vue

@@ -0,0 +1,115 @@
+<template>
+  <el-card class="edit-popup">
+    <el-form :rules="rules" ref="formRef" :model="formData" label-width="84px">
+      <el-col class="pt-6 !border-none">
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="任务主题" prop="title">
+              <el-input
+                v-model="formData.title"
+                placeholder="请输入任务主题"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="金额" prop="money">
+              <el-input
+                v-model="formData.money"
+                placeholder="请输入金额"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="状态" prop="state">
+              <el-input
+                v-model="formData.state"
+                placeholder="请选择负责人"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="任务类型" prop="type">
+              <el-select v-model="formData.type" placeholder="请选择工作类型">
+                <el-option
+                  v-for="item in datalist"
+                  :key="item.label"
+                  :value="item.id"
+                  :label="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row> </el-row>
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="任务描述" prop="describe">
+              <editor v-model="formData.describe" :height="400" /> 
+            </el-form-item></el-col
+          >
+        </el-row>
+      </el-col>
+       <el-row>
+          <el-col :span="18">
+            <el-form-item >
+          <el-button @click="handleSubmit" type="primary">提交</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      
+    </el-form>
+  </el-card>
+</template>
+
+<script lang="ts" setup>
+import { ref } from "vue";
+import { dictDataLists } from "@/api/setting/dict";
+import { apiTaskAdd } from "@/api/task";
+const rules = reactive({
+  title: { required: true, message: "请输入标题", trigger: "blur" },
+  money: { required: true, message: "请输入金额", trigger: "blur" },
+  type: { required: true, message: "请输入类型", trigger: "blur" },
+  state: { required: true, message: "请输入状态", trigger: "blur" },
+});
+const formData = ref({
+  title: "",
+  money: "",
+  type: "",
+  state: "",
+  describe: "",
+  status: "",
+  template_id: "",
+  company_id: "",
+  start_time: "",
+  end_time: "",
+  director_uid: "",
+  content: "",
+  extend: "",
+});
+
+const datalist = ref([]);
+dictDataLists({ type_id: 10 }).then((res) => {
+  datalist.value = res.lists;
+});
+
+const formRef = ref(null);
+
+function handleSubmit() {
+  formRef.value.validate((re) => {
+    if (re) {
+      apiTaskAdd({ ...formData.value }).then((res) => {});
+    }
+  });
+}
+</script>
+
+<style scoped lang="scss"></style>