Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/bankStatement/components/confirm.vue

@@ -11,6 +11,13 @@
     </el-dropdown>
 
     <el-dialog :visible.sync="drawer" width="60%" append-to-body>
+      <div class="flex-align-center">
+        <el-input 
+          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>&nbsp;
+      </div>
       <el-table
         ref="multipleTable"
         :data="tableData"

src/HDrpManagement/contractManage/components/productClassList/productClassList.vue

@@ -9,7 +9,7 @@
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'discountrate'">
             <el-input size="mini" v-if="currentEdit.sa_contract_itemsaleclassid == scope.column.data.sa_contract_itemsaleclassid" v-model="scope.column.data.discountrate" @input="discountrateChange($event,scope.column.data)"></el-input>
-            <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+            <p v-else>{{scope.column.data[scope.column.columnname] + '%'}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'brand'">
             {{scope.column.data[scope.column.columnname][0] && scope.column.data[scope.column.columnname][0].brandname}}
@@ -81,6 +81,10 @@ export default {
     async listData(){
       this.params.content.sa_contractid = this.$route.query.id
       const res = await this.$api.requested(this.params)
+      res.data = res.data.map(e=>{
+        e.discountrate = e.discountrate * 100
+        return e
+      })
       this.list = res.data
       this.total = res.total
       this.$emit('priceChange')
@@ -118,7 +122,7 @@ export default {
               {
                   "sa_contract_itemsaleclassid": data.sa_contract_itemsaleclassid,
                   "itemclassid": data.itemclassid,
-                  "discountrate": data.discountrate
+                  "discountrate": data.discountrate / 100
               }
           ]
         }

src/HDrpManagement/contractManage/modules/detail.vue

@@ -139,7 +139,7 @@ import addProductDetail from '../components/productDetailList/addProduct'
 import addTool from '../components/toolList/addTool'
 import toolList from '../components/toolList/toolList'
 import addClass from '../components/productClassList/addProduct'
-import productClassList from '../components/productClassList/productClassList'
+import productClassList from '../components/productClassList/productClassList.vue'
 import contractClause from '../components/contractClause/contractClause'
 import editTarget from '../components/taskTarget/editTarget'
 import addTarget from '../components/taskTarget/addTarget'
@@ -149,7 +149,7 @@ import contractOver from '../components/contractOver'
 import reverseCheck from '../components/reverseCheck'
 import revoke from "@/HDrpManagement/contractManage/components/revoke";
 import BaseInfo from '@/HDrpManagement/projectChange/modules/modules/baseInfo/baseInfo'
-import itemClass from '../components/itemClass/index'
+import itemClass from '../components/itemClass/index.vue'
 export default {
   name: "detail",
   data() {

src/HDrpManagement/dispatch/details/index.vue

@@ -73,6 +73,10 @@ import { log } from '@antv/g2plot/lib/utils'
             label:'订单号',
             value:this.mainData.sonum
           },
+          {
+            label:'ERP单号',
+            value:this.mainData.erpbillno
+          },
           {
             label:'发货日期',
             value:this.mainData.billdate

src/HDrpManagement/dispatch/modules/edit.vue

@@ -155,10 +155,12 @@ export default {
         "id": "20221009155803",
         "content": {
           "nocache":true,
+          "pageNumber":1,
+          "pageSize":9999999,
           "sys_enterpriseid":this.data.sys_enterpriseid,
           "where":{
             "condition":"",
-            "workaddress":0
+            "workaddress":1
           }
         }
       })

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -32,6 +32,10 @@
         prop="itemno"
         fixed
         label="产品编码">
+      </el-table-column>
+       <el-table-column
+        prop="erpitemno"
+        label="erp编码">
       </el-table-column>
       <el-table-column
         prop="itemname"

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-button-group v-if="tool.checkAuth($route.name,'editBlueInvioce')" style="margin-bottom:10px">
-      <el-button size="small" type="primary" :disabled="data.status !== '提交' && data.status !== '审核'" @click="addInvoiceapp">一键添加发票</el-button>
-      <el-button size="small" type="primary" :disabled="data.status !== '提交' && data.status != '审核'" @click="addInvoiceapp2">添加发票</el-button>
+      <el-button size="small" type="primary" :disabled="data.status !== '新建' && data.status !== '提交'" @click="addInvoiceapp">一键添加发票</el-button>
+      <el-button size="small" type="primary" :disabled="data.status !== '提交' && data.status != '提交'" @click="addInvoiceapp2">添加发票</el-button>
       <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status !== '提交' && data.status != '审核') || data.byhand !== 0" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
       <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status !== '提交' && data.status != '审核') || data.byhand !== 0" @click="clickInvioceQuery">发票创建查询</el-button>
       <el-button size="small" type="primary" :disabled="selectData.length === 0 ||  (data.status !== '提交' && data.status != '审核')" @click="blueInvioceToRed">红冲勾选行</el-button>
@@ -14,7 +14,7 @@
 
 <script>
 import invoiceTable from './components/invoiceTable.vue'
-import invoiceTablemx from './components/invoiceTablemx'
+import invoiceTablemx from './components/invoiceTablemx.vue'
 
 export default {
   props:['data'],

src/HDrpManagement/orderManage/details/index.vue

@@ -20,6 +20,7 @@
             <el-button v-if="tool.checkAuth($route.name,'changeSaler')" type="primary" slot="input" size="mini" @click="$refs.saler.visible=true;$refs.saler.listData()">变更业务员</el-button>
           </changeSaler>
           <el-button v-if="tool.checkAuth($route.name,'confirmDate') && mainData.status === '交期待确认'"  class="inline-16"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'backconfirmDate') && mainData.status === '交期待确认' || mainData.status === '交期确认'"  class="inline-16"  type="primary" size="mini" @click="backconfirmdate">交期退回</el-button>
           <confirmDate v-if="tool.checkAuth($route.name,'replyDate')" class="inline-16" :data="mainData" @onSuccess="queryMainData"></confirmDate>
           <el-popover
             placement="top"
@@ -412,6 +413,17 @@ export default {
         this.queryMainData()
       })
     },
