修复bug,设置企业

src/HDrpManagement/competitor/detail/index.vue

@@ -21,7 +21,7 @@
         <toVoid :id="$route.query.id" class="inline-16"></toVoid>
       </div>
       <div slot="slot0" >
-        <detailed :basic="mainData" v-if="flag"></detailed>
+        <detailed  v-if="flag"></detailed>
       </div>
       <div slot="slot1" class=" normal-panel">
         <compete_projects :data="mainData" v-if="flag"></compete_projects>

src/HDrpManagement/competitor/detail/modules/detailedData.vue

@@ -29,7 +29,6 @@
 <script>
 export default {
   name: "detailedData",
-  props:["basic"],
   data(){
     return {
       basic:[],
@@ -38,8 +37,8 @@ export default {
     }
   },
   mounted() {
-    // this.basicData(this.data)
-    // this.systemData(this.data)
+    this.basicData(this.data)
+   /* this.systemData(this.data)*/
   },
   methods:{
     /*基本信息*/
@@ -48,7 +47,7 @@ export default {
       const res = await this.$api.requested({
         "id": 20221019105802,
         "content": {
-          "sa_competitorid": id
+          "sa_competitorid": this.$route.query.id
         },
       })
       this.basic = res.data

src/HDrpManagement/competitor/detail/modules/toVoid.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary"  @click="onshow">作 废</el-button>
+    <el-button size="mini" type="primary"  @click="onshow">删 除</el-button>
     <el-dialog
         :visible.sync="dialogToVoidVisible"
         width="25%"
@@ -49,27 +49,32 @@ export default {
     }
   },
   methods:{
-    onshow(){
-      this.dialogVisible = false
-      this.dialogToVoidVisible = true
-      this.form.sa_competitorid = this.id
+    onshow() {
+      this.$confirm('是否确认删除该竞争对手?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.onSubmit()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
     },
-    onSubmit(){
-      this.$refs['form'].validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "id": 20221018164202,
-          "content": {
-            "sa_competitorids":[this.form.sa_competitorid],
-            "deletereason":this.form.deletereason
-          },
-        })
-        this.tool.showMessage(res,() => {
-          this.$emit('onSuccess')
-          this.$refs['form'].resetFields()
-          this.dialogToVoidVisible = false
-          this.$store.dispatch('changeDetailDrawer',false)
-        })
+    async onSubmit(){
+      this.form.sa_competitorid = this.id
+      const res = await this.$api.requested({
+        "id": 20221018164202,
+        "content": {
+          "sa_competitorids":[this.form.sa_competitorid],
+          "deletereason":this.form.deletereason
+        },
+      })
+      this.tool.showMessage(res,() => {
+        this.$emit('onSuccess')
+        this.$store.dispatch('changeDetailDrawer',false)
       })
     }
   }

src/HDrpManagement/projectChange/modules/detail.vue

@@ -9,7 +9,7 @@
     :turnPageId="20221020143502"
     idname="sa_projectid"
     :tags="[]"
-    :tabs="['详细信息','项目评估','关联客户','产品配置单','报价单','竞争对手','合同','关联线索','联系人']"
+    :tabs="['详细信息','项目评估','关联客户','联系人','产品配置单','报价单','竞争对手','合同','关联线索']"
     @pageChange="pageChange"
     @onEditSuccess="queryMainData($route.query.id)">
     <!-- 使用此插槽可不传[tags] -->
@@ -56,24 +56,25 @@
     <div slot="slot2" class=" normal-panel">
       <andEnterprise :rowData="mainData" v-if="flag === 1" @changeSuccess="changeSuccess"/>
     </div>
-    <div slot="slot3" class=" normal-panel" >
+    <div slot="slot3" class=" normal-panel">
+      <contacts v-if="mainData" :data="mainData" />
+    </div>
+    <div slot="slot4" class=" normal-panel" >
       <product_set :data="mainData"  v-if="flag === 1"  @productSetSuccess="queryMainData($route.query.id)" @delSuccess="queryMainData($route.query.id)"/>
     </div>
-    <div slot="slot4" class="normal-panel" >
+    <div slot="slot5" class="normal-panel" >
       <quotation :data="mainData" v-if="flag === 1" />
     </div>
-    <div slot="slot5" class=" normal-panel">
-      <Rival v-if="mainData" :data="mainData" />
-    </div>
     <div slot="slot6" class=" normal-panel">
-      <contract v-if="mainData" :data="mainData" />
+      <Rival v-if="mainData" :data="mainData" />
     </div>
     <div slot="slot7" class=" normal-panel">
-      <clue v-if="mainData" :data="mainData" />
+      <contract v-if="mainData" :data="mainData" />
     </div>
     <div slot="slot8" class=" normal-panel">
-      <contacts v-if="mainData" :data="mainData" />
+      <clue v-if="mainData" :data="mainData" />
     </div>
+
   </basicDetails>
 </template>
 
@@ -417,7 +418,7 @@ export default {
         },
         {
           label:'预计签约金额(元)',
-          value: this.signamount_due
+          value: this.mainData.signamount_due
         },
       ]
     },

src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/add.vue

@@ -4,22 +4,14 @@
     <el-drawer
         title="新建关联客户"
         :visible.sync="visible"
-        size="600px"
+        size="800px"
         direction="rtl"
         append-to-body
         :show-close="false"
         @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="24">
-              <el-form-item label="客户名称:" prop="enterprisename">
-                <el-popover
-                    placement="bottom"
-                    width="700"
-                    trigger="click"
-                    v-model="customerShow"
-                    @show="customerList">
                   <el-input
                       style="width:300px;margin-bottom: 10px"
                       placeholder="请输入内容"
@@ -30,7 +22,7 @@
                       @keyup.enter.native="customerList(customerParam.content.pageNumber = 1)">
                     <i slot="prefix" class="el-icon-search" @click="customerList(customerParam.content.pageNumber = 1)"></i>
                   </el-input>
-                  <el-table :data="customer.customerData" @row-click="customerData" height="396px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
+                  <el-table :data="customer.customerData" @row-click="customerData" height="802px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                     <el-table-column
                         label="客户编号"
                         width="180">
@@ -65,16 +57,8 @@
                         :total="customer.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference" :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
-                </el-popover>
-              </el-form-item>
+<!--                  <el-input slot="reference" :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>-->
             </el-col>
-            <el-col :span="24">
-              <el-form-item label="备注:" >
-                <el-input v-model="form.remarks" type="textarea" rows="5" placeholder="请输入备注信息"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-form>
         </el-row>
       </div>
       <div class="fixed__btn__panel">
@@ -122,7 +106,7 @@ export default {
         "id": 20220920083901,
         "content": {
           "pageNumber": 1,
-          "pageSize": 10,
+          "pageSize": 20,
           "where": {
             "condition": "",
             "type":5,
@@ -144,23 +128,19 @@ export default {
       this.visible = true
       console.log(this.enterpriseTypeList,'客户类型')
     },
-    onSubmit(){
+    async onSubmit(){
       this.form.sa_projectid = this.$route.query.id
-      this.$refs['form'].validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "id": 20221027143602,
-          "content": this.form
-        })
-        this.tool.showMessage(res,()=>{
-          this.$emit('addSuccess')
-          this.onClose()
-        })
+      const res = await this.$api.requested({
+        "id": 20221027143602,
+        "content": this.form
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit('addSuccess')
+        this.onClose()
       })
     },
     onClose(){
       this.visible = false
-      this.$refs.form.resetFields()
       this.form={
         sa_project_partiesid: 0,
         sa_projectid: '',
@@ -194,7 +174,7 @@ export default {
     customerData(val){
       this.form.sys_enterpriseid = val.sys_enterpriseid
       this.form.enterprisename = val.enterprisename
-      this.customerShow = false
+      this.onSubmit()
     },
     /*客户分页*/
     handleSizeChangeCustomer(val) {
@@ -210,7 +190,7 @@ export default {
 
   },
   mounted() {
-
+    this.selectCustomer()
   }
 }
 </script>

src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/addCopy.vue

@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="onshow">新 建</el-button>
+    <el-drawer
+        title="新建关联客户"
+        :visible.sync="visible"
+        size="600px"
+        direction="rtl"
+        append-to-body
+        :show-close="false"
+        @close="onClose">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="客户名称:" prop="enterprisename">
+                <el-popover
+                    placement="bottom"
+                    width="700"
+                    trigger="click"
+                    v-model="customerShow"
+                    @show="customerList">
+                  <el-input
+                      style="width:300px;margin-bottom: 10px"
+                      placeholder="请输入内容"
+                      v-model="customerParam.content.where.condition"
+                      clearable
+                      @clear="customerList(customerParam.content.pageNumber = 1)"
+                      size="mini"
+                      @keyup.enter.native="customerList(customerParam.content.pageNumber = 1)">
+                    <i slot="prefix" class="el-icon-search" @click="customerList(customerParam.content.pageNumber = 1)"></i>
+                  </el-input>
+                  <el-table :data="customer.customerData" @row-click="customerData" height="396px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
+                    <el-table-column
+                        label="客户编号"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.sa_customersid?scope.row.sa_customersid:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="客户名称"
+                        width="200">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--'}}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="地址"
+                    >
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <div class="container normal-panel" style="text-align:right">
+                    <el-pagination
+                        background
+                        small
+                        @size-change="handleSizeChangeCustomer"
+                        @current-change="handleCurrentChangeCustomer"
+                        :page-sizes="[10,20,50,100,]"
+                        layout="total,sizes, prev, pager, next, jumper"
+                        :current-page="customer.currentPage"
+                        :total="customer.total">
+                    </el-pagination>
+                  </div>
+                  <el-input slot="reference" :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注:" >
+                <el-input v-model="form.remarks" type="textarea" rows="5" placeholder="请输入备注信息"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+    <enterprise
+        :visible="visibleEnterprise"
+        :index="index"
+        :sa_projectid="form.sa_projectid"
+        v-if="visibleEnterprise"
+        @onEnterprise="onEnterprise">
+    </enterprise>
+  </div>
+</template>
+
+<script>
+import enterprise from './enterprise'
+export default {
+  name: "add",
+  props:["data"],
+  // inject:["enterpriseType"],
+  components:{enterprise},
+  data(){
+    return {
+      visible:false,
+      visibleEnterprise:false,
+      customerShow:false,
+      customertype:'',
+      index:'',
+      form:{
+        sa_project_partiesid: 0,
+        sa_projectid: '',
+        sys_enterpriseid:'',
+        enterprisename:'',
+        remarks:""
+      },
+      rules:{
+        enterprisename:[
+          { required: true, message: '请选择企业', trigger: 'change'},
+        ],
+      },
+      customerParam:{
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "where": {
+            "condition": "",
+            "type":5,
+            "sa_projectid":""
+          }
+        }
+      },
+      customer:{
+        customerData:[],
+        total:0,
+        currentPage:0,
+      },
+    }
+  },
+  methods:{
+    onshow(){
+      console.log("新增企业缔约信息")
+      console.log(this.data)
+      this.visible = true
+      console.log(this.enterpriseTypeList,'客户类型')
+    },
+    onSubmit(){
+      this.form.sa_projectid = this.$route.query.id
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": 20221027143602,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('addSuccess')
+          this.onClose()
+        })
+      })
+    },
+    onClose(){
+      this.visible = false
+      this.$refs.form.resetFields()
+      this.form={
+        sa_project_partiesid: 0,
+        sa_projectid: '',
+        sys_enterpriseid:'',
+        enterprisename:'',
+        remarks:""
+      }
+    },
+    enterpriseList(){
+      this.visibleEnterprise = true
+    },
+    /*客户列表*/
+    onEnterprise(data){
+      this.visibleEnterprise = false
+      console.log("企业信息",data)
+      this.form.sys_enterpriseid = data.sys_enterpriseid
+      this.form.enterprisename = data.enterprisename
+    },
+    async customerList(){
+      this.customerParam.content.where.sa_projectid = this.$route.query.id
+      const res = await this.$api.requested(this.customerParam)
+      this.customer.customerData = res.data
+      this.customer.total = res.total
+      this.customer.currentPage = res.pageNumber
+    },
+    selectCustomer(){
+      this.customerParam.content.where.condition = this.form.enterprisename
+      this.customerList()
+    },
+    /*客户选择信息*/
+    customerData(val){
+      this.form.sys_enterpriseid = val.sys_enterpriseid
+      this.form.enterprisename = val.enterprisename
+      this.customerShow = false
+    },
+    /*客户分页*/
+    handleSizeChangeCustomer(val) {
+      // console.log(`每页 ${val} 条`);
+      this.customerParam.content.pageSize = val
+      this.customerList()
+    },
+    handleCurrentChangeCustomer(val) {
+      // console.log(`当前页: ${val}`);
+      this.customerParam.content.pageNumber = val
+      this.customerList()
+    },
+
+  },
+  mounted() {
+
+  }
+}
+</script>
+
+<style scoped>
+>>> .el-divider--horizontal {
+  height: 1px;
+  width: 100%;
+  margin: 0px;
+}
+/deep/.el-input__prefix {
+  display: flex;
+  align-items: center;
+}
+</style>

src/HDrpManagement/projectChange/modules/modules/andEnterprise/index.vue

@@ -26,7 +26,7 @@
           <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
         </template>
         <template v-slot:opreation="scope">
-          <edit class="inline-16"  :data="scope.data" @updateSuccess="onSuccess" :disabled="rowData.disabled"></edit>
+<!--          <edit class="inline-16"  :data="scope.data" @updateSuccess="onSuccess" :disabled="rowData.disabled"></edit>-->
           <set_customer_type  class="inline-16" :data="scope.data" @setSuccess="onSuccess" :disabled="rowData.disabled"></set_customer_type>
           <to_del  class="inline-16" :data="scope.data" @toDelSuccess="onSuccess" :disabled="rowData.disabled"></to_del>
         </template>

src/HDrpManagement/projectChange/modules/modules/rival/index.vue

@@ -18,12 +18,24 @@
         <div v-if="scope.column.columnname === 'important'">
           <span>{{scope.column.data[scope.column.columnname] === 1 ? '是' : '否'}}</span>
         </div>
-        <div v-if="scope.column.columnname === 'operation'">
+        <div v-else-if="scope.column.columnname === 'operation'">
           <span></span>
         </div>
         <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
       </template>
       <template v-slot:opreation="scope">
+        <edit class="inline-16" :data="scope.data" @updateSuccess="onSuccess"></edit>
+        <el-popconfirm
+            confirm-button-text='确定'
+            cancel-button-text='取消'
+            icon="el-icon-info"
+
+            title="确定删除该竞争对手吗？"
+            @confirm="onDel(scope.data.sa_project_competeid)"
+        >
+          <el-button slot="reference" size="mini" type="text" >删 除</el-button>
+        </el-popconfirm>
+
       </template>
     </tableLayout>
     <div class="container normal-panel" style="text-align:right">
@@ -42,6 +54,7 @@
 
 <script>
 import add from './modules/add'
+import edit from './modules/edit'
 export default {
   props:["data"],
   data () {
@@ -69,7 +82,7 @@ export default {
 
     }
   },
-  components:{add},
+  components:{add,edit},
   methods:{
     /*list (param) {
       param.content.sa_projectid = this.$route.query.id
@@ -92,6 +105,19 @@ export default {
     },
     onSuccess(){
       this.listData()
+    },
+    async onDel(id){
+      console.log(id)
+      const res = await this.$api.requested({
+        "id": 20221019165902,
+        "content": {
+          "sa_project_competeids": [id],
+          "deletereason":""
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.listData()
+      })
     }
   },
   mounted() {

src/HDrpManagement/projectChange/modules/modules/rival/modules/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="small" type="primary" @click="dialogFormVisible = true">添 加</el-button>
     <el-drawer
-        title="关联竞争对手"
+        title="添加关联竞争对手"
         :visible.sync="dialogFormVisible"
         size="600px"
         direction="rtl"
@@ -20,7 +20,7 @@
                     trigger="click"
                     v-model="enterpriseShow"
                     @show="enterpriseList">
-                  <el-table :data="enterprise.enterpriseData" @row-click="enterpriseData">
+                  <el-table :data="enterprise.enterpriseData" @row-click="enterpriseData" height="400px">
                     <el-table-column
                         label="品牌名称"
                         width="180">
@@ -81,7 +81,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item  label="品牌名称:">
-                <el-input  autosize v-model="form.brandname" placeholder="品牌名称" disabled></el-input>
+                <el-input  autosize v-model="form.brandname" placeholder="品牌名称" ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -94,17 +94,17 @@
             </el-col>
             <el-col :span="24">
               <el-form-item  label="优势信息:">
-                <el-input  autosize v-model="form.advantage" placeholder="优势信息" disabled></el-input>
+                <el-input  autosize v-model="form.advantage" placeholder="优势信息" ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item  label="劣势信息:" >
-                <el-input  autosize v-model="form.industry" placeholder="劣势信息" disabled></el-input>
+                <el-input  autosize v-model="form.inferiority" placeholder="劣势信息" ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item  label="备注:" >
-                <el-input  autosize v-model="form.remarks" placeholder="备注" disabled></el-input>
+                <el-input  autosize v-model="form.remarks" placeholder="备注" ></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -151,7 +151,7 @@ export default {
         "sa_project_competeid": 0,
         "sa_projectid": 1, //工程项目表ID
         "contactsid": '', //可不传
-        "sa_competitorid": 1, //竞争对手ID
+        "sa_competitorid": 0, //竞争对手ID
         "important": 0, //主要威胁 0/1
         "advantage": "",
         "inferiority": "",

src/HDrpManagement/projectChange/modules/modules/rival/modules/edit.vue

@@ -1,12 +1,250 @@
 <template>
   <div>
-    <el-button size="mini" type="text">编 辑</el-button>
+    <el-button size="mini" type="text" @click="onShow">编 辑</el-button>
+    <el-drawer
+        title="编辑关联竞争对手"
+        :visible.sync="dialogFormVisible"
+        size="600px"
+        direction="rtl"
+        :show-close="false"
+        append-to-body
+        @close="onClose">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="82px">
+            <el-col :span="24">
+              <el-form-item  label="企业名称:" prop="enterprisename">
+                <el-popover
+                    placement="bottom"
+                    width="580"
+                    trigger="click"
+                    v-model="enterpriseShow"
+                    @show="enterpriseList">
+                  <el-table :data="enterprise.enterpriseData" @row-click="enterpriseData">
+                    <el-table-column
+                        label="品牌名称"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.brandname?scope.row.brandname:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="企业名称"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="优势信息"
+                        width="300">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.advantage?scope.row.advantage:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="劣势信息"
+                        width="300">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.industry?scope.row.industry:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="备注"
+                        width="300">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.remarks?scope.row.remarks:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <!--                    <el-table-column
+                                            fixed="right"
+                                            label="操作"
+                                            width="60">
+                                          <template slot-scope="scope">
+                                            <el-button type="text" @click="projectData(scope.row)">选择</el-button>
+                                          </template>
+                                        </el-table-column>-->
+                  </el-table>
+                  <div class="container normal-panel" style="text-align:right">
+                    <el-pagination
+                        background
+                        small
+                        @size-change="handleSizeChangeProject"
+                        @current-change="handleCurrentChangeProject"
+                        :current-page="enterprise.currentPage"
+                        :total="enterprise.total">
+                    </el-pagination>
+                  </div>
+                  <el-input slot="reference"  v-model="form.enterprisename" autocomplete="off" placeholder="请选择企业名称"   @input="selectEnterprise"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="品牌名称:">
+                <el-input  autosize v-model="form.brandname" placeholder="品牌名称" ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="主要威胁:">
+                <el-radio-group v-model="form.important">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="优势信息:">
+                <el-input  autosize v-model="form.advantage" placeholder="优势信息" ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="劣势信息:" >
+                <el-input  autosize v-model="form.inferiority" placeholder="劣势信息" ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="备注:" >
+                <el-input  autosize v-model="form.remarks" placeholder="备注" ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
 export default {
-  name: "edit"
+  name: "edit",
+  props:["data"],
+  data(){
+    return {
+      enterpriseShow:false,
+      dialogFormVisible:false,
+      enterprise:{
+        enterpriseData:[],
+        total:0,
+        currentPage:0,
+      },
+      enterpriseParam:{
+        "content": {
+          "isExport": false,
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": "",
+            "tablefilter": {},
+            "sa_projectid": ''//不传差全部，传过滤掉对应项目中的数据
+          }
+        },
+        "id": 20221018164302,
+      },
+      form:{
+        "enterprisename":'',
+        "brandname":'',
+        "industry":'',
+        "sa_project_competeid": 0,
+        "sa_projectid": 1, //工程项目表ID
+        "contactsid": '', //可不传
+        "sa_competitorid": 1, //竞争对手ID
+        "important": 0, //主要威胁 0/1
+        "advantage": "",
+        "inferiority": "",
+        "remarks": ""
+      },
+      rules:{
+        enterprisename:[
+          { required: true, message: '还未选择企业', trigger: 'change' },
+        ]
+      }
+    }
+  },
+  methods:{
+    onShow(){
+      this.dialogFormVisible = true
+      console.log(this.data)
+      this.form = Object.assign({},this.form,this.data)
+    },
+    /*可选企业列表*/
+    async enterpriseList(){
+      this.enterpriseParam.content.where.sa_projectid = this.data.sa_projectid
+      const res = await this.$api.requested(this.enterpriseParam)
+      this.enterprise.enterpriseData = res.data
+      this.enterprise.total = res.total
+      this.enterprise.currentPage = res.pageNumber
+      console.log(res)
+    },
+    selectEnterprise(){
+      this.enterpriseParam.content.where.condition = this.form.enterprisename
+      this.enterpriseList()
+    },
+    enterpriseData(val){
+      this.form = Object.assign({},this.form,val)
+      this.enterpriseShow = false
+    },
+    onSubmit(){
+      this.form.sa_projectid = this.data.sa_projectid
+      console.log(this.form)
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": 20221019165802,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.dialogFormVisible = false
+          this.$refs.form.resetFields()
+          this.form = {
+            "enterprisename":'',
+            "brandname":'',
+            "industry":'',
+            "sa_project_competeid": 0,
+            "sa_projectid": '', //工程项目表ID
+            "contactsid": '', //可不传
+            "sa_competitorid": '', //竞争对手ID
+            "important": 0, //主要威胁 0/1
+            "advantage": "",
+            "inferiority": "",
+            "remarks": ""
+          }
+          this.$emit("updateSuccess")
+        })
+      })
+    },
+    onClose(){
+      this.dialogFormVisible = false
+      this.$refs.form.resetFields()
+      this.form = {
+        "enterprisename":'',
+        "brandname":'',
+        "industry":'',
+        "sa_project_competeid": 0,
+        "sa_projectid": '', //工程项目表ID
+        "contactsid": '', //可不传
+        "sa_competitorid": '', //竞争对手ID
+        "important": 0, //主要威胁 0/1
+        "advantage": "",
+        "inferiority": "",
+        "remarks": ""
+      }
+    },
+    /*企业分页*/
+    handleSizeChangeProject(val) {
+      // console.log(`每页 ${val} 条`);
+      this.enterpriseParam.content.pageSize = val
+      this.projectList()
+    },
+    handleCurrentChangeProject(val) {
+      // console.log(`当前页: ${val}`);
+      this.enterpriseParam.content.pageNumber = val
+      this.projectList()
+    },
+  }
 }
 </script>
 

