代码合并

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

@@ -134,7 +134,11 @@
         @select-all="onSelectAll"
       >
         <el-table-column 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>
+        </el-table-column>
         <el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
         <el-table-column prop="stor_name" label="仓库" width="100" />
         <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
@@ -155,6 +159,7 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
   </div>
 </template>
 
@@ -167,10 +172,11 @@ import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
 import crudOutchargefrom from '@/views/wms/st/outcharge/outcharge'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import ViewDialog from '@/views/wms/st/outbill/ViewDialog'
 
 export default {
   name: 'Outcharge',
-  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker, ViewDialog },
   cruds() {
     return CRUD({
       title: '出库冲销',
@@ -196,6 +202,8 @@ export default {
       },
       billType: null,
       storlist: [],
+      mstrow: {},
+      viewShow: false,
       currentRow: null,
       createtypelist: [],
       statuslist: []
@@ -210,6 +218,10 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    toView(index, row) {
+      this.mstrow = row
+      this.viewShow = true
+    },
     create_modeFormat(row, column) {
       return this.dict.label.ST_CREATE_MODE[row.create_mode]
     },