调整订单、发货单、返退单经销商选择方式

src/HDrpManagement/aftersalesBill/components/add.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="dialogFormVisible = true">新 建</el-button>
-    <el-drawer title="新建返退单" append-to-body :visible.sync="dialogFormVisible" size="40%" :show-close="false">
+    <el-drawer title="新建返退单" append-to-body :visible.sync="dialogFormVisible" size="40%" :show-close="false" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
             <el-col :span="24">
               <el-form-item label="选择企业:" prop="enterprisename">
                   <selectAgent :qiyi="true" ref="agent" @selectRow="agentChange">
-                    <el-input readonly type="text" placeholder="请选择企业" slot="input" size="small" @focus="$refs.agent.visible=true" v-model="form.enterprisename"></el-input>
+<!--                    <el-input readonly type="text" placeholder="请选择企业" slot="input" size="small" @focus="$refs.agent.visible=true" v-model="form.enterprisename"></el-input>-->
                   </selectAgent>
               </el-form-item>
             </el-col>
@@ -99,7 +99,7 @@ export default {
     dialogFormVisible (val) {
       if (!val) {
         this.$refs['form'].resetFields()
-        
+
       }
     }
   },
@@ -135,6 +135,10 @@ export default {
       this.form.sa_orderid = data.sa_orderid
       this.form.sonum = data.sonum
       this.$refs.order.visible = false
+    },
+    onClose(){
+      this.visible = false
+      this.$refs.agent.param.content.where.condition = ''
     }
   }
 }
