From dd02933da17edcd5420ce19d1a22c57f1d2af929 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 15 Sep 2023 11:48:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/company/edit.vue           | 511 ++++++++++++---------------
 src/views/contract/contractDetil.vue |   8 +-
 src/views/shop_contract/details.vue  |   1 +
 3 files changed, 243 insertions(+), 277 deletions(-)

diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index 21d2595..3bd04a9 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -10,217 +10,182 @@
       <el-col :span="24" class="el-card pt-6">
         <div class="tit">公司基本信息创建</div>
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="公司名称" prop="company_name">
-              <el-input
-                v-model="formData.company_name"
-                placeholder="请输入公司名称"
-                clearable
-                :disabled="isDisabled"
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="社会代码" prop="organization_code">
-              <el-input
-                :disabled="isDisabled"
-                v-model="formData.organization_code"
-                placeholder="请输入社会代码"
-                clearable
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item
-              label="公司类型"
-              :rules="[
-                { required: true, message: '不可为空', trigger: 'blur' },
-              ]"
-              prop="company_type"
+          <el-form-item label="公司名称" prop="company_name">
+            <el-input
+              v-model="formData.company_name"
+              placeholder="请输入公司名称"
+              clearable
+              :disabled="isDisabled"
+              :style="{ width: '300px' }"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="社会代码" prop="organization_code">
+            <el-input
+              :disabled="isDisabled"
+              v-model="formData.organization_code"
+              placeholder="请输入社会代码"
+              clearable
+              :style="{ width: '300px' }"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="公司类型"
+            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            prop="company_type"
+          >
+            <el-select
+              :disabled="isDisabled"
+              v-model="formData.company_type"
+              placeholder="请选择公司类型"
+              clearable
+              @change="company_type_change"
             >
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.company_type"
-                placeholder="请选择公司类型"
-                clearable
-                @change="company_type_change"
-                :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-col>
-          <el-col :span="3">
-            <el-form-item
-              label="省"
-              :rules="[
-                { required: true, message: '不可为空', trigger: 'blur' },
-              ]"
-              prop="province"
+              <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="省"
+            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            prop="province"
+          >
+            <el-select
+              :disabled="isDisabled"
+              v-model="formData.province"
+              placeholder="请选择省"
+              clearable
+              @change="province_change"
+              :style="{ width: '100%' }"
             >
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.province"
-                placeholder="请选择省"
-                clearable
-                @change="province_change"
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.provinceOptions"
-                  :key="index"
-                  :label="item.province_name"
-                  :value="item.province_code"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item
-              label="市"
-              :rules="[
-                { required: true, message: '不可为空', trigger: 'blur' },
-              ]"
-              prop="city"
+              <el-option
+                v-for="(item, index) in datas.provinceOptions"
+                :key="index"
+                :label="item.province_name"
+                :value="item.province_code"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="市"
+            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            prop="city"
+          >
+            <el-select
+              :disabled="isDisabled"
+              v-model="formData.city"
+              placeholder="请选择市"
+              clearable
+              @change="city_change"
+              :style="{ width: '100%' }"
             >
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.city"
-                placeholder="请选择市"
-                clearable
-                @change="city_change"
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.cityOptions"
-                  :key="index"
-                  :label="item.city_name"
-                  :value="item.city_code"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" v-if="isArea">
-            <el-form-item
-              label="区"
-              :rules="[
-                { required: true, message: '不可为空', trigger: 'blur' },
-              ]"
-              prop="area"
+              <el-option
+                v-for="(item, index) in datas.cityOptions"
+                :key="index"
+                :label="item.city_name"
+                :value="item.city_code"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="区"
+            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            prop="area"
+          >
+            <el-select
+              :disabled="isDisabled"
+              v-model="formData.area"
+              placeholder="请选择区"
+              clearable
+              @change="area_change"
+              :style="{ width: '100%' }"
             >
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.area"
-                placeholder="请选择区"
-                clearable
-                @change="area_change"
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.areaOptions"
-                  :key="index"
-                  :label="item.area_name"
-                  :value="item.area_code"
-                  :disabled="item.disabled"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" v-if="isStreet">
-            <el-form-item
-              label="镇"
-              :rules="[
-                { required: true, message: '不可为空', trigger: 'blur' },
-              ]"
-              prop="street"
+              <el-option
+                v-for="(item, index) in datas.areaOptions"
+                :key="index"
+                :label="item.area_name"
+                :value="item.area_code"
+                :disabled="item.disabled"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="镇"
+            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            prop="street"
+          >
+            <el-select
+              :disabled="isDisabled"
+              v-model="formData.street"
+              placeholder="请选择镇"
+              clearable
+              @change="street_change"
+              :style="{ width: '100%' }"
             >
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.street"
-                placeholder="请选择镇"
-                clearable
-                @change="street_change"
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.streetOptions"
-                  :key="index"
-                  :label="item.street_name"
-                  :value="item.street_code"
-                  :disabled="item.disabled"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" v-if="isVillage">
-            <el-form-item
-              label="村"
-              :rules="[
-                { required: true, message: '不可为空', trigger: 'blur' },
-              ]"
-              prop="village"
+              <el-option
+                v-for="(item, index) in datas.streetOptions"
+                :key="index"
+                :label="item.street_name"
+                :value="item.street_code"
+                :disabled="item.disabled"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="村"
+            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            prop="village"
+          >
+            <el-select
+              :disabled="isDisabled"
+              v-model="formData.village"
+              placeholder="请选择村"
+              clearable
+              @change="village_change"
+              :style="{ width: '100%' }"
             >
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.village"
-                placeholder="请选择村"
-                clearable
-                @change="village_change"
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.villageOptions"
-                  :key="index"
-                  :label="item.village_name"
-                  :value="item.village_code"
-                  :disabled="item.disabled"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" v-if="isBrigade">
-            <el-form-item
-              label="队"
-              :rules="[
-                { required: true, message: '不可为空', trigger: 'blur' },
-              ]"
-              prop="brigade"
+              <el-option
+                v-for="(item, index) in datas.villageOptions"
+                :key="index"
+                :label="item.village_name"
+                :value="item.village_code"
+                :disabled="item.disabled"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="队"
+            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            prop="brigade"
+          >
+            <el-select
+              :disabled="isDisabled"
+              v-model="formData.brigade"
+              placeholder="请选择队"
+              clearable
+              :style="{ width: '100%' }"
             >
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.brigade"
-                placeholder="请选择队"
-                clearable
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.brigadeOptions"
-                  :key="index"
-                  :label="item.brigade_name"
-                  :value="item.id"
-                  :disabled="item.disabled"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="地址" prop="address">
-              <el-input
-                :disabled="isDisabled"
-                v-model="formData.address"
-                placeholder="请输入地址"
-                clearable
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
+              <el-option
+                v-for="(item, index) in datas.brigadeOptions"
+                :key="index"
+                :label="item.brigade_name"
+                :value="item.id"
+                :disabled="item.disabled"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="地址" prop="address">
+            <el-input
+              :disabled="isDisabled"
+              v-model="formData.address"
+              placeholder="请输入地址"
+              clearable
+              :style="{ width: '300px' }"
+            ></el-input>
+          </el-form-item>
           <el-col :span="23">
             <el-form-item label="负责区域" prop="region">
               <el-checkbox-group
