From 5a3ace296c010b5c11501dedf252e1c144cda9e2 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 06 Dec 2021 13:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises_ys

---
 src/views/dispatch/dispatch.vue |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/views/dispatch/dispatch.vue b/src/views/dispatch/dispatch.vue
index 0cd6099..2c082a0 100644
--- a/src/views/dispatch/dispatch.vue
+++ b/src/views/dispatch/dispatch.vue
@@ -236,7 +236,7 @@
           },
           {
             label: "保安公司",
-            prop: "deptName",
+            prop: "deptId",
             type: "tree",
             overHidden: true,
             dicUrl:
@@ -266,6 +266,17 @@
             // addDisplay: false,
             // hide: true,
             // span: 11,
+          },
+          {
+            label: " 负责人",
+            prop: "linkman",
+            labelWidth: 118,
+          },
+          {
+            label: "负责人电话",
+            prop: "phone",
+            labelWidth: 118,
+            width: 110,
           },
           //备用  不删 ↑针对没有depid的公司名字转换
           //   {
@@ -312,7 +323,7 @@
             labelWidth: 118,
           },
           {
-            label: "合同生效时间",
+            label: "签署合同生效时间",
             prop: "releaseTimeRange",
             type: "date",
             format: "yyyy-MM-dd",
@@ -340,7 +351,7 @@
           //   labelWidth: 118,
           // },
           {
-            label: "合同开始时间",
+            label: "签署合同开始时间",
             prop: "startTime",
             labelWidth: 118,
             type: "date",
@@ -351,7 +362,7 @@
             // overHidden: true
           },
           {
-            label: "合同结束时间",
+            label: "签署合同结束时间",
             prop: "endTime",
             labelWidth: 118,
             type: "date",
@@ -361,17 +372,7 @@
             // searchSpan: 4,
             // overHidden: true
           },
-          {
-            label: " 负责人",
-            prop: "linkman",
-            labelWidth: 118,
-          },
-          {
-            label: "负责人联系方式",
-            prop: "phone",
-            labelWidth: 118,
-            width: 110,
-          },
+
           {
             label: "所属辖区",
             prop: "jurisdiction",
@@ -496,7 +497,7 @@
       //   this.$message.success("页码" + val);
     },
     rowSave(form, done, loading) {
-      form["deptId"] = this.userInfo.dept_id;
+      // form["deptId"] = this.userInfo.dept_id;
       adddata(form).then(
         (res) => {
           this.onLoad(this.page);

--
Gitblit v1.9.3