商品组管理，新增批量上架、批量下架功能，订单管理、订货业务、订货订单编辑详情调整

src/HDrpManagement/orderManage/details/index.vue

@@ -348,9 +348,13 @@ export default {
           value:this.$t(this.mainData.freightstatus)
         },
         {
-          label:'备注',
+          label:'对外备注',
           value:this.mainData.remarks
         },
+        {
+          label:'对内备注',
+          value:this.mainData.remarks_in
+        },
         /*{
           label:'返利金使用比例(%)',
           value:this.mainData.rebate_userate
@@ -485,9 +489,13 @@ export default {
           value:this.$t(this.mainData.freightstatus)
         },
         {
-          label:'备注',
+          label:'对外备注',
           value:this.mainData.remarks
         },
+        {
+          label:'对内备注',
+          value:this.mainData.remarks_in
+        },
         /*{
           label:'返利金使用比例(%)',
           value:this.mainData.rebate_userate
@@ -618,9 +626,13 @@ export default {
           value:this.$t(this.mainData.freightstatus)
         },
         {
-          label:'备注',
+          label:'对外备注',
           value:this.mainData.remarks
         },
+        {
+          label:'对内备注',
+          value:this.mainData.remarks_in
+        },
         /*{
           label:'返利金使用比例(%)',
           value:this.mainData.rebate_userate
@@ -747,9 +759,13 @@ export default {
           value:this.$t(this.mainData.freightstatus)
         },
         {
-          label:'备注',
+          label:'对外备注',
           value:this.mainData.remarks
         },
+        {
+          label:'对内备注',
+          value:this.mainData.remarks_in
+        },
         /*{
           label:'返利金使用比例(%)',
           value:this.mainData.rebate_userate
@@ -834,26 +850,30 @@ export default {
     },
     // 提交审核订单
     onSubmit (type) {
-      if (type == '提交' && (this.siteid == 'HY' || this.siteid == 'YOSTEST1')){
-        this.$refs.dialogRef.dialogVisible = true
-        this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays ? this.mainData.contract_reminddays : 7
+      if (type == '提交' && this.tool.checkAuth(this.$route.name,'relatedProject') && this.mainData.projectname == '' && this.mainData.type == '标准订单'){
+        this.$message.error('关联项目为空，不可提交，请前往编辑');
       }else {
-        this.$confirm(`${this.$t(`是否`)} ${this.$t(type)} ${this.$t(`该订单`)}`, this.$t('提示'), {
-          confirmButtonText: this.$t('确定'),
-          cancelButtonText: this.$t('取消'),
-          type: 'warning'
-        }).then(async () => {
-          if (this.tabNow != 'tab0' || this.$refs.prod.time == null){
-            this.onSubmitRe(type)
-          }else {
-            this.typeNew = type
-          }
-        }).catch((err) => {
-          this.$message({
-            type: 'info',
-            message: this.$t('已取消')
+        if (type == '提交' && (this.siteid == 'HY' || this.siteid == 'YOSTEST1')){
+          this.$refs.dialogRef.dialogVisible = true
+          this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays ? this.mainData.contract_reminddays : 7
+        }else {
+          this.$confirm(`${this.$t(`是否`)} ${this.$t(type)} ${this.$t(`该订单`)}`, this.$t('提示'), {
+            confirmButtonText: this.$t('确定'),
+            cancelButtonText: this.$t('取消'),
+            type: 'warning'
+          }).then(async () => {
+            if (this.tabNow != 'tab0' || this.$refs.prod.time == null){
+              this.onSubmitRe(type)
+            }else {
+              this.typeNew = type
+            }
+          }).catch((err) => {
+            this.$message({
+              type: 'info',
+              message: this.$t('已取消')
+            });
           });
-        });
+        }
       }
     },
     async onSubmitRe(type){

src/HDrpManagement/orderManage/modules/edit.vue

@@ -263,9 +263,17 @@
             <el-radio label="扫描件" :style="{marginTop:windowWidth>1314?0:'10px'}">{{$t(`扫描件`)}}</el-radio>
           </el-radio-group>
         </div>
-        <div style="margin-left:20px">
+        <div class="inline-16" v-if="tool.checkAuth($route.name,'relatedProject') && data.type == '标准订单'">
+          <div :style="{marginTop:projectError?'20px':''}">
+            <small class="inline-16"><span style="color:red;">*</span><b>{{$t(`关联项目`)}}:</b>&nbsp;</small>
+            <popoverTemp class="inline-16" :tablecols="tablecols" :isButton="false" :params="paramsProject" :isRest="true"
+                         placeholder="选择关联项目" @rowClick="rowClick" :inputData="projectname"></popoverTemp>
+          </div>
+          <div v-if="projectError" style="color:red;font-size: 12px;margin-left: 90px;">{{projectError}}</div>
+        </div>
+        <div class="inline-16">
           <small><b>{{$t(`销售类别`)}}:</b>&nbsp;</small>
-          <el-select v-model="saletype" size="small" :placeholder="$t('请选择')" :style="{marginTop:windowWidth>1514?0:'10px'}">
+          <el-select class="inline-16" v-model="saletype" size="small" :placeholder="$t('请选择')" :style="{marginTop:windowWidth>1514?0:'10px'}">
             <el-option
               v-for="item in saleroptions"
               :key="item.value"
@@ -274,7 +282,7 @@
             </el-option>
           </el-select>
         </div>
-        <div style="margin-left:20px">
+        <div class="inline-16">
           <small><b>{{$t(`单据日期`)}}:</b>&nbsp;</small>
           <el-date-picker
             :style="{marginTop:windowWidth>1514?0:'10px'}"
@@ -285,7 +293,7 @@
             :placeholder="$t('选择日期')">
           </el-date-picker>
         </div>
-        <div style="margin-left:20px" v-if="siteId=='HY' && (data.type =='标准订单' || data.type =='项目订单')">
+        <div class="inline-16" v-if="siteId=='HY' && (data.type =='标准订单' || data.type =='项目订单')">
           <small><b>{{$t(`是否样品订单`)}}:</b>&nbsp;</small>
           <el-radio-group v-model="data.typemx">
             <el-radio label="样品">{{$t('是')}}</el-radio>
@@ -294,8 +302,12 @@
         </div>
       </div>
       <div class="normal-margin">
-        <p class="normal-title mt-10 inline-16">{{$t(`订单备注`)}}</p>
-        <el-input size="mini" class="order__note__input" type="textarea" v-model="defaultData.remarks" :autosize="{minRows:5}" :placeholder="$t(`请输入订单备注`)"></el-input>
+        <p class="normal-title mt-10 inline-16">{{$t(`对外备注`)}}</p>
+        <el-input size="mini" class="order__note__input" type="textarea" v-model="defaultData.remarks" :autosize="{minRows:5}" :placeholder="$t(`请输入对外备注`)"></el-input>
+      </div>
+      <div class="normal-margin">
+        <p class="normal-title mt-10 inline-16">{{$t(`对内备注`)}}</p>
+        <el-input size="mini" class="order__note__input" type="textarea" v-model="defaultData.remarks_in" :autosize="{minRows:5}" :placeholder="$t(`请输入对内备注`)"></el-input>
       </div>
       <div class="normal-margin" v-if="data.type === '标准订单' || data.type === '特殊订单'">
         <p class="normal-title mt-10 inline-16">{{$t(`项目备注`)}}</p>
@@ -401,7 +413,8 @@ export default {
         accountclass:{},
         account_index:0,
         remarks:this.data.remarks,
-        freightstatus:''
+        freightstatus:'',
+        remarks_in:''
       },
       total:0,
       setcol:24,
@@ -438,6 +451,21 @@ export default {
       addresstotal:0,
       enterpriseTotal:0,
       windowWidth: document.documentElement.clientWidth,  //实时屏幕宽度
+      tablecols:'',
+      paramsProject:{
+        "content": {
+          "sys_enterpriseid": '',
+          "pageNumber": 1,
+          "pageSize": 100,
+          "where": {
+            "condition": ""
+          }
+        },
+        "id": 2026011416113702,
+      },
+      projectname:'',
+      sa_projectid:'',
+      projectError:''
     }
   },
   mounted () {
@@ -454,6 +482,7 @@ export default {
   },
   created () {
     this.queryBasicInfo()
+    this.tablecols = this.tool.tabelCol(this.$route.name)['projectSelectTable'].tablecols
   },
   methods:{
     enterprisePageChange (n) {
@@ -536,6 +565,10 @@ export default {
 
     // 设置默认信息
     async setDefaultData () {
+      this.projectError = ''
+      this.paramsProject.content.sys_enterpriseid = this.data.sys_enterpriseid
+      this.sa_projectid = ''
+      this.projectname = ''
       this.defaultData.freightstatus = this.data.freightstatus
       this.defaultData.rebatebalance = this.data.rebatebalance
       this.defaultData.finance = this.data.finance
@@ -548,46 +581,97 @@ export default {
       this.saler_name = this.data.saler_name
       this.billdate = this.data.billdate
       this.selectEnterpriseInfo = this.data.contactsEnterprise
+      this.defaultData.remarks = this.data.remarks
+      this.defaultData.remarks_in = this.data.remarks_in
     },
 
     async onSubmit() {
-      const res = await this.$api.requested({
-        "id": 20221108111402,
-        "content": {
-          "sa_orderid": this.$route.query.id,
-          "sys_enterpriseid": this.data.sys_enterpriseid, //订货企业id
-          "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
-          "sa_brandid": this.data.sa_brandid, //品牌ID
-          "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
-          "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
-          "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
-          "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
-          "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
-          "type": this.data.type, //订单类型
-          "typemx":this.data.typemx, //明细分类，可选
-          "remarks": this.defaultData.remarks, //可选
-          "saler_hrid":this.data.saler_hrid,//销售人员hrid,业务员hrid
-          "signbackstatus":this.signbackstatus,
-          "tradefieldmx":this.data.tradefieldmx,
-          "pay_enterpriseid":this.data.pay_enterpriseid,
-          "tradefield":this.data.tradefield,
-          "saletype":this.saletype,
-          "rebate_used":this.checked,//默认0，是否使用返利金
-          "signbacknum":'',
-          "sa_promotionid":this.data.sa_promotionid,
-          "billdate":this.billdate,
-          "projectnote":this.data.projectnote,
-          "freightstatus":this.defaultData.freightstatus
-        },
-      })
-      this.tool.showMessage(res,()=>{
-        this.$emit('onSuccess')
-        /*if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
-          this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
-        }*/
+      console.log(this.data.type,this.sa_projectid)
+      if (this.sa_projectid == '' && this.tool.checkAuth(this.$route.name,'relatedProject') && this.data.type == '标准订单'){
+        this.projectError = '请选择关联项目'
+      }else {
+        if (this.data.type == '标准订单'){
+          const res = await this.$api.requested({
+            "id": 20221108111402,
+            "content": {
+              "sa_orderid": this.$route.query.id,
+              "sys_enterpriseid": this.data.sys_enterpriseid, //订货企业id
+              "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
+              "sa_brandid": this.data.sa_brandid, //品牌ID
+              "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
+              "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
+              "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
+              "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
+              "type": this.data.type, //订单类型
+              "typemx":this.data.typemx, //明细分类，可选
+              "remarks": this.defaultData.remarks, //可选
+              "saler_hrid":this.data.saler_hrid,//销售人员hrid,业务员hrid
+              "signbackstatus":this.signbackstatus,
+              "tradefieldmx":this.data.tradefieldmx,
+              "pay_enterpriseid":this.data.pay_enterpriseid,
+              "tradefield":this.data.tradefield,
+              "saletype":this.saletype,
+              "rebate_used":this.checked,//默认0，是否使用返利金
+              "signbacknum":'',
+              "sa_promotionid":this.data.sa_promotionid,
+              "billdate":this.billdate,
+              "projectnote":this.data.projectnote,
+              "freightstatus":this.defaultData.freightstatus,
+              "sa_projectid":this.sa_projectid,
+              "remarks_in":this.defaultData.remarks_in
+            },
+          })
+          this.tool.showMessage(res,()=>{
+            this.$emit('onSuccess')
+            /*if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+              this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
+            }*/
+
+            this.drawer = false
+          })
+        }else {
+          const res = await this.$api.requested({
+            "id": 20221108111402,
+            "content": {
+              "sa_orderid": this.$route.query.id,
+              "sys_enterpriseid": this.data.sys_enterpriseid, //订货企业id
+              "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
+              "sa_brandid": this.data.sa_brandid, //品牌ID
+              "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
+              "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
+              "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
+              "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
+              "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
+              "type": this.data.type, //订单类型
+              "typemx":this.data.typemx, //明细分类，可选
+              "remarks": this.defaultData.remarks, //可选
+              "saler_hrid":this.data.saler_hrid,//销售人员hrid,业务员hrid
+              "signbackstatus":this.signbackstatus,
+              "tradefieldmx":this.data.tradefieldmx,
+              "pay_enterpriseid":this.data.pay_enterpriseid,
+              "tradefield":this.data.tradefield,
+              "saletype":this.saletype,
+              "rebate_used":this.checked,//默认0，是否使用返利金
+              "signbacknum":'',
+              "sa_promotionid":this.data.sa_promotionid,
+              "billdate":this.billdate,
+              "projectnote":this.data.projectnote,
+              "freightstatus":this.defaultData.freightstatus,
+              "remarks_in":this.defaultData.remarks_in
+            },
+          })
+          this.tool.showMessage(res,()=>{
+            this.$emit('onSuccess')
+            /*if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+              this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
+            }*/
+
+            this.drawer = false
+          })
+        }
+
+      }
 