@@ -266,6 +231,7 @@
             <div class="headimg" style="margin-left: 5px">
               <el-upload
                 :disabled="isDisabled"
+                :accept="acceptFileTypes"
                 v-model="formData.avatar"
                 class="avatar-uploader-head"
                 :data="{ cid: 1 }"
@@ -290,88 +256,76 @@
           <el-main>
             <el-row>
               <div style="display: flex; justify-content: left">
-                <div class="right">
+                <div class="right" style="max-width: 1100px">
                   <el-row>
-                    <el-col :span="10">
-                      <el-form-item label="姓名" prop="master_name">
-                        <el-input
-                          :disabled="isDisabled"
-                          v-model="formData.master_name"
-                          placeholder="请输入姓名"
-                          clearable
-                          :style="{ width: '100%' }"
-                        ></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                      <el-form-item label="职务" prop="master_position">
-                        <el-input
-                          :disabled="isDisabled"
-                          v-model="formData.master_position"
-                          placeholder="请输入职务"
-                          clearable
-                          :style="{ width: '100%' }"
-                        ></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                      <el-form-item label="手机" prop="master_phone">
-                        <el-input
-                          :disabled="isDisabled"
-                          v-model="formData.master_phone"
-                          placeholder="请输入手机"
-                          clearable
-                          :style="{ width: '100%' }"
-                        ></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                      <el-form-item label="邮箱">
-                        <el-input
-                          disabled
-                          v-model="formData.master_email"
-                          placeholder="邮箱将由系统自动生成"
-                          clearable
-                          :style="{ width: '100%' }"
-                        ></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                      <el-form-item label="性别" prop="sex">
-                        <el-select
-                          :disabled="isDisabled"
-                          v-model="formData.sex"
-                          placeholder="请选择性别"
-                          :style="{ width: '100%' }"
-                        >
-                          <el-option label="男" value="1" />
-                          <el-option label="女" value="2" />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                      <el-form-item label="身份证">
-                        <el-input
-                          :disabled="isDisabled"
-                          v-model="formData.id_card"
-                          placeholder="请输入身份证"
-                          clearable
-                          :style="{ width: '100%' }"
-                        ></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <!-- <el-col :span="10">
+                    <el-form-item label="姓名" prop="master_name">
+                      <el-input
+                        :disabled="isDisabled"
+                        v-model="formData.master_name"
+                        placeholder="请输入姓名"
+                        clearable
+                        :style="{ width: '450px' }"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item label="职务" prop="master_position">
+                      <el-input
+                        :disabled="isDisabled"
+                        v-model="formData.master_position"
+                        placeholder="请输入职务"
+                        clearable
+                        :style="{ width: '450px' }"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item label="手机" prop="master_phone">
+                      <el-input
+                        :disabled="isDisabled"
+                        v-model="formData.master_phone"
+                        placeholder="请输入手机"
+                        clearable
+                        :style="{ width: '450px' }"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item label="邮箱">
+                      <el-input
+                        disabled
+                        v-model="formData.master_email"
+                        placeholder="邮箱将由系统自动生成"
+                        clearable
+                        :style="{ width: '450px' }"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item label="性别" prop="sex">
+                      <el-select
+                        :disabled="isDisabled"
+                        v-model="formData.sex"
+                        placeholder="请选择性别"
+                        :style="{ width: '450px' }"
+                      >
+                        <el-option label="男" value="1" />
+                        <el-option label="女" value="2" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="身份证">
+                      <el-input
+                        :disabled="isDisabled"
+                        v-model="formData.id_card"
+                        placeholder="请输入身份证"
+                        clearable
+                        :style="{ width: '450px' }"
+                      ></el-input>
+                    </el-form-item>
+                    <!-- 
                         <el-form-item label="片区经理" prop="area_manager_name">
                             <el-input
                                 :disabled="isDisabled"
                                 v-model="formData.area_manager_name"
                                 placeholder="选择片区经理"
                                 clearable
