codeMan 2 lat temu
rodzic
commit
6eb6e3e80e

+ 1 - 1
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:'',

+ 3 - 3
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>
@@ -273,7 +273,7 @@ export default {
         },
         {
           label:'销售分类',
-          value:this.mainData.saletype
+          value:this.mainData.saletype + '--' + this.mainData.saletyperemarks
         },
         {
           label:'备注',

+ 1 - 1
src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -49,7 +49,7 @@
           <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

+ 1 - 1
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"