暂存

src/Form/EnterpriseArchives/add.vue

@@ -61,6 +61,8 @@
                     :key="item.value"
                     :label="item.remarks"
                     :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>

src/Form/EnterpriseArchives/edit.vue

@@ -61,6 +61,8 @@
                     :key="item.value"
                     :label="item.remarks"
                     :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>

src/Form/marketing2/agent/add.vue

@@ -10,7 +10,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="企业名称:" prop="enterprisename">
-              <enterprise ref="ent" @rowClick="chooseEnterprise"></enterprise>
+              <enterprise ref="ent" @rowClick="chooseEnterprise" type="3"></enterprise>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/Form/projectChange/add.vue

@@ -67,7 +67,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目预算(万元):" prop="budgetary">
+              <el-form-item label="项目预算(元):" prop="budgetary">
                 <el-input v-model="form.budgetary" placeholder="项目预算"></el-input>
               </el-form-item>
             </el-col>
@@ -125,8 +125,8 @@
             </el-col>
 
             <el-col :span="24">
-              <el-form-item label="领域:" prop="tradefields">
-                <el-select v-model="form.tradefields[0]" placeholder="请选择领域">
+              <el-form-item label="领域:" prop="tradefield">
+                <el-select v-model="form.tradefield" placeholder="请选择领域">
                   <el-option
                       v-for="item in tradefieldSelect"
                       :key="item.value"
@@ -221,7 +221,7 @@ export default {
         begdate_due:'', //预计开工时间
         enddate_due:'',  //预计完工时间
         sa_brandid:"",
-        tradefields:[],
+        tradefield:"",
         value:[],
       },
       brandSelect:[],