+    async backconfirmdate () {
+      const res = await this.$api.requested({
+        "id": 20230227160002,
+        "content": {
+          "sa_orderid": this.$route.query.id
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.queryMainData()
+      })
+    },
     async onCopy () {
       const res = await this.$api.requested({
         "id": 20230102144502,

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

@@ -10,7 +10,7 @@
         ref="multipleTable"
         :data="tableData"
         style="width: 100%;"
-        max-height="calc(100vh - 410px)"
+        max-height="410px"
         size="small"
         stripe
         border
@@ -38,6 +38,11 @@
           label="产品编号"
           width="180">
         </el-table-column>
+        <el-table-column
+          prop="erpitemno"
+          label="erp编号"
+          width="180">
+        </el-table-column>
         <el-table-column
             prop="model"
           label="型号/规格"
@@ -47,13 +52,13 @@
           </template>
         </el-table-column>
         <el-table-column
-            prop="qty"
+          prop="qty"
           label="数量"
           width="180">
           <template slot-scope="scope">
             <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-else-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-            <span v-else>{{scope.row.qty}}</span>
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+            <!-- <span v-else>{{scope.row.qty}}</span> -->
           </template>
         </el-table-column>
         <el-table-column

src/HDrpManagement/orderManage/modules/edit.vue

@@ -169,7 +169,7 @@
             <el-option
               v-for="item in saleroptions"
               :key="item.value"
-              :label="item.value"
+              :label="item.remarks"
               :value="item.value">
             </el-option>
           </el-select>

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -181,6 +181,7 @@ export default {
 <style scoped>
 .product-detail{
   height: calc(100vh - 210px);
+  overflow-y: scroll;
   width: 900px;
 }
 .productName{

src/SDrpManagement/Products/modules/ProductDetails.vue

@@ -105,6 +105,7 @@ export default {
 <style scoped>
 .product-detail{
   height: calc(100vh - 210px);
+  overflow-y: scroll;
   width: 900px;
 }
 .productName{

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -289,15 +289,17 @@ export default {
     // 收货信息:合作企业联系人
     async receiveAddress (fn) {
       const res = await this.$api.requested({
-        "id": "20230220002602",
+        "id": "20221009155803",
         "content": {
-          "pageSize":100,
+          "nocache":true,
           "pageNumber":1,
+          "pageSize":9999999,
           "sys_enterpriseid":this.data.sys_enterpriseid,
-          "where": {
-              "condition": ""
+          "where":{
+            "condition":"",
+            "workaddress":1
           }
-        },
+        }
       })
       this.receiveAddresslist = res.data
     },

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -8,7 +8,7 @@
       :data="tableData"
       height="500px"
       style="width: 100%;"
-      max-height="calc(100vh - 410px)"
+      max-height="410px"
       size="small"
       stripe
       border>
@@ -34,6 +34,11 @@
         label="产品编号"
         width="180">
       </el-table-column>
+      <el-table-column
+        prop="erpitemno"
+        label="erp编号"
+        width="180">
+      </el-table-column>
       <el-table-column
         label="型号/规格"
         prop="model">

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -295,13 +295,17 @@ export default {
     // 收货信息:合作企业联系人
     async receiveAddress (fn) {
       const res = await this.$api.requested({
-        "id": "20230220002602",
+        "id": "20221009155803",
         "content": {
-          "pageSize":100,
-          "where": {
-              "condition": ""
+          "nocache":true,
+          "pageNumber":1,
+          "pageSize":9999999,
+          "sys_enterpriseid":this.data.sys_enterpriseid,
+          "where":{
+            "condition":"",
+            "workaddress":1
           }
-        },
+        }
       })
       this.receiveAddresslist = res.data
     },

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -8,7 +8,7 @@
       :data="tableData"
       height="500px"
       style="width: 100%;"
-      max-height="calc(100vh - 410px)"
+      max-height="410px"
       size="small"
       stripe
       border>
@@ -34,6 +34,11 @@
         label="产品编号"
         width="180">
       </el-table-column>
+      <el-table-column
+        prop="erpitemno"
+        label="erp编号"
+        width="180">
+      </el-table-column>
       <el-table-column
         label="型号/规格"
         prop="model">

src/components/selectMenber/staff/list/list.vue

@@ -4,8 +4,8 @@
       <p class="normal-title normal-margin">员工信息</p>
       <slot name="staff"></slot>
     </div>
-    <el-input style="width:270px" placeholder="请输入内容" v-model="param.content.where.condition" class="input-with-select normal-margin" size="small">
-      <el-button slot="append" icon="el-icon-search"  @click="search">查 询</el-button>
+    <el-input style="width:270px" placeholder="请输入内容" v-model="param.content.where.condition" @keyup.native.enter="search" @clear="search" class="input-with-select normal-margin" size="small" clearable>
+      <!-- <el-button slot="append" icon="el-icon-search"  @click="search">查 询</el-button> -->
     </el-input>
     <!-- <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="false" height="calc(100vh - 508px)">
       <template v-slot:opreation="scope">

src/style/style.css

@@ -232,8 +232,3 @@ ul{
   text-decoration: underline;
   cursor: pointer;
 }
-.el-tooltip span,.el-tooltip p{
-  overflow: hidden;
-  white-space: nowrap !important;
-  text-overflow: ellipsis !important;
-}

src/template/selectAgent/index.vue

@@ -51,10 +51,9 @@
           <el-pagination
             background
             small
-            @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-size="param.content.pageSize"
+            :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>
@@ -106,14 +105,13 @@ export default {
         this.param.content.where.condition = data
       }
     },
-    handleSizeChange(val) {
-      // console.log(`每页 ${val} 条`);
-      this.param.content.pageSize = val
-      this.listData()
-    },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.param.content.pageNumber = val
+      if (this.customParam) {
+        this.customParam.content.pageNumber = val
+      } else {
+        this.param.content.pageNumber = val
+      }
       this.listData()
     },
     selectRow (row) {