zhangqiOMG 3 лет назад
Родитель
Сommit
c10b283854

+ 4 - 0
src/HDrpManagement/dispatch/details/index.vue

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

+ 4 - 0
src/HDrpManagement/dispatch/modules/productlist.vue

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

+ 1 - 1
src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/index.vue

@@ -14,7 +14,7 @@
 
 
 <script>
 <script>
 import invoiceTable from './components/invoiceTable.vue'
 import invoiceTable from './components/invoiceTable.vue'
-import invoiceTablemx from './components/invoiceTablemx'
+import invoiceTablemx from './components/invoiceTablemx.vue'
 
 
 export default {
 export default {
   props:['data'],
   props:['data'],

+ 12 - 0
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>
             <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>
           </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,'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>
           <confirmDate v-if="tool.checkAuth($route.name,'replyDate')" class="inline-16" :data="mainData" @onSuccess="queryMainData"></confirmDate>
           <el-popover
           <el-popover
             placement="top"
             placement="top"
@@ -412,6 +413,17 @@ export default {
         this.queryMainData()
         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 () {
     async onCopy () {
       const res = await this.$api.requested({
       const res = await this.$api.requested({
         "id": 20230102144502,
         "id": 20230102144502,

+ 0 - 5
src/style/style.css

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