Ver Fonte

物流单发货单调整

qymljy há 5 meses atrás
pai
commit
2f3b86fcce

+ 1 - 1
src/HDrpManagement/dispatch/details/index.vue

@@ -22,7 +22,7 @@
         <confirmSelection class="inline-16" v-if="tool.checkAuth($route.name,'revocation') && mainData.status == '提交'" btnTitle="撤回" :disabled="mainData.status !== '提交'" btnType="primary" content="是否确定撤回发货单" confirmButtonText="确定" cancelButtonText="取消" paramId="2024120915580002" idName="sa_dispatchid" @onSuccess="onSuccess"></confirmSelection>
         <el-button style="margin-left: 0px" type="primary"  class="inline-16" size="mini"  v-if="tool.checkAuth($route.name,'check') && mainData.status !== '复核' && mainData.status !== '关闭'"  @click="onCheck">{{mainData.status === '审核'?$t('反审核'):mainData.status === '复核'?$t('反审核'):$t('审核')}}</el-button>
         <el-button style="margin-left: 0px"  class="inline-16" :type="mainData.status !== '审核' && mainData.status !== '复核'?'':'primary'" size="mini" v-if="tool.checkAuth($route.name,'recheck') && mainData.status !== '关闭' && dispatch_recheck != 0" :disabled="mainData.status !== '审核' && mainData.status !== '复核'" @click="onReCheck">{{mainData.status === '复核'?$t('反复核'):$t('复核')}}</el-button>
-        <el-button type="primary" v-if="mainData.status == '审核' && tool.checkAuth($route.name,'close')" size="mini" @click="onClose" style="margin-left: 0px" class="inline-16" >{{$t('关 闭')}}</el-button>
+        <el-button type="primary" v-if="(mainData.status == '审核' || mainData.status == '复核') && tool.checkAuth($route.name,'close')" size="mini" @click="onClose" style="margin-left: 0px" class="inline-16" >{{$t('关 闭')}}</el-button>
         <el-button :type="mainData.status != '新建' && mainData.status != '关闭'?'':'primary'" size="mini" @click="onDel" style="margin-left: 0px" class="inline-16" :disabled="mainData.status != '新建' && mainData.status != '关闭'">{{$t('删 除')}}</el-button>
       </div>
       <div slot="slot2" >

+ 1 - 1
src/HDrpManagement/logistics/details/index.vue

@@ -24,7 +24,7 @@
           <defalutInfo :mainData="mainData" ref="info"></defalutInfo>
         </div>
         <div slot="slot1" >
-          <dispatchTable ref="dispatch" @onInit="onInit" @rowClick="rowClick" :needQuery="true"></dispatchTable>
+          <dispatchTable ref="dispatch" @onInit="onInit" @rowClick="rowClick" :needQuery="true" :status="mainData.status"></dispatchTable>
           <dismx ref="dismx" style="margin-top: 10px" type="edit" :status="mainData.status" :logistics_qty_editable="logistics_qty_editable"></dismx>
         </div>
         <div  slot="slot2">

+ 2 - 2
src/HDrpManagement/logistics/modules/dispatchTable.vue

@@ -12,7 +12,7 @@
       <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname ==='operation'?scope.column.data[scope.column.columnname] : '--'}}</div>
     </template>
     <template v-slot:opreation="scope">
-      <el-button type="text" @click="deleteDisBill(scope.data)" size="small">{{$t('删 除')}}</el-button>
+      <el-button type="text" @click="deleteDisBill(scope.data)" size="small" :disabled="status != '新建'">{{$t('删 除')}}</el-button>
     </template>
   </tableDetail>
 </div>
@@ -20,7 +20,7 @@
 
 <script>
   export default {
-    props:['needQuery','type'],
+    props:['needQuery','type','status'],
     data() {
       return {
         tableData: [],

+ 1 - 1
src/HDrpManagement/logistics/modules/productlist.vue

@@ -67,7 +67,7 @@
       </el-table-column>
       <el-table-column v-if="type === 'edit'" width="90" fixed="right" :label="$t('操作')">
         <template slot-scope="scope">
-          <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">{{$t('删 除')}}</el-button>
+          <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)" :disabled="!logistics_qty_editable || status != '新建'">{{$t('删 除')}}</el-button>
         </template>
       </el-table-column>
     </el-table>