Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/dispatch/details/index.vue

@@ -10,7 +10,7 @@
         idname="sa_dispatchid"
         ownertable="sa_dispatch"
         tags=""
-        :tabs="['发货明细','基础信息']"
+        :tabs="['发货明细','erp上传信息','基础信息']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -21,12 +21,15 @@
         <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '新建' && mainData.STATUS !== '审核'" @click="onCheck">{{mainData.STATUS === '审核'?'反审':mainData.STATUS === '复核'?'反审':'审核'}}</el-button>
         <el-button  class="inline-16" type="primary" size="mini" v-if="tool.checkAuth($route.name,'recheck')" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'" @click="onReCheck">{{mainData.STATUS === '复核'?'反复核':'复核'}}</el-button>
       </div>
-      <div slot="slot1" >
+      <div slot="slot2" >
         <default-info :mainData="mainData"></default-info>
       </div>
       <div slot="slot0" >
         <product-list ref="product" :data="mainData"></product-list>
       </div>
+      <div slot="slot1" >
+        <erpInfo ref="erp" :data="mainData"></erpInfo>
+      </div>
     </basicDetails>
   </div>
 </template>
@@ -34,8 +37,8 @@
 <script>
 import Edit from '../modules/edit'
 import productList from '../modules/productlist.vue'
+import erpInfo from '../modules/erpInfo.vue'
 import defaultInfo from '../modules/defaultInfo.vue'