@@ -147,4 +151,4 @@ export default {
 .el-input {
   width: 100% !important;
 }
-</style>
+</style>

src/HDrpManagement/aftersalesBill/components/selectAgent.vue

@@ -1,9 +1,9 @@
 <template>
-  <div> 
-    <el-dialog :visible.sync="visible" append-to-body width="50%">
-      <div class="flex-align-center flex-between mt-10">
+  <div>
+    <el-dialog :visible.sync="visible" append-to-body width="50%" :modal="false">
+<!--      <div class="flex-align-center flex-between mt-10">
         <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="搜索" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
-      </div>
+      </div>-->
       <div>
         <el-table
           ref="multipleTable"
@@ -54,6 +54,7 @@
       </div>
     </el-dialog>
     <slot name="input"></slot>
+    <el-input  type="text" :validate-event="false" slot="reference" size="small" @focus="visible=true" v-model="param.content.where.condition" @keyup.enter.native="listData()" placeholder="请选择经销商"></el-input>
   </div>
 </template>
 
@@ -85,7 +86,10 @@ export default {
       this.total = res.total
       this.currentPage = res.pageNumber
       // console.log(this.tableData);
-      
+      if (res.data.length === 1){
+        this.selectRow(res.data[0])
+      }
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -98,6 +102,7 @@ export default {
       this.listData()
     },
     selectRow (row) {
+      this.param.content.where.condition = row.enterprisename
       this.$emit('selectRow',row)
     }
   },
@@ -108,4 +113,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/dispatch/modules/add.vue

@@ -1,14 +1,15 @@
 <template>
   <div>
     <el-button size="small" type="primary" @click="dialogFormVisible = true">新 建</el-button>
-    <el-drawer title="新建发货单" append-to-body :visible.sync="dialogFormVisible" size="500px" :show-close="false">
+    <el-drawer title="新建发货单" append-to-body :visible.sync="dialogFormVisible" size="500px" :show-close="false" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
             <el-col :span="24">
               <el-form-item label="经销商:" prop="enterprisename">
                   <selectAgent ref="agent" @selectRow="agentChange">
-                    <el-input readonly type="text" slot="input" size="small" @focus="$refs.agent.visible=true" v-model="form.enterprisename" placeholder="请选择经销商"></el-input>
+<!--                    <el-input  type="text" slot="input" size="small" @focus="$refs.agent.visible=true" v-model="form.enterprisename" placeholder="请选择经销商"></el-input>-->
+
                   </selectAgent>
               </el-form-item>
             </el-col>
@@ -28,7 +29,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @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>
@@ -36,7 +37,7 @@
 </template>
 
 <script>
-import selectAgent from '@/template/selectAgent/index.vue'
+import selectAgent from '@/template/selectAgent/index1.vue'
 import selectOrder from './selectOrder'
 export default {
   name: "add",
@@ -66,12 +67,12 @@ export default {
     dialogFormVisible (val) {
       if (!val) {
         this.$refs['form'].resetFields()
-        
+
       }
     }
   },
   created () {
-    
+
   },
   methods:{
     async onSubmit (row) {
@@ -100,6 +101,20 @@ export default {
       this.form.sa_orderid = data.sa_orderid
       this.form.sonum = data.sonum
       this.$refs.order.visible = false
+    },
+    onClose(){
+      this.visible = false
+      this.$refs.agent.param.content.where.condition = ''
+      this.form = {
+        "sa_dispatchid":0,
+        "sa_logiscompid":0,
+        "rec_contactsid":0,
+        "remarks":'',
+        "sa_orderid":0,
+        "sys_enterpriseid":"",
+        "enterprisename":'',
+        "sonum":"",
+      }
     }
   }
 }
@@ -112,4 +127,4 @@ export default {
 .el-input {
   width: 100% !important;
 }
-</style>
+</style>

src/HDrpManagement/orderManage/modules/add.vue

@@ -24,41 +24,43 @@
                 <el-input readonly v-model="form.type" placeholder="订单类型" :maxlength="11" clearable :style="{width: '100%'}"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="form.type !== '项目订单'">
-              <el-form-item label="选择企业" prop="sys_enterpriseid">
-                <agent ref="enterprise" ismanage="1" @rowClick="rowClick"></agent>
-              </el-form-item>
-            </el-col>
-            <el-col v-if="form.type === '促销订单'" :span="12">
-              <el-form-item label="活动信息" prop="promname">
-                <el-popover
-                  placement="bottom"
-                  trigger="click"
-                  v-model="visible1">
-                  <orderCanUseActivity ref="activity" @rowClick="activityClick"></orderCanUseActivity>
-                  <el-input readonly v-model="form.promname" slot="reference" placeholder="选择活动"></el-input>
-                </el-popover>
-              </el-form-item>
-            </el-col>
-            <el-col v-if="form.type === '项目订单'" :span="12">
-              <el-form-item label="项目合同" prop="contractname">
-                <el-popover
-                  placement="bottom"
-                  trigger="click"
-                  v-model="visible">
-                  <orderCanUseContract ref="contract" @listCreate="listCreate" ismanage="1" @rowClick="contractClick"></orderCanUseContract>
-                  <el-input readonly v-model="form.contractname" slot="reference" placeholder="选择合同"></el-input>
-                </el-popover>
-              </el-form-item>
-            </el-col>
-            <el-col v-if="form.type === '特殊订单'" :span="12">
-              <el-form-item label="特殊订单分类" prop="typemx">
-                <el-select v-model="form.typemx" placeholder="请选择特殊订单分类" :disabled="accountTypeData !== '其他'" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in typemxlist" :key="index" :label="item.value"
-                    :value="item.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+            <el-row :gutter="15">
+              <el-col :span="12" v-if="form.type !== '项目订单'">
+                <el-form-item label="选择企业" prop="sys_enterpriseid">
+                  <agent ref="enterprise" ismanage="1" @rowClick="rowClick"></agent>
+                </el-form-item>
+              </el-col>
+              <el-col v-if="form.type === '促销订单'" :span="12">
+                <el-form-item label="活动信息" prop="promname">
+                  <el-popover
+                    placement="bottom"
+                    trigger="click"
+                    v-model="visible1">
+                    <orderCanUseActivity ref="activity" @rowClick="activityClick"></orderCanUseActivity>
+                    <el-input readonly v-model="form.promname" slot="reference" placeholder="选择活动"></el-input>
+                  </el-popover>
+                </el-form-item>
+              </el-col>
+              <el-col v-if="form.type === '项目订单'" :span="12">
+                <el-form-item label="项目合同" prop="contractname">
+                  <el-popover
+                    placement="bottom"
+                    trigger="click"
+                    v-model="visible">
+                    <orderCanUseContract ref="contract" @listCreate="listCreate" ismanage="1" @rowClick="contractClick"></orderCanUseContract>
+                    <el-input readonly v-model="form.contractname" slot="reference" placeholder="选择合同"></el-input>
+                  </el-popover>
+                </el-form-item>
+              </el-col>
+              <el-col v-if="form.type === '特殊订单'" :span="12">
+                <el-form-item label="特殊订单分类" prop="typemx">
+                  <el-select v-model="form.typemx" placeholder="请选择特殊订单分类" :disabled="accountTypeData !== '其他'" clearable :style="{width: '100%'}">
+                    <el-option v-for="(item, index) in typemxlist" :key="index" :label="item.value"
+                               :value="item.value"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-col :span="12" v-if="form.type !=='工具订单' && form.type !=='项目订单'">
               <el-form-item label="选择品牌" prop="sa_brandid">
                 <el-select :disabled="form.type==='促销订单'" v-model="form.sa_brandid" placeholder="请选择选择品牌" clearable :style="{width: '100%'}">
@@ -316,6 +318,7 @@ export default {
       this.$refs['enterprise'].form.enterprisename = ''
       this.visible1 = false
       this.visible = false
+      this.$refs.enterprise.params.content.where.condition = ''
     }
   }
 }

src/template/orderAddCanUseAgent/index1.vue

@@ -5,10 +5,10 @@
       width="100%"
       v-model="visible">
       <div>
-        <div class="flex-align-center flex-between" style="margin-bottom:10px">
+<!--        <div class="flex-align-center flex-between" style="margin-bottom:10px">
           <el-input style="width:200px" suffix-icon="el-icon-search" size="small" v-model="params.content.where.condition" placeholder="输入经销商信息" @keyup.enter.native="queryEnterpriseArchives(params.content.pageNumber = 1)" @clear="queryEnterpriseArchives(params.content.pageNumber = 1)" clearable></el-input>
           <addTemp @onSuccess="onSuccess"></addTemp>
-        </div>
+        </div>-->
         <el-table
           :data="ENlist"
           size="small"
@@ -55,7 +55,7 @@
           </el-pagination>
         </div>
       </div>
-      <el-input readonly :validate-event="false" slot="reference" v-model="params.content.where.condition" @focus="queryEnterpriseArchives" @keyup.enter.native="queryEnterpriseArchives(params.content.pageNumber = 1)"  placeholder="输入经销商信息" clearable></el-input>
+      <el-input  :validate-event="false" slot="reference" v-model="params.content.where.condition" @focus="queryEnterpriseArchives" @keyup.enter.native="queryEnterpriseArchives(params.content.pageNumber = 1)"  placeholder="输入经销商信息" clearable></el-input>
     </el-popover>
   </div>
 </template>

src/template/selectAgent/index1.vue

@@ -0,0 +1,136 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" append-to-body width="50%" :modal="false" @close="onClose">
+<!--      <div class="flex-align-center flex-between mt-10">
+        <el-input
+          style="width:200px"
+          size="small"
+          suffix-icon="el-icon-search"
+          placeholder="搜索"
+          @input="valueChange"
+          v-model="condition"
+          @keyup.enter.native="listData(customParam ? customParam.content.pageNumber = 1 : param.content.pageNumber = 1)"
+          @clear="listData(customParam ? customParam.content.pageNumber = 1 : param.content.pageNumber = 1)" clearable></el-input>
+      </div>-->
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="tableData"
+          style="width: 100%"
+          size="mini"
+          height="50vh"
+          border>
+          <el-table-column
+            prop="enterprisename"
+            :label="qiyi ? '企业名称' : '经销商名称'"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="agentnum"
+            :label="qiyi ? '编号' : '经销商编号'"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="contact"
+            label="联系人">
+          </el-table-column>
+          <el-table-column
+            label="地址">
+            <template slot-scope="scope">
+              {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="selectRow(scope.row)">选 择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+            background
+            small
+            @current-change="handleCurrentChange"
+            :current-page="customParam ? customParam.content.pageNumber : param.content.pageNumber"
+            :page-size="customParam ? customParam.content.pageSize : param.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </el-dialog>
+    <slot name="input"></slot>
+    <el-input  type="text" :validate-event="false" slot="reference" size="small" @focus="visible=true" v-model="param.content.where.condition" @keyup.enter.native="listData()" placeholder="请选择经销商"></el-input>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['customParam','qiyi','id','status'],
+  data () {
+    return {
+      visible:false,
+      param:{
+        "id":this.id ? this.id : '20230324125803',
+        "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": "",
+              "status" : this.status ? this.status:''
+            }
+        }
+      },
+      tableData: [],
+      total:0,
+      condition:'',
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested(this.customParam ? this.customParam : this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      // console.log(this.tableData);
+      if (res.data.length === 1){
+        this.selectRow(res.data[0])
+      }
+
+    },
+    valueChange (data) {
+      console.log(data);
+      if (this.customParam) {
+        this.customParam.content.where.condition = data
+      } else {
+        this.param.content.where.condition = data
+      }
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      if (this.customParam) {
+        this.customParam.content.pageNumber = val
+      } else {
+        this.param.content.pageNumber = val
+      }
+      this.listData()
+    },
+    selectRow (row) {
+      this.param.content.where.condition = row.enterprisename
+      this.$emit('selectRow',row)
+    },
+    onClose(){
+      this.visible = false
+
+    }
+  },
+  created () {
+    this.listData()
+  },
+}
+
+</script>
+<style>
+</style>