From 23d4dd0eb5a8b5875eee3aa83e3d4ac34b3d6148 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 5 Sep 2023 16:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/company/edit.vue       | 15 +++++++++-
 src/views/company/index.vue      | 20 ++++++++++---
 src/views/task_template/edit.vue | 49 +++++++++++++++++++++-----------
 3 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index 66327f4..24ac2de 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -318,7 +318,7 @@
                         <el-input
                           disabled
                           v-model="formData.master_email"
-                          placeholder="请输入邮箱"
+                          placeholder="邮箱将由系统自动生成"
                           clearable
                           :style="{ width: '100%' }"
                         ></el-input>
@@ -1010,6 +1010,19 @@ function company_type_change(type: any) {
   if (type != 16) {
     partyDisabled.value = false;
   }
+  //镇
+  if (type == 41) {
+    isArea.value = true;
+    isStreet.value = true;
+    isVillage.value = false;
+    isBrigade.value = false;
+    formData.village = "";
+    formData.brigade = "";
+    // partyDisabled.value = true;
+    // indexType.value = 30;
+    regionType.value = "street";
+    return true;
+  }
   //村
   if (type == 17) {
     isArea.value = true;
diff --git a/src/views/company/index.vue b/src/views/company/index.vue
index a5b4855..4fb2628 100644
--- a/src/views/company/index.vue
+++ b/src/views/company/index.vue
@@ -420,7 +420,7 @@
             <el-col :span="12">
               <el-form-item label="企业代码" prop="company_name">
                 <el-input
-                  placeholder="请输入公司名称"
+                  placeholder="请输入企业代码"
                   clearable
                   :value="auth_id.organization_code"
                   readonly
@@ -431,7 +431,7 @@
             <el-col :span="12">
               <el-form-item label="主要联系人" prop="company_name">
                 <el-input
-                  placeholder="请输入公司名称"
+                  placeholder="请输入主要联系人"
                   clearable
                   :value="auth_id.master_name"
                   readonly
@@ -442,7 +442,7 @@
             <el-col :span="12">
               <el-form-item label="手机号码" prop="company_name">
                 <el-input
-                  placeholder="请输入公司名称"
+                  placeholder="请输入手机号码"
                   clearable
                   :value="auth_id.master_phone"
                   readonly
@@ -460,7 +460,9 @@
           @click="handleAuthentication(auth_id.id)"
           >确认</el-button
         >
-        <el-button type="warning" size="large" @click="sendMsg">修改</el-button>
+        <el-button type="warning" size="large" @click="toEditCompany"
+          >修改</el-button
+        >
         <el-button type="info" size="large" @click="offAuthPop">返回</el-button>
       </p>
     </el-dialog>
@@ -498,6 +500,7 @@ const customEvent = (e: any) => {
 const userStore = useUserStore();
 console.log(userStore.userInfo.company_id);
 const route = useRoute();
+const router = useRouter();
 const company_type_show = ref(true);
 // 创建合同与发送短信
 //弹窗
@@ -521,6 +524,15 @@ const authPop = ref(false);
 const offAuthPop = () => {
   authPop.value = false;
 };
+const toEditCompany = () => {
+  router.push({
+    path: getRoutePath("company/add:edit"),
+    query: {
+      id: auth_id.value.id,
+      edit: true,
+    },
+  });
+};
 
 // 合同
 const contractFormData = ref({
diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue
index 73f3969..1e1d7e1 100644
--- a/src/views/task_template/edit.vue
+++ b/src/views/task_template/edit.vue
@@ -114,14 +114,22 @@
           </el-input>
         </el-form-item>
         <el-form-item label="一阶段金额">
-          <el-input
-            v-model="formData.money"
-            clearable
-            placeholder="请输入金额"
-            type="number"
-          >
-            <template #append>元</template>
-          </el-input>
+          <div style="width: 100%">
+            <el-input
+              v-model="formData.money"
+              clearable
+              placeholder="请输入金额"
+              type="number"
+            >
+              <template #append>元</template>
+            </el-input>
+            <div
+              v-if="formData.type == 35"
+              style="color: #e6a23c; font-size: 12px"
+            >
+              提示 : 本任务的金额将会在任务完成后按阶段天数*阶段金额统一结算
+            </div>
+          </div>
         </el-form-item>
         <el-form-item label="二阶段天数">
           <el-input
@@ -133,16 +141,23 @@
             <template #append>天</template>
           </el-input>
         </el-form-item>
-
         <el-form-item label="二阶段金额">
-          <el-input
-            v-model="formData.money_two"
-            clearable
-            placeholder="请输入金额"
-            type="number"
-          >
-            <template #append>元</template>
-          </el-input>
+          <div style="width: 100%">
+            <el-input
+              v-model="formData.money_two"
+              clearable
+              placeholder="请输入金额"
+              type="number"
+            >
+              <template #append>元</template>
+            </el-input>
+            <div
+              v-if="formData.type == 35"
+              style="color: #e6a23c; font-size: 12px"
+            >
+              提示 : 本任务的金额将会在任务完成后按阶段天数*阶段金额统一结算
+            </div>
+          </div>
         </el-form-item>
         <el-form-item label="长期金额" v-if="+formData.types == 2">
           <el-input