@@ -246,11 +246,11 @@ export default {
         value:[
           { required: true, message: '请选择省市县', trigger: 'change'}
         ],
-        tradefields:[
+        tradefield:[
           { required: true, message: '请选择领域', trigger: 'change'}
         ],
         sa_brandid:[
-          { required: true, message: '请选择品牌', trigger: 'change'}
+          { required: false, message: '请选择品牌', trigger: 'change'}
         ],
         begdate_due:[
           { required: false, validator: begdateTime, trigger: 'change' }

src/Form/projectChange/edit.vue

@@ -68,7 +68,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目预算(万元):" prop="budgetary">
+              <el-form-item label="项目预算(元):" prop="budgetary">
                 <el-input v-model="form.budgetary" placeholder="项目预算"></el-input>
               </el-form-item>
             </el-col>
@@ -124,8 +124,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="领域:" prop="tradefields">
-                <el-select v-model="form.tradefields[0]" placeholder="请选择领域">
+              <el-form-item label="领域:" prop="tradefield">
+                <el-select v-model="form.tradefield" placeholder="请选择领域">
                   <el-option
                       v-for="item in tradefieldSelect"
                       :key="item.value"
@@ -224,7 +224,6 @@ export default {
         begdate_due:'', //预计开工时间
         enddate_due:'',  //预计完工时间
         sa_brandid:"",
-        tradefields:[],
         value:[],
         tradefield:''
       },
@@ -249,11 +248,11 @@ export default {
         province:[
           { required: true, message: '请选择省市县', trigger: 'change'}
         ],
-        tradefields:[
+        tradefield:[
           { required: true, message: '请选择领域', trigger: 'change'}
         ],
         sa_brandid:[
-          { required: true, message: '请选择品牌', trigger: 'change'}
+          { required: false, message: '请选择品牌', trigger: 'change'}
         ],
         begdate_due:[
           { required: false, validator: begdateTime, trigger: 'change' }

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="drawer=true">新 建</el-button>
-    <el-drawer title="创建商品组" :visible.sync="drawer" size="80%" direction="rtl" append-to-body @close="onCancel">
+    <el-drawer title="创建商品组" :visible.sync="drawer" size="80%" direction="rtl" append-to-body @close="onCancel" :show-close="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">

src/HDrpManagement/ProductGroupMag/modules/addGroupDetailBtn.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="small" :disabled="!!disabled" @click="editBtn">新增商品明细</el-button>
-    <el-drawer title="新增商品明细" :visible.sync="drawer" size="80%" direction="rtl" append-to-body>
+    <el-drawer title="新增商品明细" :visible.sync="drawer" size="80%" direction="rtl" append-to-body :show-close="false">
       <div class="drawer__panel">
           <el-row>
             <el-form label-position="right" ref="form" :rules="rules" inline label-width="100px" :model="form" size="small">

src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="editBtn">编 辑</el-button>
-    <el-drawer title="编辑商品组" :visible.sync="drawer" size="30%" direction="rtl" append-to-body>
+    <el-drawer title="编辑商品组" :visible.sync="drawer" size="30%" direction="rtl" append-to-body :show-close="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">

src/HDrpManagement/contractManage/modules/detail.vue

@@ -731,7 +731,7 @@ export default {
                   },
                   {
                     label:'领域',
-                    value:this.mainData.tradefields ? this.mainData.tradefields[0] : '--'
+                    value:this.mainData.tradefield ? this.mainData.tradefield : '--'
                   },
                   {
                     label:'品牌',
@@ -784,7 +784,7 @@ export default {
                   {label:'审核人',value:this.mainData.checkby},
                   {label:'审核时间',value:this.mainData.checkdate},
                  /* {label:'作废原因',value:this.mainData.leader[0].leadernum == 0?'0':this.mainData.leader[0].leadernum},*/
-                  {label:'转手次数',value:this.mainData.leader[0].leadernum == 0?'0':this.mainData.leader[0].leadernum}
+                  {label:'转手次数',value:this.mainData.leader?this.mainData.leader[0].leadernum:"--"}
                 ]
               }
              : this.detailInfo = {
@@ -836,7 +836,7 @@ export default {
                   },
                   {
                     label:'领域',
-                    value:this.mainData.tradefields ? this.mainData.tradefields[0] : '--'
+                    value:this.mainData.tradefield ? this.mainData.tradefield : '--'
                   },
                   {
                     label:'品牌',
@@ -890,7 +890,7 @@ export default {
                   {label:'提交时间',value:this.mainData.submitdate},
                   {label:'审核人',value:this.mainData.checkby},
                   {label:'审核时间',value:this.mainData.checkdate},
-                  {label:'转手次数',value:this.mainData.leader[0].leadernum == 0?'0':this.mainData.leader[0].leadernum}
+                  {label:'转手次数',value:this.mainData.leader?this.mainData.leader[0].leadernum:"--"}
                 ]
               }
                : this.mainData.type == '框架'
@@ -943,7 +943,7 @@ export default {
                   },
                   {
                     label:'领域',
-                    value:this.mainData.tradefields ? this.mainData.tradefields[0] : '--'
+                    value:this.mainData.tradefield ? this.mainData.tradefield : '--'
                   },
                   {
                     label:'品牌',
@@ -992,7 +992,7 @@ export default {
                   {label:'提交时间',value:this.mainData.submitdate},
                   {label:'审核人',value:this.mainData.checkby},
                   {label:'审核时间',value:this.mainData.checkdate},
-                  {label:'转手次数',value:this.mainData.leader[0].leadernum == 0?'0':this.mainData.leader[0].leadernum}
+                  {label:'转手次数',value:this.mainData.leader?this.mainData.leader[0].leadernum:"--"}
                 ]
               }
                : this.mainData.type == '工具借用'
@@ -1074,7 +1074,7 @@ export default {
                       {label:'提交时间',value:this.mainData.submitdate},
                       {label:'审核人',value:this.mainData.checkby},
                       {label:'审核时间',value:this.mainData.checkdate},
-                      {label:'转手次数',value:this.mainData.leader[0].leadernum == 0?'0':this.mainData.leader[0].leadernum}
+                      {label:'转手次数',value:this.mainData.leader?this.mainData.leader[0].leadernum:"--"}
                     ]
                   }
                    : this.detailInfo = {
@@ -1174,7 +1174,7 @@ export default {
                       {label:'提交时间',value:this.mainData.submitdate},
                       {label:'审核人',value:this.mainData.checkby},
                       {label:'审核时间',value:this.mainData.checkdate},
-                      {label:'转手次数',value:this.mainData.leader[0].leadernum == 0?'0':this.mainData.leader[0].leadernum}
+                      {label:'转手次数',value:this.mainData.leader?this.mainData.leader[0].leadernum:"--"}
                     ]
                   }
 

src/HDrpManagement/orderManage/details/tabs/erpHistory.vue

@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column
         prop="address"
-        label="类型">
+        label="类型"> 
       </el-table-column>
     </el-table>
     <div class="container normal-panel" style="text-align:right">

src/HDrpManagement/projectChange/index.vue

@@ -67,7 +67,7 @@
         </div>
         <div class="mt-10">
           <label  class="search__label">领域:</label>
-          <el-select class="inline-24" v-model="selectParam.tradefields" placeholder="请选择领域" @change="selectChange" size="small" clearable>
+          <el-select class="inline-24" v-model="selectParam.tradefield" placeholder="请选择领域" @change="selectChange" size="small" clearable>
             <el-option
                 v-for="item in tradefieldSelect"
                 :key="item.value"
@@ -135,10 +135,6 @@
         <div v-else-if="scope.data.column.columnname === 'name'">
           {{scope.data.column.data.leader[0] && scope.data.column.data.leader[0].name}}
         </div>
-        <div v-else-if="scope.data.column.columnname === 'tradefields'">
-
-          {{scope.data.column.data.tradefields?scope.data.column.data.tradefields[0]:'--'}}
-        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
@@ -204,7 +200,7 @@ export default {
         enddate:'',
         stagename:'',
         brandname:"",
-        tradefields:"",
+        tradefield:"",
       },
     }
   },

src/HDrpManagement/projectChange/modules/detail.vue

@@ -318,7 +318,7 @@ export default {
           /*{label:'项目地址',value:this.mainData.address},*/
           {label:'项目地址',value:`${this.mainData.province} - ${this.mainData.city} - ${this.mainData.county} - ${this.mainData.address}`},
           {label:'项目规模',value:this.mainData.scale ? this.mainData.scale : '--'},
-          {label:'项目预算(万元)',value:this.mainData.budgetary ? this.mainData.budgetary : '--'},
+          {label:'项目预算(元)',value:this.mainData.budgetary ? this.mainData.budgetary : '--'},
           {label:'总投资额(百万)',value:this.mainData.totalinvestment ? this.mainData.totalinvestment : '--'},
           {label:'造价(百万)',value:this.mainData.costofconstruction ? this.mainData.costofconstruction : '--'},
           {label:'预计开工时间',value:this.mainData.begdate_due ? this.mainData.begdate_due : '--'},
@@ -327,7 +327,7 @@ export default {
           {label:'预计签约时间',value:this.mainData.signdate_due ? this.mainData.signdate_due : '--'},
           {label:'预计签约金额(元)',value:this.mainData.signamount_due ? this.mainData.signamount_due : '--'},
           {label:'赢率',value:this.mainData.winrate ? this.mainData.winrate : '--'},
-          {label:'领域',value:this.mainData.tradefields ? this.mainData.tradefields[0] : '--'},
+          {label:'领域',value:this.mainData.tradefield ? this.mainData.tradefield : '--'},
           {label:'品牌',value:this.mainData.brandname ? this.mainData.brandname : '--'},
           // {label:'项目等级',value:this.projectLead.find(item => item.rowindex == this.mainData.grade).value},
 

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -8,7 +8,7 @@
         :mainAreaData="mainAreaData"
         :turnPageId="20221011133602"
         idname="sa_customersid"
-        :tabs="['详细信息','联系人信息','客户地址']"
+        :tabs="['详细信息','联系人信息','客户地址','银行卡信息']"
         @pageChange="pageChange"
         @onEditSuccess="onEditSuccess">
       <div slot="tags">
@@ -38,6 +38,9 @@
       <div slot="slot2">
         <address_manage :data="mainData"></address_manage>
       </div>
+      <div slot="slot3" >
+        <bankCard :data="mainData" ></bankCard>
+      </div>
       <!-- <div slot="slot0" class="container normal-panel">
         <el-button size="small" type="primary" @click="createAgentAccount" class="normal-margin">创建经销商主账号</el-button>
         <tableLayout :layout="tablecols" :data="mainData.hrs" :custom="false" height="300px"></tableLayout>
@@ -62,6 +65,7 @@ import address_manage from './detail/addressManage/list'
 import receive from './detail/operation/receive'
 import distribution from './detail/operation/distribution'
 import to_void from './detail/operation/toVoid'
+import bankCard from './detail/bankCard/index'
 export default {
   data () {
     return {
@@ -86,7 +90,7 @@ export default {
     }
   },
   components:{
-    detailed,contacts,address_manage,receive,distribution,to_void
+    detailed,contacts,address_manage,receive,distribution,to_void,bankCard
   },
   methods:{
     /* 获取系统选项数据 */

src/HDrpManagement/publicCustomer/modules/detail/bankCard/add.vue

@@ -0,0 +1,100 @@
+<template>
+  <div>
+    <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="85px">
+            <el-col :span="24">
+              <el-form-item  label="银行名称:" prop="bank">
+                <el-input  v-model="form.bank" placeholder="请输入银行名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="卡号:" prop="bankcardno">
+                <el-input   v-model="form.bankcardno" placeholder="请输入卡号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="开户人:" prop="name">
+                <el-input   v-model="form.name" placeholder="请输入开户人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="手机号码:" prop="phonenumber">
+                <el-input   v-model="form.phonenumber" 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",
+  props:["data"],
+  data(){
+    return {
+      dialogFormVisible:false,
+      form:{
+        "sys_enterprise_bankid": 0,
+        "bank": "",
+        "bankcardno": "",
+        "name": "",
+        "phonenumber": "",
+        "sys_enterpriseid":1//不传，插入当前账号
+      },
+      rules:{
+        bank: [
+          { required: true, message: '银行名称不能为空', trigger: 'blur' },
+        ],
+        bankcardno: [
+          { required: true, message: '卡号不嫩为空', trigger: 'blur' },
+        ],
+        name: [
+          { required: true, message: '开户人不能为空', trigger: 'blur' },
+        ],
+      },
+    }
+  },
+  methods:{
+    onClose(){
+      this.dialogFormVisible = false
+      this.$refs.form.resetFields()
+    },
+    onSubmit(){
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        this.form.sys_enterpriseid = this.data.sys_enterpriseid
+        const res = await this.$api.requested({
+          "id": 20221022165703,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.dialogFormVisible = false
+          this.$refs.form.resetFields()
+          this.$emit('addSuccess')
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/publicCustomer/modules/detail/bankCard/edit.vue

@@ -0,0 +1,104 @@
+<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="85px">
+            <el-col :span="24">
+              <el-form-item  label="银行名称:" prop="bank">
+                <el-input  v-model="form.bank" placeholder="请输入银行名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="卡号:" prop="bankcardno">
+                <el-input   v-model="form.bankcardno" placeholder="请输入卡号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="开户人:" prop="name">
+                <el-input   v-model="form.name" placeholder="请输入开户人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="手机号码:" prop="phonenumber">
+                <el-input   v-model="form.phonenumber" 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"],
+  data(){
+    return {
+      dialogFormVisible:false,
+      form:{
+        "sys_enterprise_bankid": 0,
+        "bank": "",
+        "bankcardno": "",
+        "name": "",
+        "phonenumber": "",
+        "sys_enterpriseid":1//不传，插入当前账号
+      },
+      rules:{
+        bank: [
+          { required: true, message: '银行名称不能为空', trigger: 'blur' },
+        ],
+        bankcardno: [
+          { required: true, message: '卡号不嫩为空', trigger: 'blur' },
+        ],
+        name: [
+          { required: true, message: '开户人不能为空', trigger: 'blur' },
+        ],
+      },
+    }
+  },
+  methods:{
+    onShow(){
+      this.dialogFormVisible = true
+      this.form = Object.assign({},this.form,this.data)
+    },
+    onClose(){
+      this.dialogFormVisible = false
+      this.$refs.form.resetFields()
+    },
+    onSubmit(){
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        this.form.sys_enterpriseid = this.data.sys_enterpriseid
+        const res = await this.$api.requested({
+          "id": 20221022165703,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.dialogFormVisible = false
+          this.$refs.form.resetFields()
+          this.$emit('updateSuccess')
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/publicCustomer/modules/detail/bankCard/index.vue

@@ -0,0 +1,111 @@
+<template>
+  <div>
+    <div class="flex-align-center normal-margin">
+      <add class="inline-16" :data="data"  v-if="tool.checkAuth($route.name,'bankCardInfor')" @addSuccess="listData"></add>
+      <el-input  style="width:200px;" placeholder="搜索"
+                 :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'"
+                 v-model="param.content.where.condition"
+                 @keyup.native.enter="listData(param.content.pageNumber = 1)"
+                 @clear="listData(param.content.pageNumber = 1)" size="small"
+                 class="input-with-select inline-16 layout_search__panel" clearable>
+      </el-input>
+    </div>
+    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" fixedName="operation">
+      <template v-slot:customcol="scope">
+        <p >{{scope.column.data[scope.column.columnname]}}</p>
+      </template>
+      <template v-slot:opreation="scope">
+        <edit class="inline-16" :data="scope.data" @updateSuccess="listData" :disable="data.disabled"></edit>
+        <el-popconfirm
+            title="确定删除该银行卡信息吗？"
+            @confirm="onDel(scope.data)"
+        >
+          <el-button slot="reference" size="mini" type="text">删 除</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="param.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"],
+  components:{add,edit},
+  data(){
+    return {
+      tableHieght:"600px",
+      tablecols:[],
+      list:[],
+      total:0,
+      currentPage:0,
+      param:{
+        "id": 20221022165803,
+        "content": {
+          "pageNumber":1,
+          "pageSize":20,
+          "sys_enterpriseid":"1",//不传，查当前账号
+          "where":{
+            "condition":""
+          }
+
+        }
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      this.param.content.sys_enterpriseid = this.data.sys_enterpriseid
+      const res = await this.$api.requested(this.param)
+      this.list = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    async onDel(row){
+      const res = await this.$api.requested({
+        "id": 20221022165903,
+        "content": {
+          "sys_enterprise_bankids":[row.sys_enterprise_bankid]
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.listData()
+      })
+    }
+  },
+  mounted() {
+    this.listData()
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).bankInfoTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/workBillModule/components/add.vue

@@ -15,9 +15,7 @@
           <el-col :span="24">
             <el-form-item label="模板类型" prop="type">
               <el-select v-model="form.type">
-                <el-option label="服务" value="服务"></el-option>
-                <el-option label="安装调试" value="安装调试"></el-option>
-                <el-option label="安装培训" value="安装培训"></el-option>
+                <el-option v-for="(item,index) in serveTypeList" :key="index" :label="item.value" :value="item.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -37,6 +35,7 @@ export default {
   data(){
     return {
       dialogFormVisible:false,
+      serveTypeList:[],
       form:{
         "sa_workorder_templateid":0,     //sa_brandid<=0时 为新增
         "name":"",
@@ -68,7 +67,16 @@ export default {
           this.dialogFormVisible = false
         })
       })
+    },
+    async getServeType () {
+      const res = await this.$store.dispatch('optiontypeselect','serviceworktype')
+      this.serveTypeList = res.data
+      console.log(this.serveTypeList);
+      
     }
+  },
+  created () {
+    this.getServeType()
   }
 }
 </script>

src/HDrpManagement/workBillModule/components/edit.vue

@@ -15,9 +15,7 @@
           <el-col :span="24">
             <el-form-item label="模板类型" prop="type">
               <el-select v-model="form.type">
-                <el-option label="服务" value="服务"></el-option>
-                <el-option label="安装调试" value="安装调试"></el-option>
-                <el-option label="安装培训" value="安装培训"></el-option>
+                <el-option v-for="(item,index) in serveTypeList" :key="index" :label="item.value" :value="item.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -38,6 +36,7 @@ export default {
   data(){
     return {
       dialogFormVisible:false,
+      serveTypeList:[],
       form:{
         "sa_workorder_templateid":0,     //sa_brandid<=0时 为新增
         "name":"培训工单",
@@ -53,6 +52,9 @@ export default {
       }
     }
   },
+  created () {
+    this.getServeType()
+  },
   methods:{
     editBtn () {
       this.dialogFormVisible = true
@@ -73,6 +75,11 @@ export default {
           this.dialogFormVisible = false
         })
       })
+    },
+    async getServeType () {
+      const res = await this.$store.dispatch('optiontypeselect','serviceworktype')
+      this.serveTypeList = res.data
+      console.log(this.serveTypeList);
     }
   }
 }

src/HManagement/EnterpriseArchives/index.vue

@@ -15,7 +15,8 @@
       <template v-slot:tbList="scope">
         <div>
           <p v-if="scope.data.column.columnname === 'province'">
-            {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`}}
+<!--            {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`}}-->
+            {{`${scope.data.column.data.province}` || '--'}}
           </p>
           <p v-else-if="scope.data.column.columnname === 'invoicingpoint'">
             {{scope.data.column.data.invoicingpoint == 1 ? '订单审核' : '发货'}}

src/HManagement/salesForecastTemplate/modules/add.vue

@@ -267,6 +267,7 @@ export default {
       this.$refs['form'].validate(async (valid) => {})
     },
     onClose () {
+      this.dialogFormVisible = false
       this.form = {
         sa_salesforecastmodelid:0,
         title:'',

src/SDrpManagement/QuotedPrice/detail/modules/detailed/index.vue

@@ -20,7 +20,7 @@
         <el-descriptions-item label="有效期">{{ basic.begdate?basic.begdate + '至' + basic.enddate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="总金额">{{ basic.remarks?basic.remarks:"--" }}</el-descriptions-item>
         <el-descriptions-item label="品牌">{{ basic.brandname?basic.brandname:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="领域">{{ basic.tradefields?basic.tradefields[0]:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="领域">{{ basic.tradefield?basic.tradefield:"--" }}</el-descriptions-item>
 
         <el-descriptions-item label="是否特价">{{ basic.specialoffer === 1?'是':'否' }}</el-descriptions-item>
         <el-descriptions-item label="状态" >

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -9,7 +9,7 @@
         turnPageId="20221012164402"
         idname="sa_customersid"
         tags=""
-        :tabs="['详细信息','联系人信息','客户地址','开票信息','项目商机','报价单','关联合同','账户余额','线索']"
+        :tabs="['详细信息','联系人信息','客户地址','开票信息','项目商机','报价单','关联合同','账户余额','银行卡信息','线索']"
         @pageChange="pageChange"
         @onEditSuccess="onEditSuccess">
       <div slot="tags">
@@ -50,6 +50,9 @@
         <accountMoney :data="mainData"  v-if="flag"></accountMoney>
       </div>
       <div slot="slot8" class="normal-panel">
+        <bankCard :data="mainData" v-if="flag"></bankCard>
+      </div>
+      <div slot="slot9" class="normal-panel">
         <followLeads :data="mainData"  v-if="flag"></followLeads>
       </div>
     </basicDetails>
@@ -76,6 +79,7 @@ import followLeads from './modules/followLeads/index'
 import toBack from "@/SDrpManagement/salerPrivatecustomer/detail/modules/operation/toBack";
 import contract from './modules/contract/index'
 import accountMoney from './modules/accountMoney/index'
+import bankCard from './modules/bankCard/index'
 export default {
   name: "detail",
   data() {
@@ -117,7 +121,8 @@ export default {
     statusChange,
     toBack,
     contract,
-    accountMoney
+    accountMoney,
+    bankCard
   },
   watch:{
     mainData(val) {

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

@@ -0,0 +1,100 @@
+<template>
+  <div>
+    <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="85px">
+            <el-col :span="24">
+              <el-form-item  label="银行名称:" prop="bank">
+                <el-input  v-model="form.bank" placeholder="请输入银行名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="卡号:" prop="bankcardno">
+                <el-input   v-model="form.bankcardno" placeholder="请输入卡号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="开户人:" prop="name">
+                <el-input   v-model="form.name" placeholder="请输入开户人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="手机号码:" prop="phonenumber">
+                <el-input   v-model="form.phonenumber" 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",
+  props:["data"],
+  data(){
+    return {
+      dialogFormVisible:false,
+      form:{
+        "sys_enterprise_bankid": 0,
+        "bank": "",
+        "bankcardno": "",
+        "name": "",
+        "phonenumber": "",
+        "sys_enterpriseid":1//不传，插入当前账号
+      },
+      rules:{
+        bank: [
+          { required: true, message: '银行名称不能为空', trigger: 'blur' },
+        ],
+        bankcardno: [
+          { required: true, message: '卡号不嫩为空', trigger: 'blur' },
+        ],
+        name: [
+          { required: true, message: '开户人不能为空', trigger: 'blur' },
+        ],
+      },
+    }
+  },
+  methods:{
+    onClose(){
+      this.dialogFormVisible = false
+      this.$refs.form.resetFields()
+    },
+    onSubmit(){
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        this.form.sys_enterpriseid = this.data.sys_enterpriseid
+        const res = await this.$api.requested({
+          "id": 20221022165703,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.dialogFormVisible = false
+          this.$refs.form.resetFields()
+          this.$emit('addSuccess')
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/SDrpManagement/salerPrivatecustomer/detail/modules/bankCard/edit.vue

@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <el-button size="mini" type="text" @click="onShow" :disabled="!tool.checkAuth($route.name,'bankCardInfor') || !data.disabled">编 辑</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="85px">
+            <el-col :span="24">
+              <el-form-item  label="银行名称:" prop="bank">
+                <el-input  v-model="form.bank" placeholder="请输入银行名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="卡号:" prop="bankcardno">
+                <el-input   v-model="form.bankcardno" placeholder="请输入卡号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="开户人:" prop="name">
+                <el-input   v-model="form.name" placeholder="请输入开户人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="手机号码:" prop="phonenumber">
+                <el-input   v-model="form.phonenumber" 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","disable"],
+  data(){
+    return {
+      dialogFormVisible:false,
+      form:{
+        "sys_enterprise_bankid": 0,
+        "bank": "",
+        "bankcardno": "",
+        "name": "",
+        "phonenumber": "",
+        "sys_enterpriseid":1//不传，插入当前账号
+      },
+      rules:{
+        bank: [
+          { required: true, message: '银行名称不能为空', trigger: 'blur' },
+        ],
+        bankcardno: [
+          { required: true, message: '卡号不嫩为空', trigger: 'blur' },
+        ],
+        name: [
+          { required: true, message: '开户人不能为空', trigger: 'blur' },
+        ],
+      },
+    }
+  },
+  methods:{
+    onShow(){
+      this.dialogFormVisible = true
+      this.form = Object.assign({},this.form,this.data)
+    },
+    onClose(){
+      this.dialogFormVisible = false
+      this.$refs.form.resetFields()
+    },
+    onSubmit(){
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        this.form.sys_enterpriseid = this.data.sys_enterpriseid
+        const res = await this.$api.requested({
+          "id": 20221022165703,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.dialogFormVisible = false
+          this.$refs.form.resetFields()
+          this.$emit('updateSuccess')
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/SDrpManagement/salerPrivatecustomer/detail/modules/bankCard/index.vue

@@ -1,39 +1,27 @@
 <template>
-<!--  <div>
-
+  <div>
     <div class="flex-align-center normal-margin">
-      <add class="inline-16" :data="data" @insertSuccess="onSuccess" v-if="tool.checkAuth($route.name,'customerAddressManage') && data.disabled"></add>
-      <el-input
-          style="width:300px"
-          placeholder="请输入内容"
-          v-model="search"
-          clearable
-          @clear="clearData()"
-          size="small"
-          @keyup.enter.native="queryClick()">
-        <i slot="prefix" class="el-icon-search" @click="queryClick()"></i>
+      <add class="inline-16" :data="data"  v-if="tool.checkAuth($route.name,'bankCardInfor') && data.disabled" @addSuccess="listData"></add>
+      <el-input  style="width:200px;" placeholder="搜索"
+                 :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'"
+                 v-model="param.content.where.condition"
+                 @keyup.native.enter="listData(param.content.pageNumber = 1)"
+                 @clear="listData(param.content.pageNumber = 1)" size="small"
+                 class="input-with-select inline-16 layout_search__panel" 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>
+        <p >{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
-        <edit  :data="scope.data" @updateSuccess="onSuccess" :disable="data.disabled"></edit>
-        <toVoid  :data="scope.data" @toVoidSuccess="onSuccess" :disable="data.disabled"></toVoid>
+        <edit class="inline-16" :data="scope.data" @updateSuccess="listData" :disable="data.disabled"></edit>
+        <el-popconfirm
+            title="确定删除该银行卡信息吗？"
+            @confirm="onDel(scope.data)"
+        >
+          <el-button slot="reference" size="mini" type="text" :disabled="!tool.checkAuth($route.name,'bankCardInfor') || !data.disabled">删 除</el-button>
+        </el-popconfirm>
       </template>
     </tableLayout>
     <div style="margin-top:16px;text-align:right">
@@ -43,18 +31,21 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="currentPage"
-          :page-size="params.content.pageSize"
+          :page-size="param.content.pageSize"
           layout="total, prev, pager, next, jumper"
           :total="total">
       </el-pagination>
     </div>
-  </div>-->
+  </div>
 </template>
 
 <script>
+import add from './add'
+import edit from './edit'
 export default {
   name: "index",
   props:["data"],
+  components:{add,edit},
   data(){
     return {
       tableHieght:"600px",
@@ -62,33 +53,55 @@ export default {
       list:[],
       total:0,
       currentPage:0,
-      params:{
+      param:{
         "id": 20221022165803,
         "content": {
+          "pageNumber":1,
+          "pageSize":20,
           "sys_enterpriseid":"1",//不传，查当前账号
-          "condition":""
+          "where":{
+            "condition":""
+          }
+
         }
       }
     }
   },
   methods:{
     async listData(){
-      this.params.content.sys_enterpriseid = this.data.sys_enterpriseid
-      const res = await this.$api.requested(this.params)
+      this.param.content.sys_enterpriseid = this.data.sys_enterpriseid
+      const res = await this.$api.requested(this.param)
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
-      this.params.content.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.params.content.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
+    async onDel(row){
+      const res = await this.$api.requested({
+        "id": 20221022165903,
+        "content": {
+          "sys_enterprise_bankids":[row.sys_enterprise_bankid]
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.listData()
+      })
+    }
+  },
+  mounted() {
+    this.listData()
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).bankInfoTable.tablecols
   }
 }
 </script>

src/template/orderCanUseContract/index.vue

@@ -34,11 +34,11 @@
         label="项目名称"
         width="180">
       </el-table-column>
-      <el-table-column
+<!--      <el-table-column
         prop="type"
         label="项目类型"
         width="100">
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column
         label="操作">
         <template slot-scope="scope">

src/template/toolBorrowingCanUseContract/index.vue

@@ -16,21 +16,21 @@
         label="合同标题"
         width="180">
       </el-table-column>
-<!--      <el-table-column
+      <el-table-column
         prop="enterprisename"
-        label="企业信息"
+        label="企业名称"
         width="180">
       </el-table-column>
-      <el-table-column
+<!--      <el-table-column
         prop="projectname"
         label="项目名称"
         width="180">
       </el-table-column>-->
-      <el-table-column
+<!--      <el-table-column
         prop="type"
         label="项目类型"
         width="100">
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column
         label="操作">
         <template slot-scope="scope">