Browse Source

物流单、发货单调整

qymljy 1 month ago
parent
commit
904812593c

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

@@ -133,6 +133,14 @@ import dialogTemplate from "@/components/dialogTemplate/index";
           label:'回签单',
             value:this.mainData.signbackstatus
           },
+          {
+            label:'出货状态',
+            value:this.$t(this.mainData.shipmentstatus),
+            style:function () {
+              let style = that.tool.getStatusColor(that.mainData.shipmentstatus)
+              return style
+            }
+          },
           {
             label:'备注',
             value:this.mainData.remarks

+ 3 - 0
src/HDrpManagement/dispatch/index.vue

@@ -43,6 +43,9 @@
           <div v-if="scope.data.column.columnname == 'status'">
             <span :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])" >{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           </div>
+          <div v-else-if="scope.data.column.columnname == 'shipmentstatus'">
+            <span :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])" >{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          </div>
           <div v-else-if="scope.data.column.columnname == 'sumamount'">
             {{ scope.data.column.data.sumamount ? tool.formatAmount(scope.data.column.data.sumamount,2) : '--' }}
           </div>

+ 15 - 115
src/HDrpManagement/dispatch/modules/productlist.vue

@@ -26,127 +26,27 @@
             <div v-else-if="scope.column.columnname === 'nominalpressure'">
               {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
             </div>
+            <div v-else-if="scope.column.columnname === 'logisticsqty'">
+              {{scope.column.data.logisticsqty?scope.column.data.logisticsqty:scope.column.data.logisticsqty == 0?'0':'--'}}
+            </div>
             <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
           </template>
           <template v-slot:opreation="scope">
             <el-button type="text" size="mini" @click="deleteOrderProduct(scope.data)" :disabled="data.status !== '新建'">{{$t(`删 除`)}}</el-button>
           </template>
         </Table>
-    <!-- <el-table
-      ref="multipleTable"
-      :data="tableData"
-      height="500px"
-      style="width: 100%;"
-      size="small"
-      stripe
-      border>
-      <el-table-column
-        prop="rowno"
-        width="100px"
-        label="发货单行号"
-        fixed>
-      </el-table-column>
-      <el-table-column
-        prop="orderRowno"
-        width="100px"
-        label="订单行号"
-        fixed>
-      </el-table-column>
-      <el-table-column
-        prop="itemname"
-        label="产品名称"
-        fixed>
-      </el-table-column>
-      <el-table-column
-        prop="itemno"
-        fixed
-        label="产品编码">
-      </el-table-column>
-      <el-table-column
-        prop="erpitemno"
-        label="品号"
-        fixed>
-      </el-table-column>
-      <el-table-column
-          prop="model"
-          label="型号"
-          fixed>
-      </el-table-column>
-      <el-table-column
-          prop="spec"
-          label="规格">
-      </el-table-column>
-      <el-table-column
-        prop="unitname"
-        label="单位">
-      </el-table-column>
-      <el-table-column
-        prop="price"
-        label="单价">
-        <template slot-scope="scope">
-          {{tool.formatAmount(scope.row.price,2)}}
-        </template>
-      </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 === '新建'" size="mini" v-model="scope.row.qty" :min="1" :max="scope.row.undeliqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-          <span v-else>{{scope.row.qty}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="amount"
-        label="发货金额">
-      </el-table-column>
-      <el-table-column
-        prop="undeliqty"
-        label="未发货数量"
-        width="100px">
-      </el-table-column>
-      <el-table-column
-          label="备注"
-          width="300"
-          prop="remarks">
-        <template slot-scope="scope">
-          <el-input v-if="data.STATUS === '新建'" v-model="scope.row.remarks" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
-          <p v-else>{{scope.row.remarks}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="suminqty"
-        width="120px"
-        label="erp即时库存">
-      </el-table-column>
-      <el-table-column :label="$t(`操作`)"  width="90" fixed="right">
-        <template slot-scope="scope">
-          <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">{{$t(`删 除`)}}</el-button>
-        </template>
-      </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="param.content.pageNumber"
-        :page-size="param.content.pageSize"
-        layout="total, prev, pager, next, jumper"
-        :total="total">
-      </el-pagination>-->
-      <el-pagination
-          background
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="param.content.pageNumber"
-          :page-sizes="[100, 50, 100, 200]"
-          :page-size="100"
-          layout="total,sizes, prev, pager, next, jumper"
-          :total="total">
-      </el-pagination>
-    </div>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+              background
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="param.content.pageNumber"
+              :page-sizes="[100, 50, 100, 200]"
+              :page-size="100"
+              layout="total,sizes, prev, pager, next, jumper"
+              :total="total">
+          </el-pagination>
+        </div>
       </el-col>
       <el-col :span="24 - setcol">
         <el-drawer

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

@@ -25,7 +25,7 @@
         </div>
         <div slot="slot1" >
           <dispatchTable ref="dispatch" @onInit="onInit" @rowClick="rowClick" :needQuery="true"></dispatchTable>
-          <dismx ref="dismx"></dismx>
+          <dismx ref="dismx" style="margin-top: 10px"></dismx>
         </div>
         <div  slot="slot2">
           <addBox v-if="tool.checkAuth($route.name,'addBoxInfo') && mainData.status == '新建'" class="mt-10" @onSuccess="onBoxSuccess"></addBox>

+ 20 - 61
src/HDrpManagement/logistics/modules/dispatchTable.vue

@@ -1,65 +1,20 @@
 <template>
 <div>
-  <el-table
-    class="mt-10"
-    :data="tableData"
-    style="width: 100%"
-    size="mini"
-    border
-    @row-click="rowClick">
-    <el-table-column
-      type="selection"
-      width="55">
-    </el-table-column>
-    <el-table-column
-      prop="billno"
-      :label="$t(`发货单号`)">
-    </el-table-column>
-    <el-table-column
-      prop="sonum"
-      :label="$t('订单号')">
-    </el-table-column>
-    <el-table-column
-      prop="enterprisename"
-      :label="$t(`企业名称`)">
-    </el-table-column>
-    <el-table-column
-      prop="name"
-      :label="$t(`收货人`)">
-    </el-table-column>
-    <el-table-column
-      prop="phonenumber"
-      :label="$t(`收货人联系电话`)">
-    </el-table-column>
-    <el-table-column
-      prop="province"
-      :label="$t('省市县')">
-      <template slot-scope="scope" v-if="scope.row.province">
-        {{`${scope.row.province}-${scope.row.city}-${scope.row.county}`}}
-      </template>
-    </el-table-column>
-    <el-table-column
-      prop="address"
-      :label="$t('地址')">
-    </el-table-column>
-    <el-table-column
-      prop="remarks"
-      :label="$t('备注')">
-    </el-table-column>
-    <el-table-column
-      prop="freightstatus"
-      :label="$t(`寄付方式`)">
-    </el-table-column>
-    <el-table-column
-    v-if="type === 'edit' || type === 'add'"
-    fixed="right"
-    :label="$t('操作')"
-    width="90">
-      <template slot-scope="scope">
-      <el-button type="text" @click="deleteDisBill(scope.row)" size="small">{{$t('删 除')}}</el-button>
-      </template>
-    </el-table-column>
-  </el-table>
+  <tableDetail :layout="tablecols" :data="tableData" :opwidth="200" :custom="true" :checkbox="true" @rowClick="rowClick">
+    <template v-slot:customcol="scope">
+      <div v-if="scope.column.columnname === 'shipmentstatus'" :style="{color:tool.getStatusColor(scope.column.data[scope.column.columnname])}">
+        {{scope.column.data[scope.column.columnname]}}
+      </div>
+      <div v-else-if="scope.column.columnname === 'province'" >
+        {{scope.column.data[scope.column.columnname]}}
+        {{`${scope.column.data.province}-${scope.column.data.city}-${scope.column.data.county}`}}
+      </div>
+      <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>
+    </template>
+  </tableDetail>
 </div>
 </template>
 
@@ -68,7 +23,8 @@
     props:['needQuery','type'],
     data() {
       return {
-        tableData: []
+        tableData: [],
+        tablecols:[]
       }
     },
     components:{
@@ -118,6 +74,9 @@
       rowClick (row) {
         this.$emit('rowClick',row)
       }
+    },
+    created() {
+      this.tablecols = this.tool.tabelCol(this.$route.name).deliveryTable.tablecols
     }
   }
 </script>

+ 6 - 0
src/HDrpManagement/logistics/modules/productlist.vue

@@ -51,6 +51,12 @@
           <span>{{scope.row.qty}}</span>
         </template>
       </el-table-column>
+      <el-table-column
+          :label="$t(`未出货数量`)">
+        <template slot-scope="scope">
+          <span>{{scope.row.unlogisticsqty?scope.row.unlogisticsqty:scope.row.unlogisticsqty == 0?'0':'--'}}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="unit"
         :label="$t('计量单位')"

+ 17 - 47
src/template/logisyticCanUseDisBill/index.vue

@@ -2,54 +2,20 @@
   <div>
     <div class="flex-align-center flex-between mt-10">
       <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" :placeholder="$t('搜索')" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>
-      <el-button type="primary" size="small" :disabled="tableSelectData.length === 0" @click="onConfirm">添加选中发货单</el-button>
+      <el-button type="primary" size="small" :disabled="tableSelectData.length === 0" @click="onConfirm">{{$t(`添加选中发货单`)}}</el-button>
     </div>
-    <el-table
-      :data="tableData"
-      style="width: 100%"
-      size="mini"
-      @selection-change="selectionChange"
-      border>
-      <el-table-column
-        type="selection"
-        width="55">
-      </el-table-column>
-      <el-table-column
-        prop="billno"
-        :label="$t(`发货单号`)">
-      </el-table-column>
-      <el-table-column
-        prop="sonum"
-        :label="$t('订单号')">
-      </el-table-column>
-      <el-table-column
-        prop="enterprisename"
-        :label="$t(`企业名称`)">
-      </el-table-column>
-      <el-table-column
-      prop="recheckby"
-      :label="$t(`收货人`)">
-    </el-table-column>
-    <el-table-column
-      prop="contactsphonenumber"
-      :label="$t(`收货人联系电话`)">
-    </el-table-column>
-    <el-table-column
-      prop="province"
-      :label="$t('省市县')">
-      <template slot-scope="scope" v-if="scope.row.province">
-        {{`${scope.row.province}-${scope.row.city}-${scope.row.county}`}}
+    <tableDetail :layout="tablecols" :data="tableData" :opwidth="200" :custom="true" :checkbox="true" @selectionChange="selectionChange">
+      <template v-slot:customcol="scope">
+        <div v-if="scope.column.columnname === 'shipmentstatus'" :style="{color:tool.getStatusColor(scope.column.data[scope.column.columnname])}">
+          {{scope.column.data[scope.column.columnname]}}
+        </div>
+        <div v-else-if="scope.column.columnname === 'province'" >
+          {{scope.column.data[scope.column.columnname]}}
+          {{`${scope.column.data.province}-${scope.column.data.city}-${scope.column.data.county}`}}
+        </div>
+        <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname ==='operation'?scope.column.data[scope.column.columnname] : '--'}}</div>
       </template>
-    </el-table-column>
-    <el-table-column
-      prop="address"
-      :label="$t('地址')">
-    </el-table-column>
-    <el-table-column
-      prop="freightstatus"
-      :label="$t(`寄付方式`)">
-    </el-table-column>
-    </el-table>
+    </tableDetail>
     <div style="margin-top:16px;text-align:right">
       <el-pagination
         background
@@ -86,7 +52,8 @@
                   "condition": ""
               }
             }
-          }
+          },
+          tablecols:[]
         }
       },
       methods:{
@@ -118,6 +85,9 @@
         clearSelection () {
           this.$refs.multipleTable.clearSelection();
         }
+      },
+      created() {
+        this.tablecols = this.tool.tabelCol(this.$route.name).deliveryAddTable.tablecols
       }
     }
   </script>