-        this.drawer = false
-      })
     },
     onEditSuccess () {
       // this.$refs.addpro.listData()
@@ -661,6 +745,11 @@ export default {
         },
       })
       this.$refs['saler'].visible = false
+    },
+    rowClick(val){
+      this.projectname = val.projectname
+      this.sa_projectid = val.sa_projectid
+      this.projectError = ''
     }
   },
 }

src/SDrpManagement/agentOrder/details/index.vue

@@ -410,9 +410,13 @@ export default {
           value: this.mainData.saletype,
         },
         {
-          label: "备注",
+          label: "对外备注",
           value: this.mainData.remarks,
         },
+        {
+          label: "对内备注",
+          value: this.mainData.remarks_in,
+        },
         {
           label: "核销状态",
           value: this.mainData.writeoffstatus,
@@ -504,9 +508,13 @@ export default {
           value: this.mainData.saletype,
         },
         {
-          label: "备注",
+          label: "对外备注",
           value: this.mainData.remarks,
         },
+        {
+          label: "对内备注",
+          value: this.mainData.remarks_in,
+        },
         {
           label: "核销状态",
           value: this.mainData.writeoffstatus,
@@ -551,43 +559,47 @@ export default {
     },
     // 提交审核订单
     onSubmit(type) {
-      if (type == '提交' && (this.siteid == 'HY' || this.siteid == 'YOSTEST1')){
-        this.$refs.dialogRef.dialogVisible = true
-        this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays ? this.mainData.contract_reminddays : 7
+      if (type == '提交' && this.tool.checkAuth(this.$route.name,'relatedProject') && this.mainData.projectname == '' && this.mainData.type == '标准订单'){
+        this.$message.error('关联项目为空，不可提交，请前往编辑');
       }else {
-        this.$confirm(
-            this.$t("是否") + `“${this.$t(type)}”` + this.$t("该订单"),
-            this.$t("提示"),
-            {
-              confirmButtonText: this.$t("确定"),
-              cancelButtonText: this.$t("取消"),
-              type: "warning",
-            }
-        )
-        .then(async () => {
-          if (this.$refs.prod.time == null){
-            const res = await this.$api.requested({
-              id: type === "审核" ? 20221108153502 : 20221108153402,
-              content: {
-                sa_orderid: this.mainData.sa_orderid,
-                sys_enterpriseid: this.mainData.sys_enterpriseid,
-                sa_accountclassid: this.mainData.accountclass.sa_accountclassid,
-              },
-            });
-            this.tool.showMessage(res, async () => {
-              this.queryMainData();
-            });
-          }else {
-            this.typeNew = type
-          }
+        if (type == '提交' && (this.siteid == 'HY' || this.siteid == 'YOSTEST1')){
+          this.$refs.dialogRef.dialogVisible = true
+          this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays ? this.mainData.contract_reminddays : 7
+        }else {
+          this.$confirm(
+              this.$t("是否") + `“${this.$t(type)}”` + this.$t("该订单"),
+              this.$t("提示"),
+              {
+                confirmButtonText: this.$t("确定"),
+                cancelButtonText: this.$t("取消"),
+                type: "warning",
+              }
+          )
+              .then(async () => {
+                if (this.$refs.prod.time == null){
+                  const res = await this.$api.requested({
+                    id: type === "审核" ? 20221108153502 : 20221108153402,
+                    content: {
+                      sa_orderid: this.mainData.sa_orderid,
+                      sys_enterpriseid: this.mainData.sys_enterpriseid,
+                      sa_accountclassid: this.mainData.accountclass.sa_accountclassid,
+                    },
+                  });
+                  this.tool.showMessage(res, async () => {
+                    this.queryMainData();
+                  });
+                }else {
+                  this.typeNew = type
+                }
 
-        })
-        .catch((err) => {
-          this.$message({
-            type: "info",
-            message: err,
-          });
-        });
+              })
+              .catch((err) => {
+                this.$message({
+                  type: "info",
+                  message: err,
+                });
+              });
+        }
       }
     },
     // 查询站点是否使用返利金

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -483,7 +483,15 @@
               <el-radio label="扫描件" :style="{marginTop:windowWidth>1132?0:'10px'}">{{ $t("扫描件") }}</el-radio>
             </el-radio-group>
           </div>
-          <div style="margin-left: 20px">
+          <div class="inline-16" v-if="tool.checkAuth($route.name,'relatedProject') && data.type == '标准订单'">
+            <div :style="{marginTop:projectError?'20px':''}">
+              <small class="inline-16"><span style="color:red;">*</span><b>{{$t(`关联项目`)}}:</b>&nbsp;</small>
+              <popoverTemp class="inline-16" :tablecols="tablecols" :isButton="false" :params="paramsProject" :isRest="true"
+                           placeholder="选择关联项目" @rowClick="rowClick" :inputData="projectname"></popoverTemp>
+            </div>
+            <div v-if="projectError" style="color:red;font-size: 12px;margin-left: 90px;">{{projectError}}</div>
+          </div>
+          <div class="inline-16">
             <small
               ><b>{{ $t("销售类别") }}:</b>&nbsp;</small
             >
@@ -503,7 +511,7 @@
             </el-select>
           </div>
           <div
-            style="margin-left: 20px"
+              class="inline-16"
             v-if="
               siteId == 'HY' &&
               (data.type == '标准订单' || data.type == '项目订单')
@@ -519,14 +527,25 @@
           </div>
         </div>
         <div class="normal-margin">
-          <p class="normal-title mt-10 inline-16">{{ $t("订单备注") }}</p>
+          <p class="normal-title mt-10 inline-16">{{ $t("对外备注") }}</p>
           <el-input
             size="mini"
             class="order__note__input"
             type="textarea"
             v-model="defaultData.remarks"
             :autosize="{ minRows: 5 }"
-            :placeholder="$t(`请输入订单备注`)"
+            :placeholder="$t(`请输入对外备注`)"
+          ></el-input>
+        </div>
+        <div class="normal-margin">
+          <p class="normal-title mt-10 inline-16">{{ $t("对内备注") }}</p>
+          <el-input
+              size="mini"
+              class="order__note__input"
+              type="textarea"
+              v-model="defaultData.remarks_in"
+              :autosize="{ minRows: 5 }"
+              :placeholder="$t(`请输入对内备注`)"
           ></el-input>
         </div>
         <div
@@ -658,6 +677,7 @@ export default {
         accountclass: {},
         account_index: 0,
         remarks: this.data.remarks,
+        remarks_in:""
       },
       total: 0,
       setcol: 24,
@@ -693,10 +713,26 @@ export default {
       },
       enterpriseTotal: 0,
       windowWidth: document.documentElement.clientWidth,  //实时屏幕宽度
+      tablecols:'',
+      paramsProject:{
+        "content": {
+          "sys_enterpriseid": '',
+          "pageNumber": 1,
+          "pageSize": 100,
+          "where": {
+            "condition": ""
+          }
+        },
+        "id": 2026011416113702,
+      },
+      projectname:'',
+      sa_projectid:'',
+      projectError:''
     };
   },
   created() {
     this.queryBasicInfo();
+    this.tablecols = this.tool.tabelCol(this.$route.name)['projectSelectTable'].tablecols
   },
   methods: {
     enterprisePageChange(n) {
@@ -759,6 +795,10 @@ export default {
 
     // 设置默认信息
     async setDefaultData() {
+      this.projectError = ''
+      this.paramsProject.content.sys_enterpriseid = this.data.sys_enterpriseid
+      this.sa_projectid = ''
+      this.projectname = ''
       this.defaultData.rebatebalance = this.data.rebatebalance;
       this.defaultData.finance = this.data.finance;
       this.defaultData.fin_info = this.data.finance;
@@ -768,44 +808,91 @@ export default {
       this.saletype = this.data.saletype;
       this.signbackstatus = this.data.signbackstatus;
       this.selectEnterpriseInfo = this.data.contactsEnterprise;
+      this.defaultData.remarks = this.data.remarks
+      this.defaultData.remarks_in = this.data.remarks_in
     },
 
     async onSubmit() {
-      const res = await this.$api.requested({
-        id: 20221108111402,
-        content: {
-          sa_orderid: this.$route.query.id,
-          sys_enterpriseid: this.data.sys_enterpriseid, //订货企业id
-          sa_accountclassid: this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
-          sa_brandid: this.data.sa_brandid, //品牌ID
-          sa_contractid: this.data.sa_contractid, //合同ID，标准订单不传
-          sa_projectid: this.data.sa_projectid, //工程项目表ID，标准订单不传
-          sys_enterprise_financeid:
-            this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
-          sa_logiscompid: this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
-          rec_contactsid: this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
-          type: this.data.type, //订单类型
-          typemx: this.data.typemx, //明细分类，可选
-          remarks: this.defaultData.remarks, //可选
-          saler_hrid: this.data.saler_hrid, //销售人员hrid,业务员hrid
-          signbackstatus: this.signbackstatus,
-          tradefieldmx: this.data.tradefieldmx,
-          pay_enterpriseid: this.data.pay_enterpriseid,
-          tradefield: this.data.tradefield,
-          saletype: this.saletype,
-          rebate_used: this.data.rebate_used, //默认0，是否使用返利金
-          signbacknum: "",
-          sa_promotionid: this.data.sa_promotionid,
-          billdate: this.data.billdate,
-          projectnote: this.data.projectnote,
-        },
-      });
-      this.tool.showMessage(res, () => {
-        this.$emit("onSuccess");
-        /*  if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
-          this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
-        }*/
-      });
+      if (this.sa_projectid == '' && this.tool.checkAuth(this.$route.name,'relatedProject') && this.data.type == '标准订单'){
+        this.projectError = '请选择关联项目'
+      }else {
+        if (this.data.type == '标准订单'){
+          const res = await this.$api.requested({
+            id: 20221108111402,
+            content: {
+              sa_orderid: this.$route.query.id,
+              sys_enterpriseid: this.data.sys_enterpriseid, //订货企业id
+              sa_accountclassid: this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
+              sa_brandid: this.data.sa_brandid, //品牌ID
+              sa_contractid: this.data.sa_contractid, //合同ID，标准订单不传
+              sa_projectid: this.sa_projectid, //工程项目表ID，标准订单不传
+              sys_enterprise_financeid:
+              this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
+              sa_logiscompid: this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
+              rec_contactsid: this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
+              type: this.data.type, //订单类型
+              typemx: this.data.typemx, //明细分类，可选
+              remarks: this.defaultData.remarks, //可选
+              saler_hrid: this.data.saler_hrid, //销售人员hrid,业务员hrid
+              signbackstatus: this.signbackstatus,
+              tradefieldmx: this.data.tradefieldmx,
+              pay_enterpriseid: this.data.pay_enterpriseid,
+              tradefield: this.data.tradefield,
+              saletype: this.saletype,
+              rebate_used: this.data.rebate_used, //默认0，是否使用返利金
+              signbacknum: "",
+              sa_promotionid: this.data.sa_promotionid,
+              billdate: this.data.billdate,
+              projectnote: this.data.projectnote,
+              remarks_in:this.defaultData.remarks_in
+            },
+          });
+          this.tool.showMessage(res, () => {
+            this.$emit("onSuccess");
+            /*  if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+              this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
+            }*/
+          });
+        }else {
+          const res = await this.$api.requested({
+            id: 20221108111402,
+            content: {
+              sa_orderid: this.$route.query.id,
+              sys_enterpriseid: this.data.sys_enterpriseid, //订货企业id
+              sa_accountclassid: this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
+              sa_brandid: this.data.sa_brandid, //品牌ID
+              sa_contractid: this.data.sa_contractid, //合同ID，标准订单不传
+              sa_projectid: this.data.sa_projectid, //工程项目表ID，标准订单不传
+              sys_enterprise_financeid:
+              this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
+              sa_logiscompid: this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
+              rec_contactsid: this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
+              type: this.data.type, //订单类型
+              typemx: this.data.typemx, //明细分类，可选
+              remarks: this.defaultData.remarks, //可选
+              saler_hrid: this.data.saler_hrid, //销售人员hrid,业务员hrid
+              signbackstatus: this.signbackstatus,
+              tradefieldmx: this.data.tradefieldmx,
+              pay_enterpriseid: this.data.pay_enterpriseid,
+              tradefield: this.data.tradefield,
+              saletype: this.saletype,
+              rebate_used: this.data.rebate_used, //默认0，是否使用返利金
+              signbacknum: "",
+              sa_promotionid: this.data.sa_promotionid,
+              billdate: this.data.billdate,
+              projectnote: this.data.projectnote,
+              remarks_in:this.defaultData.remarks_in
+            },
+          });
+          this.tool.showMessage(res, () => {
+            this.$emit("onSuccess");
+            /*  if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+              this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
+            }*/
+          });
+        }
+
+      }
     },
     onEditSuccess() {
       this.$refs.addpro.listData();

src/SDrpManagement/salerOrder/details/index.vue

@@ -491,9 +491,13 @@ export default {
           value: this.$t(this.mainData.freightstatus),
         },
         {
-          label: "备注",
+          label: "对外备注",
           value: this.mainData.remarks,
         },
+        {
+          label: "对内备注",
+          value: this.mainData.remarks_in,
+        },
         {
           label: "退回原因",
           value: this.mainData.backreason,
@@ -646,9 +650,13 @@ export default {
           value: this.$t(this.mainData.freightstatus),
         },
         {
-          label: "备注",
+          label: "对外备注",
           value: this.mainData.remarks,
         },
+        {
+          label: "对内备注",
+          value: this.mainData.remarks_in,
+        },
         {
           label: "退回原因",
           value: this.mainData.backreason,
@@ -698,49 +706,53 @@ export default {
     },
     // 提交审核订单 saletype
     onSubmit(type) {
-      let siteid = JSON.parse(sessionStorage.getItem("active_account")).siteid;
-      console.log(siteid, this.mainData.saletype);
-      if (siteid == "HY" && this.mainData.saletype == "")
-        return this.$message({
-          message: this.$t("销售分类不能为空!"),
-          type: "error",
-        });
-      if (type == '提交' && (siteid == 'HY' || siteid == 'YOSTEST1')){
-        this.$refs.dialogRef.dialogVisible = true
-        this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays ? this.mainData.contract_reminddays : 7
+      if (type == '提交' && this.tool.checkAuth(this.$route.name,'relatedProject') && this.mainData.projectname == '' && this.mainData.type == '标准订单'){
+        this.$message.error('关联项目为空，不可提交，请前往编辑');
       }else {
-        this.$confirm(
-            this.$t("是否") + `‘${this.$t(type)}’` + this.$t("该订单"),
-            this.$t("提示"),
-            {
-              confirmButtonText: this.$t("确定"),
-              cancelButtonText: this.$t("取消"),
-              type: "warning",
-            }
-        )
-            .then(async () => {
-              if (this.$refs.prod.time == null){
-                const res = await this.$api.requested({
-                  id: type === "审核" ? 20221108153502 : 20221108153402,
-                  content: {
-                    sa_orderid: this.mainData.sa_orderid,
-                    sys_enterpriseid: this.mainData.sys_enterpriseid,
-                    sa_accountclassid: this.mainData.accountclass.sa_accountclassid,
-                  },
-                });
-                this.tool.showMessage(res, async () => {
-                  this.queryMainData();
-                });
-              }else {
-                this.typeNew = type
+        let siteid = JSON.parse(sessionStorage.getItem("active_account")).siteid;
+        console.log(siteid, this.mainData.saletype);
+        if (siteid == "HY" && this.mainData.saletype == "")
+          return this.$message({
+            message: this.$t("销售分类不能为空!"),
+            type: "error",
+          });
+        if (type == '提交' && (siteid == 'HY' || siteid == 'YOSTEST1')){
+          this.$refs.dialogRef.dialogVisible = true
+          this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays ? this.mainData.contract_reminddays : 7
+        }else {
+          this.$confirm(
+              this.$t("是否") + `‘${this.$t(type)}’` + this.$t("该订单"),
+              this.$t("提示"),
+              {
+                confirmButtonText: this.$t("确定"),
+                cancelButtonText: this.$t("取消"),
+                type: "warning",
               }
-            })
-            .catch((err) => {
-              this.$message({
-                type: "info",
-                message: err,
+          )
+              .then(async () => {
+                if (this.$refs.prod.time == null){
+                  const res = await this.$api.requested({
+                    id: type === "审核" ? 20221108153502 : 20221108153402,
+                    content: {
+                      sa_orderid: this.mainData.sa_orderid,
+                      sys_enterpriseid: this.mainData.sys_enterpriseid,
+                      sa_accountclassid: this.mainData.accountclass.sa_accountclassid,
+                    },
+                  });
+                  this.tool.showMessage(res, async () => {
+                    this.queryMainData();
+                  });
+                }else {
+                  this.typeNew = type
+                }
+              })
+              .catch((err) => {
+                this.$message({
+                  type: "info",
+                  message: err,
+                });
               });
-            });
+        }
       }
     },
     /*确认提交*/

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -470,7 +470,15 @@
               <el-radio label="扫描件" :style="{marginTop:windowWidth>988?0:'10px'}">{{ $t("扫描件") }}</el-radio>
             </el-radio-group>
           </div>
-          <div style="margin-left: 20px">
+          <div class="inline-16" v-if="tool.checkAuth($route.name,'relatedProject') && data.type == '标准订单'">
+            <div :style="{marginTop:projectError?'20px':''}">
+              <small class="inline-16"><span style="color:red;">*</span><b>{{$t(`关联项目`)}}:</b>&nbsp;</small>
+              <popoverTemp class="inline-16" :tablecols="tablecols" :isButton="false" :params="paramsProject" :isRest="true"
+                           placeholder="选择关联项目" @rowClick="rowClick" :inputData="projectname"></popoverTemp>
+            </div>
+            <div v-if="projectError" style="color:red;font-size: 12px;margin-left: 90px;">{{projectError}}</div>
+          </div>
+          <div class="inline-16">
             <small
               ><b>{{ $t("销售类别") }}:</b>&nbsp;</small
             >
@@ -490,7 +498,7 @@
             </el-select>
           </div>
           <div
-            style="margin-left: 20px"
+              class="inline-16"
             v-if="
               siteId == 'HY' &&
               (data.type == '标准订单' || data.type == '项目订单')
@@ -517,14 +525,25 @@
           </div>
         </div>
         <div class="normal-margin">
-          <p class="normal-title mt-10 inline-16">{{ $t("订单备注") }}</p>
+          <p class="normal-title mt-10 inline-16">{{ $t("对外备注") }}</p>
           <el-input
             size="mini"
             class="order__note__input"
             type="textarea"
             v-model="defaultData.remarks"
             :autosize="{ minRows: 5 }"
-            :placeholder="$t(`请输入订单备注`)"
+            :placeholder="$t(`请输入对外备注`)"
+          ></el-input>
+        </div>
+        <div class="normal-margin">
+          <p class="normal-title mt-10 inline-16">{{ $t("对内备注") }}</p>
+          <el-input
+              size="mini"
+              class="order__note__input"
+              type="textarea"
+              v-model="defaultData.remarks_in"
+              :autosize="{ minRows: 5 }"
+              :placeholder="$t(`请输入对内备注`)"
           ></el-input>
         </div>
         <div
@@ -688,10 +707,26 @@ export default {
       addresstotal: 0,
       enterpriseTotal: 0,
       windowWidth: document.documentElement.clientWidth,  //实时屏幕宽度
+      tablecols:'',
+      paramsProject:{
+        "content": {
+          "sys_enterpriseid": '',
+          "pageNumber": 1,
+          "pageSize": 100,
+          "where": {
+            "condition": ""
+          }
+        },
+        "id": 2026011416113702,
+      },
+      projectname:'',
+      sa_projectid:'',
+      projectError:''
     };
   },
   created() {
     this.queryBasicInfo();
+    this.tablecols = this.tool.tabelCol(this.$route.name)['projectSelectTable'].tablecols
   },
   methods: {
     enterprisePageChange(n) {
@@ -775,6 +810,10 @@ export default {
     },
     // 设置默认信息
     async setDefaultData() {
+      this.projectError = ''
+      this.paramsProject.content.sys_enterpriseid = this.data.sys_enterpriseid
+      this.sa_projectid = ''
+      this.projectname = ''
       this.defaultData.rebatebalance = this.data.rebatebalance;
       this.defaultData.finance = this.data.finance;
       this.defaultData.fin_info = this.data.finance;
@@ -788,43 +827,90 @@ export default {
     },
 
     async onSubmit() {
-      const res = await this.$api.requested({
-        id: 20221108111402,
-        content: {
-          sa_orderid: this.$route.query.id,
-          sys_enterpriseid: this.data.sys_enterpriseid, //订货企业id
-          sa_accountclassid: this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
-          sa_brandid: this.data.sa_brandid, //品牌ID
-          sa_contractid: this.data.sa_contractid, //合同ID，标准订单不传
-          sa_projectid: this.data.sa_projectid, //工程项目表ID，标准订单不传
-          sys_enterprise_financeid:
-            this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
-          sa_logiscompid: this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
-          rec_contactsid: this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
-          type: this.data.type, //订单类型
-          typemx: this.data.typemx, //明细分类，可选
-          remarks: this.defaultData.remarks, //可选
-          saler_hrid: this.data.saler_hrid, //销售人员hrid,业务员hrid
-          signbackstatus: this.signbackstatus,
-          tradefieldmx: this.data.tradefieldmx,
-          pay_enterpriseid: this.data.pay_enterpriseid,
-          tradefield: this.data.tradefield,
-          saletype: this.saletype,
-          rebate_used: this.checked, //默认0，是否使用返利金
-          signbacknum: "",
-          sa_promotionid: this.data.sa_promotionid,
-          billdate: this.data.billdate,
-          projectnote: this.data.projectnote,
-          freightstatus:this.defaultData.freightstatus
-        },
-      });
-      this.tool.showMessage(res, () => {
-        this.$emit("onSuccess");
-        this.drawer = false
-        /*if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
-          this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
-        }*/
-      });
+      if (this.sa_projectid == '' && this.tool.checkAuth(this.$route.name,'relatedProject')){
+        this.projectError = '请选择关联项目'
+      }else {
+        if (this.data.type == '标准订单'){
+          const res = await this.$api.requested({
+            id: 20221108111402,
+            content: {
+              sa_orderid: this.$route.query.id,
+              sys_enterpriseid: this.data.sys_enterpriseid, //订货企业id
+              sa_accountclassid: this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
+              sa_brandid: this.data.sa_brandid, //品牌ID
+              sa_contractid: this.data.sa_contractid, //合同ID，标准订单不传
+              sa_projectid: this.sa_projectid, //工程项目表ID，标准订单不传
+              sys_enterprise_financeid:
+              this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
+              sa_logiscompid: this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
+              rec_contactsid: this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
+              type: this.data.type, //订单类型
+              typemx: this.data.typemx, //明细分类，可选
+              remarks: this.defaultData.remarks, //可选
+              saler_hrid: this.data.saler_hrid, //销售人员hrid,业务员hrid
+              signbackstatus: this.signbackstatus,
+              tradefieldmx: this.data.tradefieldmx,
+              pay_enterpriseid: this.data.pay_enterpriseid,
+              tradefield: this.data.tradefield,
+              saletype: this.saletype,
+              rebate_used: this.checked, //默认0，是否使用返利金
+              signbacknum: "",
+              sa_promotionid: this.data.sa_promotionid,
+              billdate: this.data.billdate,
+              projectnote: this.data.projectnote,
+              freightstatus:this.defaultData.freightstatus,
+              remarks_in:this.defaultData.remarks_in
+            },
+          });
+          this.tool.showMessage(res, () => {
+            this.$emit("onSuccess");
+            this.drawer = false
+            /*if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+              this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
+            }*/
+          });
+        }else {
+          const res = await this.$api.requested({
+            id: 20221108111402,
+            content: {
+              sa_orderid: this.$route.query.id,
+              sys_enterpriseid: this.data.sys_enterpriseid, //订货企业id
+              sa_accountclassid: this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
+              sa_brandid: this.data.sa_brandid, //品牌ID
+              sa_contractid: this.data.sa_contractid, //合同ID，标准订单不传
+              sa_projectid: this.data.sa_projectid, //工程项目表ID，标准订单不传
+              sys_enterprise_financeid:
+              this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
+              sa_logiscompid: this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
+              rec_contactsid: this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
+              type: this.data.type, //订单类型
+              typemx: this.data.typemx, //明细分类，可选
+              remarks: this.defaultData.remarks, //可选
+              saler_hrid: this.data.saler_hrid, //销售人员hrid,业务员hrid
+              signbackstatus: this.signbackstatus,
+              tradefieldmx: this.data.tradefieldmx,
+              pay_enterpriseid: this.data.pay_enterpriseid,
+              tradefield: this.data.tradefield,
+              saletype: this.saletype,
+              rebate_used: this.checked, //默认0，是否使用返利金
+              signbacknum: "",
+              sa_promotionid: this.data.sa_promotionid,
+              billdate: this.data.billdate,
+              projectnote: this.data.projectnote,
+              freightstatus:this.defaultData.freightstatus,
+              remarks_in:this.defaultData.remarks_in
+            },
+          });
+          this.tool.showMessage(res, () => {
+            this.$emit("onSuccess");
+            this.drawer = false
+            /*if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+              this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
+            }*/
+          });
+        }
+      }
+
     },
     onEditSuccess() {
       this.$refs.prolist.listData();

src/components/normal-basic-layout/details/index.vue

@@ -172,7 +172,7 @@ export default {
     mainAData () {
       try {
         let data = this.mainAreaData.filter(e=>{
-          if(e.label != '备注' && e.label != '优势信息' && e.label != '劣势信息') {
+          if(e.label != '备注' && e.label != '对外备注'  && e.label != '对内备注' && e.label != '优势信息' && e.label != '劣势信息') {
             return e
           }
         })
@@ -186,7 +186,7 @@ export default {
     mainAData2 () {
       try {
         let data = this.mainAreaData.filter(e=>{
-          if(e.label == '备注' || e.label == '优势信息' || e.label == '劣势信息') {
+          if(e.label == '备注'  || e.label == '优势信息' || e.label == '劣势信息' || e.label == '对外备注' || e.label == '对内备注') {
             return e
           }
         })

src/components/selectPopover/index.vue

@@ -0,0 +1,181 @@
+<template>
+  <div>
+    <el-popover
+        placement="left"
+        width="100%"
+        v-model="visible">
+      <div>
+        <div class="flex-align-center flex-between" style="margin-bottom:10px">
+          <el-input  style="width:200px;" :placeholder="$t('搜索')" :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="params.content.where.condition" @keyup.native.enter="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
+        <tableNewLayout :layout="tablecols" :data="list" :custom="true" :checkbox="false" @rowClick="rowClick" height="300px">
+          <template v-slot:customcol="scope">
+            <div v-if="isRest">
+              <div v-if="scope.column.columnname === 'tag'">
+                <div
+                    v-for="item in scope.column.data.tag_sys"
+                    :key="item.index"
+                    style="float: left; margin-left: 5px; margin-bottom: 5px"
+                >
+                  <el-tag color="#3874F6" size="mini" type="primary" effect="dark">
+                    <span>{{ $t(item) }}</span>
+                  </el-tag>
+                </div>
+                <div
+                    v-for="item in scope.column.data.tag"
+                    :key="item.index"
+                    style="float: left; margin-left: 5px; margin-bottom: 5px"
+                >
+                  <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
+                    <span>{{ $t(item) }}</span>
+                  </el-tag>
+                </div>
+              </div>
+              <div v-else-if="scope.column.columnname === 'industry'">
+                  <span
+                      v-if="
+                      JSON.stringify(scope.column.data.industry) !== '[]' &&
+                      scope.column.data.industry
+                    "
+                  >
+              <div
+                  v-for="item in scope.column.data.industry"
+                  :key="item.index"
+                  style="float: left; margin-left: 5px; margin-bottom: 5px"
+              >
+                <el-tag size="mini" effect="dark">
+                  <span>{{ $t(item) }}</span>
+                </el-tag>
+              </div>
+                </span>
+                <div v-else>--</div>
+              </div>
+              <div v-else-if="scope.column.columnname === 'tradingstatus'">
+                <span
+                    :style="tool.getStatusColor(scope.column.data[[scope.column.columnname]])"
+                >{{
+                    $t(scope.column.data[[scope.column.columnname]])
+                  }}</span
+                >
+              </div>
+              <div v-else-if="scope.column.columnname === 'isleader'">
+                {{tool.contentShow(scope.column.data[[scope.column.columnname]],'是','否')}}
+              </div>
+              <div v-else-if="scope.column.columnname === 'status'">
+                <span
+                    :style="tool.getStatusColor(scope.column.data[[scope.column.columnname]])"
+                >{{
+                    $t(scope.column.data[[scope.column.columnname]])
+                  }}</span
+                >
+              </div>
+              <div v-else-if="scope.column.columnname === 'leader'">
+                <span>{{
+                    scope.column.data["leader"][0]
+                        ? scope.column.data["leader"][0].name
+                        : "--"
+                  }}</span>
+              </div>
+              <div v-else-if="scope.column.columnname === 'depname'">
+                <span>{{
+                    scope.column.data["leader"][0]
+                        ? scope.column.data["leader"][0].depname
+                            ? $t(scope.column.data["leader"][0].depname)
+                            : "--"
+                        : "--"
+                  }}</span>
+              </div>
+              <div v-else-if="scope.column.columnname == 'province'">
+                <span v-if="scope.column.data.province !== ''">
+                  {{`${scope.column.data[[scope.column.columnname]]}-${scope.column.data.city}-${scope.column.data.county}` }}
+                </span>
+                <span v-else>--</span>
+              </div>
+              <div v-else>
+                {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
+              </div>
+            </div>
+            <div v-else-if="isTask">
+              <div v-if="scope.column.columnname === 'begindate'">
+                {{scope.column.data.begindate}}
+              </div>
+              <div v-else>
+                {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
+              </div>
+            </div>
+            <div v-else>
+              {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
+            </div>
+          </template>
+        </tableNewLayout>
+        <div  class="container normal-panel" style="text-align:right">
+          <el-pagination
+              background
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="20"
+              layout="total,sizes, prev, pager, next, jumper"
+              :total="total">
+          </el-pagination>
+        </div>
+      </div>
+      <div slot="reference">
+        <el-button size="mini" type="primary" v-if="isButton" @click="listData">添加</el-button>
+        <el-input v-else readonly :validate-event="false" v-model="inputData" @focus="listData" :size="inputSize?inputSize:'small'" :placeholder="placeholder?placeholder:$t(`选择关联客户`)" clearable :disabled="disabled"></el-input>
+      </div>
+    </el-popover>
+  </div>
+</template>
+
+<script>
+export default {
+  props:["tablecols","params","placeholder",'restName','inputData','isRest','isContracted','type',
+    'idName','isButton','inputSize','disabled','isTask','rowIndex'],
+  name: "index",
+  data(){
+    return {
+      visible:false,
+      list:[],
+      currentPage:0,
+      total:0,
+      enterprisename:[],
+    }
+  },
+  methods:{
+    async listData(){
+      const res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.currentPage = res.pageNumber
+      this.total = res.total
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+    rowClick(val){
+      this.visible = false
+      if (this.isButton){
+        this.$emit('rowClick',val)
+      }else {
+        this.inputData = val[this.restName]
+        this.$emit('rowClick',val,this.type,this.restName,this.idName,this.rowIndex)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+::v-deep .el-input__validateIcon {
+  display: none;
+}
+</style>

src/main.js

@@ -35,6 +35,7 @@ import tagPanl from '@/components/tagPanl/tagPanl'
 import selectTemp from '@/components/selectTemp/index';
 
 import confirmSelection from '@/template/buttonTemplate/confirmSelection'
+import popoverTemp from './components/selectPopover/index'
 
 import sort from './components/sort';
 import '@/style/theme/font-icon/iconfont.css';
@@ -90,6 +91,7 @@ Vue.component('customBtn',customBtn)
 Vue.component('selectTemp',selectTemp)
 
 Vue.component('confirmSelection',confirmSelection)
+Vue.component('popoverTemp',popoverTemp)
 
 Vue.component('sort', sort)
 /* 标签组件 */