-import { log } from '@antv/g2plot/lib/utils'
   export default {
     name: "detail",
     data() {
@@ -47,7 +50,8 @@ import { log } from '@antv/g2plot/lib/utils'
     components:{
       Edit,
       productList,
-      defaultInfo
+      defaultInfo,
+      erpInfo
     },
     methods:{
       async queryMainData(id) {

src/HDrpManagement/dispatch/modules/erpInfo.vue

@@ -0,0 +1,116 @@
+<template>
+  <div>
+    <el-row :gutter="10">
+      <el-col :span="setcol">
+      <div class="flex-align-center">
+      </div>
+    <el-table
+      ref="multipleTable"
+      :data="tableData"
+      height="500px"
+      style="width: 100%;"
+      size="small"
+      stripe
+      border>
+      <!-- <el-table-column
+        type="selection"
+        width="55"
+        align="center">
+      </el-table-column> -->
+      <el-table-column
+        prop="erpbillno"
+        label="erp单号">
+      </el-table-column>
+      <el-table-column
+        prop="request"
+        width="100px"
+        label="推送人">
+      </el-table-column>
+      <el-table-column
+        prop="createdate"
+        fixed
+        label="推送时间">
+      </el-table-column>
+       <el-table-column
+        prop="status"
+        label="返回状态">
+      </el-table-column>
+      <el-table-column
+        prop="errmsg"
+        label="错误信息">
+      </el-table-column>
+      <el-table-column
+        prop="type"
+        label="类型">
+      </el-table-column>
+    </el-table>
+    <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>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data'],
+  components:{},
+  data () {
+    return {
+      tableData:[],
+      drawer:false,
+      setcol:24,
+      param:{
+        "id": 20230228133403,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+              "condition": ""
+          }
+        },
+      },
+      total:0,
+      currentPage:0,
+      time: null
+    }
+  },
+  methods:{
+    async listData () {
+      this.param.content.sa_dispatchid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(res.data);
+      
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/invoiceapp/detail/tab/redInvoice/components/invoiceTable.vue

@@ -48,8 +48,8 @@
         label="操作"
         width="190">
         <template slot-scope="scope">
-          <a class="table_row_link inline-16" :href="scope.row.paperpdfurl">纸票pdf</a>
-          <a class="table_row_link inline-16" :href="scope.row.pdfurl">发票pdf</a>
+          <a class="table_row_link inline-16" v-if="scope.row.paperpdfurl" :href="scope.row.paperpdfurl">纸票pdf</a>
+          <a class="table_row_link inline-16" v-if="scope.row.pdfurl" :href="scope.row.pdfurl">发票pdf</a>
           <el-button v-if="tool.checkAuth($route.name,'editRedInvioce')" @click="deleteRow(scope.row)" type="text" size="mini">删 除</el-button>
         </template>
       </el-table-column>

src/HDrpManagement/orderManage/details/index.vue

@@ -295,6 +295,10 @@ export default {
           label:'开票状态',
           value:this.mainData.invoicestatus
         },
+        {
+          label:'erp单号',
+          value:this.mainData.erperpbillno
+        },
         {
           label:'项目备注',
           value:this.mainData.projectnote

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

@@ -12,6 +12,7 @@
       :header-cell-style="{height:'50px',color:'#768093',fontWeight:'400'}"
       :cell-style="{height:'50px',color:'#768093',fontWeight:'400'}"
       size="mini"
+      height="calc(100vh - 260px)"
       border
       @selection-change="selectionChange">
       <el-table-column
@@ -29,6 +30,22 @@
         label="编码"
         width="180">
       </el-table-column>
+      <el-table-column
+        prop="erpitemname"
+        label="品名"
+        width="180">
+        <template slot-scope="scope">
+          {{ scope.row.erpitemname ? scope.row.erpitemname : '--' }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="erpitemno"
+        label="品号"
+        width="180">
+        <template slot-scope="scope">
+          {{ scope.row.erpitemno ? scope.row.erpitemno : '--' }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="型号"
         width="180">
@@ -183,7 +200,7 @@ export default {
 .image {
   width:40px;height:40px;margin:0px auto;
 }
-/deep/.el-table {
-  height: calc(100vh - 180px) !important;
+.el-table__fixed, .el-table__fixed-right{
+height: calc(100% - 20px) !important;
 }
 </style>

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

@@ -10,6 +10,7 @@
         ref="multipleTable"
         :data="tableData"
         size="small"
+        height="calc(100vh - 500px)"
         stripe
         border
         @selection-change	="selectionChange">
@@ -90,9 +91,8 @@
               value-format="yyyy-MM-dd"
               size="mini"
               style="width:150px"
-              :picker-options="pickerOptions"
-              @change="rowChange(scope.row)"
-              @focus="setPickerOptions(scope.row)">
+              :picker-options="pickerOptions1"
+              @change="rowChange(scope.row)">
             </el-date-picker>
             <div v-else>
               <p v-if="scope.row.delivery === 0 ">不管控交期</p>
@@ -148,16 +148,16 @@
             <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</el-tag>
           </template>
         </el-table-column>
-        <!-- <el-table-column
+        <el-table-column
           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-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>
+            <!-- <span v-else>{{scope.row.qty}}</span> -->
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column
           prop="marketprice"
           label="牌价"
@@ -205,21 +205,16 @@
             <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.amount,2)}}</p>
           </template>
         </el-table-column>
-        <el-table-column
-            prop="cansaleqty"
-            label="库存数量"
-            width="100">
-        </el-table-column>
-        <el-table-column
-            prop="stockstatus"
-            label="库存状态"
-            width="100">
-        </el-table-column>
         <el-table-column
           prop="undeliqty"
           label="未发货数量"
           width="100">
         </el-table-column>
+        <el-table-column
+          prop="stockstatus"
+          label="库存状态"
+          width="100">
+        </el-table-column>
         <el-table-column
           prop="invoiceamount"
           label="已开票金额"
@@ -230,17 +225,6 @@
           label="已核销金额"
           width="100">
         </el-table-column>
-        <el-table-column
-          prop="position"
-          label="仓位"
-          width="100">
-        </el-table-column>
-        <el-table-column
-          prop="batchno"
-          label="批号"
-          width="100">
-        </el-table-column>
-
         <el-table-column
           label="备注"
           width="300"
@@ -313,9 +297,14 @@ export default {
           }
         },
       },
+      pickerOptions1: {
+        disabledDate(time) {
+          return time.getTime() < new Date().getTime() - 24 * 60 * 60 * 1000;
+        },
+      },
       pickerOptions: {
         disabledDate(time) {
-          return time.getTime() < (Date.now() - 24 * 3600 * 1000);
+          return time.getTime() < (Date.now() - 48 * 3600 * 1000);
         },
       },
       total:0,
@@ -426,14 +415,25 @@ export default {
       this.listData()
     },
     setPickerOptions (val) {
-      var startDate = val.deliverydate
-      startDate = startDate.replace(new RegExp("-","gm"),"/")
-      var startDateM = (new Date(startDate)).getTime()
-      this.pickerOptions = {
-        disabledDate(time) {
-          return time.getTime() < startDateM;
-        },
+      /* 如果设置需求日 交期不能大于需求日 */
+      if (val.needdate) {
+        var startDate = val.needdate
+        startDate = startDate.replace(new RegExp("-","gm"),"/")
+        var startDateM = (new Date(startDate)).getTime()
+        this.pickerOptions = {
+          disabledDate(time) {
+            return time.getTime() > startDateM;
+          },
+        }
+      /* 否则不能小于今天 */
+      } else {
+        this.pickerOptions = {
+          disabledDate(time) {
+            return time.getTime() < new Date().getTime() - 24 * 60 * 60 * 1000;
+          },
+        }
       }
+      
     },
     async dateChange (row) {
       this.tableData = this.tableData.filter(e=>{
@@ -495,5 +495,7 @@ export default {
 
 </script>
 <style scoped>
-
+/deep/.el-table__fixed, .el-table__fixed-right{
+height: calc(100% - 20px) !important;
+}
 </style>

src/SDrpManagement/salerOrder/details/index.vue

@@ -24,7 +24,7 @@
         <default-info :mainData="mainData"></default-info>
       </div>
       <div slot="slot0">
-        <product-list :data="mainData" ref="prod"></product-list>
+        <product-list :data="mainData" @onSuccess="queryMainData($route.query.id)" ref="prod"></product-list>
       </div>
       <div slot="slot2">
         <orderprogress ref="prod"></orderprogress>

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -389,6 +389,7 @@ export default {
     },
     onEditSuccess () {
       this.$refs.prolist.listData()
+      this.$emit('onSuccess')
     },
     addMoreProduct () {
       this.setcol === 12?this.setcol = 24 : this.setcol = 12

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -56,7 +56,7 @@
             controls-position='right' 
             :step-strictly="true" 
             v-if="data.status === '新建'" size="mini" 
-            v-model="scope.row.qty" :min="scope.row.orderminqty" :max="scope.row.undeliqty" :step="scope.row.orderaddqty" label="输入数量" @change="qtyChange(scope.row,scope.$index)"></el-input-number>
+            v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="qtyChange(scope.row,scope.$index)"></el-input-number>
           <span v-else>{{scope.row.qty}}</span>
         </template>
       </el-table-column>
@@ -354,7 +354,7 @@ export default {
         "id": 20221109093602,
         "content": val
       })
-      // this.$emit('onSuccess')
+      this.$emit('onSuccess')
     },
     setPickerOptions (val) {
       var startDate = val.deliverydate