-                                :style="{ width: '100%' }"
+                                :style="{ width: '300px' }"
                                 @click="isAreaManager = true"
                             ></el-input>
                         </el-form-item>
-                    </el-col> -->
+                      -->
                   </el-row>
                 </div>
               </div>
@@ -463,6 +417,7 @@
             <el-form-item label="公司资质" required>
               <el-upload
                 :disabled="isDisabled"
+                :accept="acceptFileTypes"
                 v-model="formData.qualification.business_license"
                 class="avatar-uploader pl-3"
                 :data="{ cid: 1 }"
@@ -491,6 +446,7 @@
               </div>
               <el-upload
                 v-if="imgflag"
+                :accept="acceptFileTypes"
                 :disabled="isDisabled"
                 class="avatar-uploader pl-3"
                 :data="{ cid: 1 }"
@@ -510,6 +466,7 @@
             <el-form-item label-width="120px" label="开户许可证" required>
               <el-upload
                 :disabled="isDisabled"
+                :accept="acceptFileTypes"
                 v-model="formData.qualification.business_licenseB"
                 class="avatar-uploader pl-3"
                 :data="{ cid: 1 }"
@@ -713,6 +670,8 @@ if (route.query.isshow) {
   imgflag = false;
   isDisabled = true;
 }
+
+const acceptFileTypes = ref(".png, .jpg, .jpeg, image/png, image/jpeg");
 console.log(isDisabled);
 // 公司类型
 const indexType = ref(0);
diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue
index c96b467..28f9162 100644
--- a/src/views/contract/contractDetil.vue
+++ b/src/views/contract/contractDetil.vue
@@ -386,6 +386,7 @@
         prop="field127"
       >
         <el-upload
+          accept=".pdf"
           :headers="{ Token: userStore.token }"
           class="upload-demo"
           :action="base_url + '/upload/file'"
@@ -410,7 +411,12 @@
         >
       </el-form-item>
       <el-form-item v-if="isshow || formData.status == 0">
-        <el-button v-perms="['contract.contract/wind_control']" type="primary" @click="submitContract">确定</el-button>
+        <el-button
+          v-perms="['contract.contract/wind_control']"
+          type="primary"
+          @click="submitContract"
+          >确定</el-button
+        >
       </el-form-item>
       <el-form-item v-else-if="formData.file && formData.status">
         <a
diff --git a/src/views/shop_contract/details.vue b/src/views/shop_contract/details.vue
index ed2e960..055e9cd 100644
--- a/src/views/shop_contract/details.vue
+++ b/src/views/shop_contract/details.vue
@@ -378,6 +378,7 @@
         prop="field127"
       >
         <el-upload
+          accept=".pdf"
           :headers="{ Token: userStore.token }"
           class="upload-demo"
           :action="base_url + '/upload/file'"