From 229472779bcf7307adb81f2e90a38fc69cf312f3 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 21 Jul 2023 17:30:26 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=9B=B4=E6=96=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 53dd80a08a116dd92758f3d6d4561e5b52b1b2e3.
---
 .vscode/settings.json               |  3 --
 src/views/company/edit.vue          | 14 +++------
 src/views/company/index.vue         | 48 +++++++++++++++++++++++++----
 src/views/permission/admin/edit.vue |  3 +-
 4 files changed, 48 insertions(+), 20 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index ca872a4..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "vue.codeActions.enabled": false
-}
\ No newline at end of file
diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index b7510f6..7a3fabc 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -346,19 +346,19 @@
                     </el-col>
                 </el-row>
             </el-col>
-            <template v-if="userStore.userInfo.root == 0">
+            <template v-if="userStore.userInfo.root == 1">
                 <div style="font-size: 1.2rem; margin: 10px 0">电子合同</div>
                 <el-col :span="24" class="el-card pt-6">
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="签约方" prop="field130">
                                 <el-input
+                                    :disabled="isDisabled"
                                     v-model="formData.party_a_name"
                                     placeholder="请选择签约方"
                                     clearable
                                     :style="{ width: '100%' }"
                                     @click="openCompany"
-                                    :disabled="userStore.userInfo.root == 1 ? true : false"
                                 ></el-input>
                             </el-form-item>
                         </el-col>
@@ -475,7 +475,6 @@ import type { PropType } from 'vue'
 import useMultipleTabs from '@/hooks/useMultipleTabs'
 import useUserStore from '@/stores/modules/user'
 const userStore = useUserStore()
-
 const { removeTab } = useMultipleTabs()
 const router = useRouter()
 const route = useRoute()
@@ -493,6 +492,7 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref()
 isDisabled = route.query.read
 isEdit = route.query.edit
+
 // 表单数据
 const formData = reactive({
     man: '',
@@ -511,6 +511,7 @@ const formData = reactive({
     master_position: '',
     master_phone: '',
     master_email: '',
+
     other_contacts: [
         {
             name: '',
@@ -533,7 +534,7 @@ const formData = reactive({
     },
     contract: {
         contract_type: '',
-        party_a: 0,
+        party_a: '',
         file: '',
         contract_no: '系统自动生成'
     },
@@ -542,11 +543,6 @@ const formData = reactive({
     file_image: ''
     // status: ''
 })
-
-if (userStore.userInfo.root == 0) {
-    formData.contract.party_a = userStore.userInfo.company?.id
-    formData.party_a_name = userStore.userInfo.company?.company_name
-}
 const datas = reactive({
     provinceOptions: [],
     cityOptions: [],
diff --git a/src/views/company/index.vue b/src/views/company/index.vue
index e8de333..3b763f4 100644
--- a/src/views/company/index.vue
+++ b/src/views/company/index.vue
@@ -26,7 +26,21 @@
                         placeholder="请输入镇"
                     />
                 </el-form-item>
-
+                <el-form-item label="公司类型" prop="company_type" v-show="company_type_show">
+                    <el-select
+                        v-model="queryParams.company_type"
+                        placeholder="请选择公司类型"
+                        clearable
+                        :style="{ width: '100%' }"
+                    >
+                        <el-option
+                            v-for="(item, index) in datas.dictTypeLists"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="片区经理" prop="area_manager">
                     <el-input
                         class="w-[280px]"
@@ -53,8 +67,14 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <!-- <el-button v-perms="['company/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+      </el-button>-->
             <router-link
-                v-perms="['company/add:edit']"
+                v-perms="['company/add', 'company/edit']"
                 :to="{
                     path: getRoutePath('company/add:edit')
                 }"
@@ -104,7 +124,11 @@
                                         >下属公司</router-link
                                     >
                                 </el-button>
-                                <el-button type="primary" link>
+                                <el-button
+                                    v-perms="['company/edit', 'company/add']"
+                                    type="primary"
+                                    link
+                                >
                                     <router-link
                                         :to="{
                                             path: getRoutePath('company/add:edit'),
@@ -116,7 +140,11 @@
                                         >详情</router-link
                                     >
                                 </el-button>
-                                <el-button v-perms="['company/add:edit']" type="primary" link>
+                                <el-button
+                                    v-perms="['company/edit', 'company/add']"
+                                    type="primary"
+                                    link
+                                >
                                     <router-link
                                         :to="{
                                             path: getRoutePath('company/add:edit'),
@@ -136,14 +164,14 @@
                                     >删除</el-button
                                 >
                                 <el-button
-                                    v-perms="['company/Draftingcontracts']"
+                                    v-perms="['company/edit', 'company/add']"
                                     type="primary"
                                     link
                                     @click="showCreateConctPop(row)"
                                     >生成合同</el-button
                                 >
                                 <el-button
-                                    v-perms="['company/postsms']"
+                                    v-perms="['company/edit', 'company/add']"
                                     type="primary"
                                     link
                                     @click=";(showPop = true), (contractId = row.id)"
@@ -227,6 +255,14 @@ if (route.query.company_type) {
     queryParams['company_type'] = route.query.company_type?.toString() || ''
 }
 
+const datas = reactive({
+    dictTypeLists: []
+})
+const getdictTypeLists = async () => {
+    const data = await dictDataLists({ type_id: 6 })
+    datas['dictTypeLists'] = data['lists']
+}
+getdictTypeLists()
 // 选中数据
 const selectData = ref<any[]>([])
 
diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index 07fc1b9..0df978a 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -491,8 +491,7 @@ const formData = reactive({
     role_id: '',
     avatar: '',
     multipoint_login: 1,
-    root: 0,
-    disable: 1
+    root: 0
 })
 // 字典信息
 const datas: any = reactive({