src/HManagement/salesForecastTemplate/modules/add.vue

@@ -28,7 +28,7 @@
                 <div class="submit__date_List">
                   <div class="list_title flex-align-center">
                     <p>开始时间</p>
-                    <p>提报周期</p>
+                    <p>截止时间</p>
                   </div>
                   <div v-for="(item,index) in sdList" :key="index" class="flex-align-center mt-10">
                     <!-- <el-date-picker
@@ -42,7 +42,7 @@
                     <el-input v-model="item.periodpoint" placeholder="输入日期" @change="onDateChange" size="small">
                        <template slot="prepend">每月</template>
                     </el-input>&nbsp;
-                    <el-input v-model="item.taskday" @change="onDateChange" size="small" placeholder="请输入周期天数"></el-input>&emsp;
+                    <el-input v-model="item.taskday" @change="onDateChange" size="small" placeholder="请输入截止时间"></el-input>&emsp;
                     <el-button size="small" type="text" @click="deleteperiod(index)">删 除</el-button>
                   </div>
                   <div class="flex-align-center">
@@ -56,7 +56,7 @@
                 <div class="submit__date_List">
                   <div class="list_title flex-align-center">
                     <p>开始时间</p>
-                    <p>提报周期</p>
+                    <p>截止时间</p>
                   </div>
                   <div class="flex-align-center">
                     <el-date-picker

