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

src/HDrpManagement/dispatch/details/index.vue

@@ -112,6 +112,14 @@ import { log } from '@antv/g2plot/lib/utils'
               return style
             }
           },
+          {
+            label:'发货数量',
+            value:this.mainData.qty
+          },
+          {
+            label:'发货金额',
+            value:this.tool.formatAmount(this.mainData.sumamount,2),
+          },
           {
             label:'运费状态',
             value:this.mainData.freightstatus

src/HDrpManagement/dispatch/modules/edit.vue

@@ -12,6 +12,8 @@
       </div>
     </div>
     <div class="drawer__panel">
+      <div class="normal-margin">发货数量:{{data.qty}}</div>
+      <div class="normal-margin">发货金额:{{tool.formatAmount(data.sumamount,2)}}</div>
       <div class="mt-10">
         <p class="normal-title inline-16">发货时间</p>
         <!-- billdate -->

src/HDrpManagement/invoiceapp/modules/add.vue

@@ -97,7 +97,7 @@ export default {
         sa_invoiceapplyid:0,
         remarks:'',
         byhand:false,
-        invoiceline:'p',
+        invoiceline:'s',
         quota:"10000000",
       },
       accountAmount:'',

src/HDrpManagement/orderManage/details/index.vue

@@ -14,8 +14,8 @@
         :tabs="['订单明细','基本信息','订单进度','居间费明细','发货单','物流单','发票记录','收支明细','核销记录','erp对接记录','变更记录']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
-        <div slot="customOperation" class="inline-16">
-          <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
+        <div slot="customOperation" class="inline-16" v-if="Object.keys(mainData).length > 0">
+          <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && (mainData.status == '新建' || mainData.status == '提交')" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
           <changeSaler class="inline-16" ref="saler" @selectRow="salerChange">
             <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>
@@ -40,7 +40,7 @@
               <el-button size="mini" type="text" @click="visible = false">取消</el-button>
               <el-button  type="primary" size="mini" @click="onSubmit('审核')">确定</el-button>
             </div>
-            <el-button class="inline-16" @click="visible=true" v-if="tool.checkAuth($route.name,'examine') && mainData.status === '提交'"   type="primary" size="mini" slot="reference">审 核</el-button>
+            <el-button :disabled="mainData.status !== '提交' && mainData.status !== '交期确认'" class="inline-16" @click="visible=true" v-if="tool.checkAuth($route.name,'examine')"   type="primary" size="mini" slot="reference">审 核</el-button>
           </el-popover>
           <el-button v-if="tool.checkAuth($route.name,'examine') && mainData.status === '审核'"  type="primary" size="mini" @click="onReturnCheck">反审核</el-button>
           <el-button v-if="tool.checkAuth($route.name,'reback') && mainData.status === '提交'"  type="primary" size="mini" @click="dialogVisible = true">退 回</el-button>
@@ -273,7 +273,7 @@ export default {
         },
         {
           label:'销售分类',
-          value:this.mainData.saletype
+          value:this.mainData.saletype + '--' + this.mainData.saletyperemarks
         },
         {
           label:'备注',

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

@@ -9,7 +9,8 @@
       <el-table
         ref="multipleTable"
         :data="tableData"
-        style="width: 100%;height:calc(100vh - 410px)"
+        style="width: 100%;"
+        max-height="calc(100vh - 410px)"
         size="small"
         stripe
         border
@@ -51,8 +52,13 @@
           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>
+<<<<<<< HEAD
             <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> -->
+>>>>>>> xiaoqin
           </template>
         </el-table-column>
         <el-table-column
@@ -70,7 +76,7 @@
                 align="right"
                 type="date"
                 size="mini"
-                placeholder="一键填写"
+                placeholder="一键填写需求日期"
                 @change="dateChangeNeed">
               </el-date-picker>
               <span v-else>需求日期</span>
@@ -110,7 +116,7 @@
                 align="right"
                 type="date"
                 size="mini"
-                placeholder="一键交期"
+                placeholder="一键回复交期"
                 @change="dateChange">
               </el-date-picker>
               <span v-else>回复交期</span>

src/HDrpManagement/orderManage/modules/confirmDate.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-    <el-button type="primary" size="mini" @click="onShow(drawer = true)">回复交期</el-button>
+    <el-button :disabled="data.status !== '提交'" type="primary" size="mini" @click="onShow(drawer = true)">回复交期</el-button>
     <el-drawer
     :visible.sync="drawer"
     direction="rtl"

src/HDrpManagement/orderManage/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button v-if="data.status ==='新建'"  type="primary" size="mini" @click="onShow(drawer = true)">编 辑</el-button>
+    <el-button  type="primary" size="mini" @click="onShow(drawer = true)">编 辑</el-button>
     <!-- <el-button type="primary" size="mini" @click="onShow(drawer = true)">编 辑</el-button> -->
     <el-drawer
     :visible.sync="drawer"

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -7,7 +7,8 @@
       ref="multipleTable"
       :data="tableData"
       height="500px"
-      style="width: 100%;height:calc(100vh - 410px)"
+      style="width: 100%;"
+      max-height="calc(100vh - 410px)"
       size="small"
       stripe
       border>

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -7,7 +7,8 @@
       ref="multipleTable"
       :data="tableData"
       height="500px"
-      style="width: 100%;height:calc(100vh - 410px)"
+      style="width: 100%;"
+      max-height="calc(100vh - 410px)"
       size="small"
       stripe
       border>

src/SDrpManagement/sinvoiceapp/modules/add.vue

@@ -14,8 +14,14 @@
           <el-form :model="form" :rules="rules" ref="form" class="demo-form-inline" size="small" label-position="right" label-width="80px">
             <!-- <el-col :span="12">
               <p class="normal-title normal-margin">经销商信息</p>
-              <el-form-item label="经销商" prop="enterprisename">
-                <el-input readonly slot="reference" v-model="form.enterprisename" @focus="queryAgent" suffix-icon="el-icon-arrow-down" placeholder="经销商"></el-input>
+              <el-form-item label="经销商">
+                <el-popover
+                  placement="bottom"
+                  trigger="click"
+                  v-model="visible">
+                  <invoiceCanUseAgent ref="UseAgent" @selectRow="selectRow"></invoiceCanUseAgent>
+                  <el-input readonly slot="reference" v-model="form.enterprisename" @focus="queryAgent" placeholder="经销商"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col> -->
             <el-col :span="24">