Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue

@@ -171,7 +171,7 @@
           </template>
         </el-table-column>
         <el-table-column :selectable="checkboxT" type="selection" width="55" />
-        <el-table-column show-overflow-tooltip prop="check_code" width="130" label="订单编码">
+        <el-table-column show-overflow-tooltip prop="check_code" width="130" label="单据号">
           <template slot-scope="scope">
             <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.check_code }}</el-link>
           </template>

lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue

@@ -35,7 +35,7 @@
         @row-click="clcikRow"
       >
         <el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
-        <el-table-column show-overflow-tooltip prop="bill_code" label="入库单号" align="center" />
+        <el-table-column show-overflow-tooltip prop="bill_code" label="单据号" align="center" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />

lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue

@@ -105,7 +105,7 @@
         @current-change="handleDtlCurrentChange"
       >
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="bill_code" label="出入库单号" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="bill_code" label="单据号" align="center" />
         <el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />

lms/nladmin-ui/src/views/wms/st/inbill/index.vue

@@ -16,7 +16,7 @@
               v-model="query.bill_code"
               size="mini"
               clearable
-              placeholder="入库单号"
+              placeholder="单据号"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>

lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue

@@ -35,7 +35,7 @@
         @current-change="handleDtlCurrentChange"
       >
         <el-table-column prop="bill_status" label="状态" align="center" width="110px" :formatter="bill_statusFormat" />
-        <el-table-column show-overflow-tooltip prop="bill_code" label="出库单号" align="center" />
+        <el-table-column show-overflow-tooltip prop="bill_code" label="单据号" align="center" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />

lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue

@@ -106,7 +106,7 @@
         @current-change="handleDtlCurrentChange"
       >
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column prop="bill_code" label="出库单号" align="center" width="120"/>
+        <el-table-column prop="bill_code" label="单据号" align="center" width="120"/>
         <el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
         <el-table-column min-width="140" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />

lms/nladmin-ui/src/views/wms/st/outbill/index.vue

@@ -16,7 +16,7 @@
               v-model="query.bill_code"
               size="mini"
               clearable
-              placeholder="出库单号"
+              placeholder="单据号"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
@@ -214,7 +214,7 @@
           </template>
         </el-table-column>
         <el-table-column :selectable="checkboxT" type="selection" width="55" />
-        <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据编码">
+        <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
           </template>