src/HManagement/siteManage/securityConfig/components/addressManage/add.vue

@@ -0,0 +1,227 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="onshow">新增企业地址</el-button>
+    <el-drawer
+        title=" 新建企业地址"
+        :visible.sync="dialogFormVisible"
+        size="600px"
+        direction="rtl"
+        :show-close="false"
+        append-to-body
+        @close="onClose">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="75px">
+            <el-col :span="24">
+              <el-form-item label="省市县:" >
+                <el-cascader
+                    style="width:100%"
+                    v-model="value"
+                    :options="basicData.data().areaData"
+                    @change="cascaderChange" clearable>
+                </el-cascader>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="详细地址:" >
+                <el-input type="textarea" rows="2" v-model="form.address" placeholder="请输入家庭住址"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="地址类型:" >
+                <el-select
+                    ref="sle"
+                    style="width:100%;"
+                    v-model="typeData"
+                    multiple
+                    placeholder="请选择标签"
+                    size="mini"
+                >
+                  <el-option
+                      v-for="item in addressList"
+                      :key="item.index"
+                      :label="item.tag"
+                      :value="item.tag"
+                  >
+                    <span style="float: left">{{ item.tag }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.helptips?item.helptips:'暂无描述' }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="默认地址:">
+                <el-radio v-model="form.isdefault" label="1">是</el-radio>
+                <el-radio v-model="form.isdefault" label="0">否</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="备注:" >
+                <el-input type="textarea"  rows="5" v-model="form.remarks" placeholder="请输入备注"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width" :disabled="form.province === '' && form.address === ''">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "add",
+  props:["data"],
+  data() {
+    return {
+      dialogFormVisible:false,
+      form:{
+        contactsid: 0,
+        sys_enterpriseid: "",
+        name: "",
+        sex: "",
+        depname: "",
+        position: "",
+        birthday: "",
+        phonenumber: "",
+        email: "",
+        province: "",
+        city: "",
+        county: "",
+        address: "",
+        remarks: "",
+        workaddress: 1,
+        isdefault: '1',
+        isprimary: 1
+      },
+      rules:{
+        address: [
+          { required: false, message: '地址不能为空', trigger: 'blur' },
+        ],
+      },
+      value:[],
+      addressList:[],
+      typeData:[]
+    }
+  },
+  methods:{
+    onshow(){
+      console.log("输出")
+      console.log(this.data)
+      this.form.sys_enterpriseid = this.data.sys_enterpriseid
+      this.dialogFormVisible = true
+      this.addressType()
+    },
+    onSubmit(){
+      console.log(this.form)
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": "20221018141802",
+          "content": this.form
+        })
+        this.tool.showMessage(res,() => {
+          this.$refs['form'].resetFields()
+          this.value = ''
+          this.form = {
+            contactsid: 0,
+            sys_enterpriseid: "",
+            name: "",
+            sex: "",
+            depname: "",
+            position: "",
+            birthday: "",
+            phonenumber: "",
+            email: "",
+            province: "",
+            city: "",
+            county: "",
+            address: "",
+            remarks: "",
+            workaddress: 1,
+            isdefault: '1',
+            isprimary: 1
+          }
+          this.dialogFormVisible = false
+          if (this.typeData !== ''){
+            this.setTag(res.data.contactsid)
+          }else {
+            this.$emit("insertSuccess")
+          }
+
+        })
+      })
+    },
+    async setTag(id){
+      const res = await this.$api.requested({
+        "id": 20220929090901,
+        "content": {
+          "ownertable":"sys_enterprise_contacts",
+          "ownerid":id,
+          "datatag":this.typeData
+        }
+      })
+      this.$emit("insertSuccess")
+      this.typeData = []
+      console.log(res)
+    },
+    onClose(){
+      this.$refs['form'].resetFields()
+      this.value = ''
+      this.form = {
+        contactsid: 0,
+        sys_enterpriseid: "",
+        name: "",
+        sex: "",
+        depname: "",
+        position: "",
+        birthday: "",
+        phonenumber: "",
+        email: "",
+        province: "",
+        city: "",
+        county: "",
+        address: "",
+        remarks: "",
+        workaddress: 1,
+        isdefault: '1',
+        isprimary: 1
+      }
+      this.dialogFormVisible = false
+    },
+    /*省市县*/
+    cascaderChange (val) {
+      console.log(this.form.province)
+      if (val.length === 1)
+        return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
+
+      this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
+      console.log(this.form)
+      console.log(this.form.province)
+
+    },
+    /*地址类型*/
+    async addressType(){
+      let param = {
+        content: {
+          isExport: 0,
+          pageNumber: 1,
+          pageSize: 20,
+          sys_systemtagid: 13
+        },
+        id: 20221013104401
+      };
+      const res = await this.$api.requested(param)
+      this.addressList = res.data
+      console.log(res,"地址类型")
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/siteManage/securityConfig/components/addressManage/edit.vue

@@ -0,0 +1,195 @@
+<template>
+  <div class="inline-16">
+    <el-button size="small" type="text" @click="onshow" >编 辑</el-button>
+    <el-drawer
+        title="编辑企业地址"
+        :visible.sync="dialogFormVisible"
+        size="600px"
+        direction="rtl"
+        :show-close="false"
+        append-to-body
+        @close="dialogFormVisible = false">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="75px">
+            <el-col :span="24">
+              <el-form-item label="省市县:" >
+                <el-cascader
+                    style="width:100%"
+                    v-model="form.value"
+                    :options="basicData.data().areaData"
+                    @change="cascaderChange" clearable>
+                </el-cascader>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="详细地址:" >
+                <el-input type="textarea" rows="2" v-model="form.address" placeholder="请输入家庭住址"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="地址类型:" >
+                <el-select
+                    ref="sle"
+                    style="width:100%;"
+                    v-model="typeData"
+                    multiple
+                    placeholder="请选择标签"
+                    size="mini"
+                >
+                  <el-option
+                      v-for="item in addressList"
+                      :key="item.index"
+                      :label="item.tag"
+                      :value="item.tag"
+                  >
+                    <span style="float: left">{{ item.tag }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.helptips?item.helptips:'暂无描述' }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="默认地址:" >
+                <el-radio v-model="form.isdefault" label="1">是</el-radio>
+                <el-radio v-model="form.isdefault" label="0">否</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="备注:" >
+                <el-input type="textarea"  rows="5" v-model="form.remarks" placeholder="请输入备注"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width">保 存</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "edit",
+  props:["data"],
+  data(){
+    return {
+      dialogFormVisible:false,
+      form:{
+        value:[],
+        contactsid: "",
+        sys_enterpriseid: "",
+        name: "",
+        sex: "",
+        depname: "",
+        position: "",
+        birthday: "",
+        phonenumber: "",
+        email: "",
+        province: "",
+        city: "",
+        county: "",
+        address: "",
+        remarks: "",
+        workaddress: 1,
+        isdefault: '',
+        isprimary: 1
+      },
+      rules:{
+        address: [
+          { required: true, message: '地址不能为空', trigger: 'blur' },
+        ],
+      },
+      value:'',
+      addressList:[],
+      typeData:[]
+    }
+  },
+  methods:{
+    onshow(){
+      console.log(this.data,"编辑数据")
+      this.dialogFormVisible = true
+      // this.form.sys_enterpriseid = this.data.sys_enterpriseid
+      // this.form.contactsid = this.data.contactsid
+      // this.form.remarks = this.data.remarks
+      // this.form.address = this.data.address
+      // this.form.province = this.data.province
+      // this.form.city = this.data.city
+      // this.county = this.data.county
+      // this.form.value[0] = this.data.province
+      // this.form.value[1] = this.data.city
+      // this.form.value[2] = this.data.county
+      this.form = Object.assign({},this.form,this.data)
+      if (this.form.isdefault === 0){
+        this.form.isdefault = '0'
+      }else {
+        this.form.isdefault = '1'
+      }
+      this.form.value = [this.form.province,this.form.city,this.form.county]
+      this.typeData = this.form.tag
+      console.log(this.form)
+      this.addressType()
+    },
+    onSubmit(){
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": "20221018141802",
+          "content": this.form
+        })
+        this.tool.showMessage(res,() => {
+          this.$refs['form'].resetFields()
+          this.dialogFormVisible = false
+          if (this.typeData !== ''){
+            this.setTag(this.form.contactsid)
+          }else {
+            this.$emit("updateSuccess")
+          }
+        })
+      })
+    },
+    /*省市县*/
+    cascaderChange (val) {
+      if (val.length === 1)
+        return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
+
+      this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
+
+    },
+    async setTag(id){
+      const res = await this.$api.requested({
+        "id": 20220929090901,
+        "content": {
+          "ownertable":"sys_enterprise_contacts",
+          "ownerid":id,
+          "datatag":this.typeData
+        }
+      })
+      this.$emit("updateSuccess")
+      console.log(res)
+    },
+    /*地址类型*/
+    async addressType(){
+      let param = {
+        content: {
+          isExport: 0,
+          pageNumber: 1,
+          pageSize: 20,
+          sys_systemtagid: 13
+        },
+        id: 20221013104401
+      };
+      const res = await this.$api.requested(param)
+      this.addressList = res.data
+      console.log(res,"地址类型")
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/siteManage/securityConfig/components/addressManage/index.vue

@@ -0,0 +1,143 @@
+<template>
+  <div>
+    <div class="flex-align-center normal-margin">
+      <add class="inline-16" :data="data" @insertSuccess="onSuccess" ></add>
+      <el-input
+          placeholder="请输入搜索内容"
+          suffix-icon="el-icon-search"
+          v-model="search"
+          style="width:200px"
+          size="small"
+          class="input-with-select inline-16"
+          @keyup.native.enter="queryClick"
+          @clear="clearData"
+          clearable>
+      </el-input>
+    </div>
+    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" fixedName="operation">
+      <template v-slot:customcol="scope">
+        <div v-if="scope.column.columnname === 'province'">
+          <p>{{ scope.column.data.province + '-' +scope.column.data.city + '-' + scope.column.data.county}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'isdefault'">
+          <p>{{ scope.column.data.isdefault === 0?'否':'是'}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'type'">
+          <div v-for="item in  scope.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px">
+            <el-tag color="#FAAB16" size="mini" type="warning" effect="dark">
+              <span>{{item}}</span>
+            </el-tag>
+          </div>
+        </div>
+        <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+      </template>
+      <template v-slot:opreation="scope">
+        <edit :data="scope.data" @updateSuccess="onSuccess"></edit>
+        <el-popconfirm
+            confirm-button-text='确定'
+            cancel-button-text='取消'
+            icon="el-icon-info"
+            title="确定删除该企业地址吗？"
+            @confirm="onDel(scope.data.contactsid)"
+        >
+          <el-button slot="reference" type="text" size="mini">删 除</el-button>
+        </el-popconfirm>
+      </template>
+    </tableLayout>
+    <div style="margin-top:16px;text-align:right">
+      <el-pagination
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-size="params.content.pageSize"
+          layout="total, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import add from './add'
+import edit from './edit'
+export default {
+  name: "index",
+  props:["data"],
+  data(){
+    return {
+      tableHieght:"600px",
+      tablecols:[],
+      list:[],
+      listGet:[],
+      total:0,
+      currentPage:0,
+      search:"",
+      sys_enterpriseid:"",
+      params:{
+        "id": "20221022165503",
+        "content": {
+          "where":{
+            "condition":"",
+            "workaddress":1
+          }
+        }
+      }
+    }
+  },
+  components:{add,edit},
+  methods:{
+    async listData(){
+      const res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+    onSuccess(){
+      this.listData()
+    },
+    clearData(){
+      this.search = ""
+    },
+    queryClick(){
+      this.params.content.where.condition = this.search
+      this.listData()
+    },
+    async onDel(id){
+      const res = await this.$api.requested({
+        "id": "20221018145502",
+        "content": {
+          "contactsid": id,
+          "sys_enterpriseid": this.data.sys_enterpriseid,
+          "deletereason":""
+
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.listData()
+      })
+    }
+  },
+  mounted() {
+    this.listData()
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).customerAddressTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/siteManage/securityConfig/components/contacts/add.vue

@@ -1,12 +1,198 @@
 <template>
   <div>
-    <el-button size="small" type="primary">新 建</el-button>
+    <el-button size="small" type="primary" @click="dialogFormVisible = true">新 建</el-button>
+    <el-drawer
+        title="新建联系人"
+        :visible.sync="dialogFormVisible"
+        size="600px"
+        direction="rtl"
+        :show-close="false"
+        append-to-body
+        @close="onClose">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="75px">
+            <el-col :span="24">
+              <el-form-item  label="姓名:" prop="name">
+                <el-input   autosize v-model="form.name" placeholder="请输入手机号码"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="手机号:" prop="phonenumber">
+                <el-input   autosize v-model="form.phonenumber" placeholder="请输入手机号码"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="邮箱:" :rules="[
+                { pattern:/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/, message: '请输入有效的邮箱',trigger: 'blur' }
+              ]">
+                <el-input   autosize v-model="form.email" placeholder="请输入邮箱"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="单位:" >
+                <el-input  autosize v-model="data.enterprisename" placeholder="请输入部门" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="部门:" >
+                <el-input  autosize v-model="form.depname" placeholder="请输入部门"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="职位:" >
+                <el-input  autosize v-model="form.position" placeholder="请输入职位"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="性别:" >
+                <el-radio v-model="form.sex" label="0">男</el-radio>
+                <el-radio v-model="form.sex" label="1">女</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="生日:" >
+                <el-date-picker
+                    v-model="form.birthday"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="家庭住址:" >
+                <el-input type="textarea" rows="5" v-model="form.address" placeholder="请输入家庭住址"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="备注:" >
+                <el-input type="textarea"  rows="5" v-model="form.remarks" placeholder="请输入备注"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
 export default {
-  name: "add"
+  name: "add",
+  props:["data"],
+  data(){
+    var validateMobilePhone = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('手机号不可为空'));
+      } else {
+        if (value !== '') {
+          var reg=/^1[3456789]\d{9}$/;
+          if(!reg.test(value)){
+            callback(new Error('请输入有效的手机号码'));
+          }
+        }
+        callback();
+      }
+    };
+    return {
+      dialogFormVisible:false,
+      form:{
+        "contactsid":0,
+        "name":"",
+        "sex":"0",
+        "depname":"",
+        "position":"",
+        "birthday":"",
+        "phonenumber":"",
+        "email":"",
+        "province":"",
+        "city":"",
+        "county":"",
+        "address":"",
+        "remarks":"",
+        "workaddress":0,
+        "sys_enterpriseid":'',
+        "enterprisename":''
+      },
+      rules:{
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur,change' },
+        ],
+        phonenumber: [
+          { required: true, validator: validateMobilePhone, trigger: 'blur' },
+        ]
+      }
+    }
+  },
+  methods:{
+    onSubmit(){
+      console.log(this.data)
+      this.form.sys_enterpriseid = this.data.sys_enterpriseid
+      this.form.enterprisename = this.data.enterprisename
+      console.log(this.form)
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": "20221018141802",
+          "content":this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit("insertSuccess")
+          this.$refs.form.resetFields()
+          this.form = {
+            "contactsid":0,
+            "name":"",
+            "sex":"0",
+            "depname":"",
+            "position":"",
+            "birthday":"",
+            "phonenumber":"",
+            "email":"",
+            "province":"",
+            "city":"",
+            "county":"",
+            "address":"",
+            "remarks":"",
+            "workaddress":0,
+            "sys_enterpriseid":'',
+            "enterprisename":''
+          }
+          this.dialogFormVisible = false
+        })
+      })
+    },
+    onClose(){
+      this.dialogFormVisible = false
+      this.$refs.form.resetFields()
+      this.form = {
+        "contactsid":0,
+        "name":"",
+        "sex":"0",
+        "depname":"",
+        "position":"",
+        "birthday":"",
+        "phonenumber":"",
+        "email":"",
+        "province":"",
+        "city":"",
+        "county":"",
+        "address":"",
+        "remarks":"",
+        "workaddress":0,
+        "sys_enterpriseid":'',
+        "enterprisename":''
+      }
+    }
+  },
+  mounted() {
+  }
 }
 </script>
 

src/HManagement/siteManage/securityConfig/components/contacts/edit.vue

@@ -0,0 +1,189 @@
+<template>
+  <div>
+    <el-button size="mini" type="text" @click="onshow">编 辑</el-button>
+    <el-drawer
+        title="编辑联系人"
+        :visible.sync="dialogFormVisible"
+        size="600px"
+        direction="rtl"
+        :show-close="false"
+        append-to-body
+        @close="onClose">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="75px">
+            <el-col :span="24">
+              <el-form-item  label="姓名:" prop="name">
+                <el-input   autosize v-model="form.name" placeholder="请输入手机号码"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="手机号:" prop="phonenumber">
+                <el-input   autosize v-model="form.phonenumber" placeholder="请输入手机号码"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="邮箱:" :rules="[
+                { pattern:/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/, message: '请输入有效的邮箱',trigger: 'blur' }
+              ]">
+                <el-input   autosize v-model="form.email" placeholder="请输入邮箱"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="单位:" >
+                <el-input  autosize v-model="dataOld.enterprisename" placeholder="请输入部门" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="部门:" >
+                <el-input  autosize v-model="form.depname" placeholder="请输入部门"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="职位:" >
+                <el-input  autosize v-model="form.position" placeholder="请输入职位"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="性别:" >
+                <el-radio v-model="form.sex" label="男">男</el-radio>
+                <el-radio v-model="form.sex" label="女">女</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="生日:" >
+                <el-date-picker
+                    v-model="form.birthday"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="家庭住址:" >
+                <el-input type="textarea" rows="5" v-model="form.address" placeholder="请输入家庭住址"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="备注:" >
+                <el-input type="textarea"  rows="5" v-model="form.remarks" placeholder="请输入备注"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "edit",
+  props:["data","dataOld"],
+  data(){
+    var validateMobilePhone = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('手机号不可为空'));
+      } else {
+        if (value !== '') {
+          var reg=/^1[3456789]\d{9}$/;
+          if(!reg.test(value)){
+            callback(new Error('请输入有效的手机号码'));
+          }
+        }
+        callback();
+      }
+    };
+    return {
+      dialogFormVisible:false,
+      form:{},
+      rules:{
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur,change' },
+        ],
+        phonenumber: [
+          { required: true, validator: validateMobilePhone, trigger: 'blur' },
+        ]
+      }
+    }
+  },
+  methods:{
+    onshow(){
+      console.log(this.data)
+      this.dialogFormVisible = true
+      this.form = Object.assign({},this.form,this.data)
+    },
+    onSubmit(){
+      console.log(this.data)
+      this.form.sys_enterpriseid = this.dataOld.sys_enterpriseid
+      this.form.enterprisename = this.dataOld.enterprisename
+      console.log(this.form)
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": "20221018141802",
+          "content":this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit("insertSuccess")
+          this.$refs.form.resetFields()
+          this.form = {
+            "contactsid":0,
+            "name":"",
+            "sex":"0",
+            "depname":"",
+            "position":"",
+            "birthday":"",
+            "phonenumber":"",
+            "email":"",
+            "province":"",
+            "city":"",
+            "county":"",
+            "address":"",
+            "remarks":"",
+            "workaddress":0,
+            "sys_enterpriseid":'',
+            "enterprisename":''
+          }
+          this.dialogFormVisible = false
+        })
+      })
+    },
+    onClose(){
+      this.dialogFormVisible = false
+      this.$refs.form.resetFields()
+      this.form = {
+        "contactsid":0,
+        "name":"",
+        "sex":"0",
+        "depname":"",
+        "position":"",
+        "birthday":"",
+        "phonenumber":"",
+        "email":"",
+        "province":"",
+        "city":"",
+        "county":"",
+        "address":"",
+        "remarks":"",
+        "workaddress":0,
+        "sys_enterpriseid":'',
+        "enterprisename":''
+      }
+    }
+  },
+  mounted() {
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/siteManage/securityConfig/components/contacts/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div>
-      <add   class="inline-16" ></add>
+      <add   class="inline-16" :data="data" @insertSuccess="onSuccess"></add>
       <el-input
           placeholder="请输入搜索内容"
           suffix-icon="el-icon-search"
@@ -23,13 +23,23 @@
           <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
         </template>
         <template v-slot:opreation="scope">
+          <edit :dataOld="data" :data="scope.data" class="inline-16"></edit>
+          <el-popconfirm
+              confirm-button-text='确定'
+              cancel-button-text='取消'
+              icon="el-icon-info"
+              title="确定删除该联系人吗？"
+              @confirm="onDel(scope.data.contactsid)"
+          >
+            <el-button slot="reference" size="mini" type="text">删 除</el-button>
+          </el-popconfirm>
 <!--          <edit  :data="scope.data" class="inline-16" @editSuccess="onSuccess" :disabled="data.disabled"></edit>
           <delContact  :data="scope.data" @delSuccess="onSuccess" class="inline-16" :disabled="data.disabled"></delContact>-->
         </template>
       </tableLayout>
     </div>
     <div style="margin-top:16px;text-align:right">
-<!--      <el-pagination
+      <el-pagination
           background
           small
           @size-change="handleSizeChange"
@@ -38,16 +48,81 @@
           :page-size="params.content.pageSize"
           layout="total, prev, pager, next, jumper"
           :total="total">
-      </el-pagination>-->
+      </el-pagination>
     </div>
   </div>
 </template>
 
 <script>
 import add from './add'
+import edit from './edit'
 export default {
+  props:["data"],
   name: "index",
-  components:{add},
+  components:{add,edit},
+  data(){
+    return {
+      search:"",
+      tablecols:[],
+      list:[],
+      total:0,
+      currentPage:0,
+      params:{
+        "id": "20221022165503",
+        "content": {
+          "where":{
+            "condition":"",
+            "workaddress":0
+          }
+        }
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      this.params.content.where.condition = this.search
+      const res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.total = res.total
+    },
+    onSuccess(){
+      this.listData()
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+    queryClick(){
+      this.params.content.pageNumber = 1
+      this.listData()
+    },
+    clearData(){
+      this.search = ''
+      this.listData()
+    },
+    async onDel(id){
+      const res = await this.$api.requested({
+        "id": "20221018145502",
+        "content": {
+          "contactsid": id,
+          "sys_enterpriseid": this.data.sys_enterpriseid,
+          "deletereason":""
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.listData()
+      })
+    }
+  },
+  mounted() {
+    this.listData()
+  },
   created() {
     this.tablecols = this.tool.tabelCol(this.$route.name).contactsTable.tablecols
   }

src/HManagement/siteManage/securityConfig/components/financialInfo/add.vue

@@ -0,0 +1,122 @@
+<template>
+  <div>
+    <el-button type="primary" size="small" @click="drawer = true">新 建</el-button>
+    <el-drawer
+        title="新建"
+        :visible.sync="drawer"
+        direction="rtl"
+        append-to-body
+        :show-close="false"
+        size="700px">
+      <div class="drawer__panel">
+        <el-form :model="form" ref="form" :rules="rules" :status-icon="false"	 size="mini" label-position="right" label-width="100px" class="demo-form-inline">
+          <el-form-item label="开票抬头" prop="enterprisename">
+            <el-input v-model="form.enterprisename" placeholder="抬头"></el-input>
+          </el-form-item>
+          <el-form-item label="税号" prop="taxno">
+            <el-input v-model="form.taxno" placeholder="统一社会信用代码"></el-input>
+          </el-form-item>
+          <el-form-item label="开户银行" >
+            <el-input v-model="form.bank" placeholder="统一社会信用代码"></el-input>
+          </el-form-item>
+          <el-form-item label="开户账号" >
+            <el-input v-model="form.bankcardno" placeholder="开户账号"></el-input>
+          </el-form-item>
+          <el-form-item label="开票地址" >
+            <el-input v-model="form.address" placeholder="开票地址"></el-input>
+          </el-form-item>
+          <el-form-item label="电话" >
+            <el-input v-model="form.phonenumber" placeholder="手机号（电话）"></el-input>
+          </el-form-item>
+          <el-form-item label="备注" prop="remarks">
+            <el-input v-model="form.remarks" placeholder="备注"></el-input>
+          </el-form-item>
+          <el-form-item label="是否默认" prop="remarks">
+            <el-radio v-model="form.isdefault" label="1">是</el-radio>
+            <el-radio v-model="form.isdefault" label="0">否</el-radio>
+          </el-form-item>
+          <!--          <el-form-item>
+                      <el-button icon="el-icon-place" type="text">设置为默认地址</el-button>
+                    </el-form-item>-->
+        </el-form>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data'],
+  name: "add",
+  data () {
+    return {
+      drawer:false,
+      form:{
+        "sys_enterprise_financeid": 0,
+        "sys_enterpriseid": 0,
+        "enterprisename": "",
+        "taxno": "",
+        "bank": "",
+        "bankcardno": "",
+        "address": "",
+        "phonenumber": "",
+        "remarks": "",
+        "isdefault": '1',
+      },
+      rules:{
+        enterprisename: [
+          { required: true, message: '请输入抬头', trigger: 'blur' },
+        ],
+        address: [
+          { required: true, message: '请输入开票地址', trigger: 'blur' },
+        ],
+        taxno: [
+          { required: true, message: '请输入税号', trigger: 'blur' },
+        ],
+        bank: [
+          { required: true, message: '请输入开户行', trigger: 'blur' },
+        ],
+        bankcardno: [
+          { required: true, message: '请输入开户账号', trigger: 'blur' },
+        ],
+        phonenumber: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' },
+          { pattern:/^1[3-9][0-9]\d{8}$/, message: '请输入正确手机号码',trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  methods:{
+    onSubmit () {
+      console.log(this.form,"表单")
+      this.$refs['form'].validate(async (valid) => {
+        if (! valid) return false
+        const res = await this.$api.requested({
+          "id": 20221013160402,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          this.drawer = false
+          this.$refs['form'].resetFields()
+        })
+      });
+
+    }
+  },
+  mounted() {
+    console.log(this.data,"财务")
+    this.form.enterprisename = this.data.enterprisename
+    this.form.sys_enterpriseid = this.data.sys_enterpriseid
+    console.log(this.form)
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/siteManage/securityConfig/components/financialInfo/index.vue

@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <div class="normal-margin">
+      <add class="inline-16"  :data="data" @onSuccess="queryfinancialinfo"></add>
+      <el-input
+          placeholder="请输入搜索内容"
+          suffix-icon="el-icon-search"
+          v-model="search"
+          style="width:200px"
+          size="small"
+          class="input-with-select inline-16"
+          @keyup.native.enter="queryClick"
+          @clear="clearData"
+          clearable>
+      </el-input>
+    </div>
+
+    <el-table
+        :header-cell-style="{background:'#EEEEEE',color:'#333'}"
+        :data="tableData"
+        stripe
+        size="mini"
+        style="width: 100%"
+        border>
+
+      <el-table-column
+          prop="enterprisename"
+          label="开票抬头">
+      </el-table-column>
+      <el-table-column
+          prop="taxno"
+          label="税号">
+      </el-table-column>
+      <el-table-column
+          prop="bank"
+          label="开户银行">
+      </el-table-column>
+      <el-table-column
+          prop="bankcardno"
+          label="开户账号">
+      </el-table-column>
+      <el-table-column
+          prop="address"
+          label="开票地址">
+        <!--        <template slot-scope="scope">
+                  {{scope.row.address}}&nbsp;<i style="color:red" v-if="scope.row.isdefault === 1" class="el-icon-place"></i>
+                </template>-->
+      </el-table-column>
+      <el-table-column
+          prop="phonenumber"
+          label="电话">
+      </el-table-column>
+      <el-table-column
+          prop="isdefault"
+          label="是否默认">
+        <template slot-scope="scope">
+          <span>{{scope.row.isdefault === 1?'是':'否'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="remarks"
+          label="备注">
+      </el-table-column>
+      <el-table-column
+          label="操作"
+          width="100">
+        <template slot-scope="scope">
+
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="container normal-panel" style="text-align:right">
+      <el-pagination
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[20, 50, 100, 200]"
+          layout="total,sizes, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import add from './add'
+export default {
+  name: "index",
+  props:['data'],
+  data () {
+    return {
+      search:'',
+      tableData:[],
+      param:{
+        "id": 20221013160602,
+        "content": {
+          "sys_enterpriseid":0,
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          }
+        },
+      },
+      total:0,
+      currentPage:0
+    }
+  },
+  components:{
+    add
+  },
+  methods:{
+    async queryfinancialinfo () {
+      this.param.content.sys_enterpriseid = this.data.sys_enterpriseid
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.queryfinancialinfo()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.queryfinancialinfo()
+    },
+    async deleteRow (row) {
+      const res = await this.$api.requested({
+        "id": 20221013160502,
+        "content": {
+          "sys_enterprise_financeids": [row.sys_enterprise_financeid]
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.queryfinancialinfo()
+      })
+    },
+    clearData(){
+      this.search = ""
+    },
+    queryClick(){
+      this.params.content.where.condition = this.search
+      this.listData()
+    }
+  },
+  mounted () {
+    this.queryfinancialinfo()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/siteManage/securityConfig/modules/edit.vue

@@ -47,12 +47,16 @@
         </el-row>
       </template>
       <div slot="customOperation" >
-        <el-button type="warning" size="small">保存</el-button>
+        <el-button type="warning" size="small" @click="submit">保存</el-button>
       </div>
       <div slot="slot0" >
-        <contacts></contacts>
+        <contacts :data="form"></contacts>
       </div>
       <div slot="slot1" >
+        <addressManage :data="form"></addressManage>
+      </div>
+      <div slot="slot2" >
+        <financialInfo :data="form"></financialInfo>
       </div>
     </basicDetails>
   </div>
@@ -63,10 +67,14 @@ import {mapGetters} from 'vuex'
 
 import uploadFile from '../../../../components/upload/hw_obs_upload.vue'
 import contacts from '../components/contacts/index'
+import addressManage from '../components/addressManage/index'
+import financialInfo from '../components/financialInfo/index'
 export default {
   components:{
     uploadFile,
-    contacts
+    contacts,
+    addressManage,
+    financialInfo
   },
   computed:{
     ...mapGetters({
@@ -108,11 +116,11 @@ export default {
   },
   methods:{
     submit () {
+      console.log(this.form)
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false;
         const res = await this.$api.requested({
-          "classname": "webmanage.site.site",
-          "method": "updateSite",
+          "id": 20221022165303,
           "content": this.form
         })
         this.tool.showMessage(res,()=>{
@@ -127,7 +135,22 @@ export default {
         "content": {
         }
       })
-      this.form = Object.assign({},res.data,this.form)
+      console.log(res.data,"获取的数据")
+      /*this.form = Object.assign({},res.data,this.form)*/
+      this.form = {
+        "address": res.data.address,
+        "abbreviation": res.data.abbreviation,
+        "city": res.data.city,
+        "changeby": res.data.changeby,
+        "county": res.data.county,
+        "phonenumber": res.data.phonenumber,
+        "enterprisename": res.data.enterprisename,
+        "sys_enterpriseid":res.data.sys_enterpriseid,
+        "province": res.data.province,
+        "contact": res.data.contact,
+        "taxno": res.data.taxno
+      }
+      console.log(this.form,"表单信息")
     },
     async deleteFileLink (item) {
       console.log(this.$route.query.basicInfo)
@@ -153,7 +176,6 @@ export default {
         "classname": "webmanage.site.site",
         "content": {},
         "method": "querySite",
-       "systemappid": 21
       })
       this.show = true
     }

src/HManagement/task/index.vue

@@ -76,13 +76,17 @@ export default {
       type:1,
       statusList:[
         {
-          label:'已完成',
+          label:'待执行',
           value:1
         },
         {
           label:'进行中',
           value:2
-        }
+        },
+        {
+          label:'已完成',
+          value:3
+        },
       ],
       status:''
     }

src/SDrpManagement/salerPrivatecustomer/detail/modules/contacts/modules/add.vue

@@ -328,7 +328,27 @@ export default {
         this.tool.showMessage(res,()=>{
           this.$emit("insertSuccess")
           this.$refs['form'].resetFields()
-          this.form = {}
+          this.form = {
+            contactsid: 0,
+            sys_enterpriseid: "",
+            name: "",
+            sex: "",
+            depname: "",
+            position: "",
+            birthday: "",
+            phonenumber: "",
+            email: "",
+            address: "",
+            remarks: "",
+            enterprisename:'',
+            province: "",
+            city: "",
+            county: "",
+            workaddress: 0,
+            isdefault: 1,
+            isprimary: 1,
+            sys_phonebookid:''
+          }
           this.dialogFormVisible = false
         })
       })
@@ -409,7 +429,27 @@ export default {
     },
     onClose(){
       this.$refs['form'].resetFields()
-      this.form = {}
+      this.form = {
+        contactsid: 0,
+        sys_enterpriseid: "",
+        name: "",
+        sex: "",
+        depname: "",
+        position: "",
+        birthday: "",
+        phonenumber: "",
+        email: "",
+        address: "",
+        remarks: "",
+        enterprisename:'',
+        province: "",
+        city: "",
+        county: "",
+        workaddress: 0,
+        isdefault: 1,
+        isprimary: 1,
+        sys_phonebookid:''
+      }
       this.dialogFormVisible = false
     },
   }