订单模块优化

src/views/mes/order/purchase/index.vue

@@ -77,27 +77,9 @@
       <el-table-column label="来源文件" prop="source" />
       <el-table-column label="操作" class-name="small-padding fixed-width" width="200">
         <template slot-scope="{row}">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-search"
-            @click="onShowDetail(row)"
-            v-hasPermi="['md:order:query']"
-          >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="toSalesEdit(row)"
-            v-hasPermi="['md:order:edit']"
-          >生成订单</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(row)"
-            v-hasPermi="['md:order:remove']"
-          >删除</el-button>
+          <el-button v-hasPermi="['md:order:query']" size="mini" type="text" icon="el-icon-search" @click="onShowDetail(row)">查看</el-button>
+          <el-button v-hasPermi="['md:order:edit']" size="mini" type="text" icon="el-icon-edit" @click="toSalesEdit(row)">生成订单</el-button>
+          <el-button v-hasPermi="['md:order:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -109,11 +91,75 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+    <el-dialog :visible.sync="showDetail" title="采订单详情" width="1200px">
+      <el-table :data="detailList" max-height="600" size="mini">
+        <el-table-column label="客户单号" prop="poOrderNo" show-overflow-tooltip/>
+        <el-table-column label="客户产品代码" prop="poProductName" show-overflow-tooltip/>
+        <el-table-column label="客户产品名称" prop="poProductNo" show-overflow-tooltip/>
+        <el-table-column label="宝绅内部品名" prop="productName" show-overflow-tooltip/>
+        <el-table-column label="客户单位" prop="customerUnit" show-overflow-tooltip/>
+        <el-table-column label="指令号" prop="cmdNo" show-overflow-tooltip/>
+        <el-table-column label="型体号" prop="featureNo" show-overflow-tooltip/>
+        <el-table-column label="配色号" prop="poColorNo" show-overflow-tooltip/>
+        <el-table-column label="客户颜色" prop="poColor" show-overflow-tooltip/>
+        <el-table-column label="客户单重" prop="poKg" show-overflow-tooltip/>
+        <el-table-column label="销线" prop="salePath" show-overflow-tooltip/>
+        <el-table-column label="段别" prop="segment" show-overflow-tooltip/>
+        <el-table-column label="版面" prop="layout" show-overflow-tooltip/>
+        <el-table-column label="季度" prop="quarter" show-overflow-tooltip/>
+        <el-table-column label="整/半码" prop="wholeYard" show-overflow-tooltip/>
+        <el-table-column label="特殊SIZE" prop="specialSize" show-overflow-tooltip/>
+        <el-table-column label="PO号" prop="poNo" show-overflow-tooltip/>
+        <el-table-column label="WIP号" prop="wipNo" show-overflow-tooltip/>
+        <el-table-column label="装箱数" prop="packingNum" show-overflow-tooltip/>
+        <el-table-column label="产地" prop="region" show-overflow-tooltip/>
+        <el-table-column label="周期" prop="cycle" show-overflow-tooltip/>
+        <el-table-column label="SK编号" prop="skNo" show-overflow-tooltip/>
+        <el-table-column label="专利号" prop="patentNo" show-overflow-tooltip/>
+        <el-table-column label="材质描述" prop="materialDesc" show-overflow-tooltip/>
+        <el-table-column label="签收人" prop="" show-overflow-tooltip/>
+        <el-table-column label="shipToId" prop="shipToId" show-overflow-tooltip/>
+        <el-table-column label="交货日期" prop="deliveryDate" show-overflow-tooltip/>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip/>
+        <el-table-column label="尺码组" prop="sizeGroup" show-overflow-tooltip/>
+        <el-table-column label="尺码" prop="size" show-overflow-tooltip/>
+        <el-table-column label="订单量" prop="orderNum" show-overflow-tooltip/>
+        <el-table-column label="条码" prop="barCode" show-overflow-tooltip/>
+        <el-table-column label="印刷方向" prop="printingDirection" show-overflow-tooltip/>
+        <el-table-column label="产品规格" prop="productSize" show-overflow-tooltip/>
+        <el-table-column label="操作">
+          <template slot-scope="{row}">
+            <el-button type="text" @click="onShowSpec(row)">特性值</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer">
+        <el-button @click="showDetail = false">取消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible="showSpec" title="采购详情产品特性值" width="650px">
+      <el-form label-width="100px">
+        <el-row :gutter="10">
+          <el-col :span="12" v-for="spec in specList" :key="spec.specKey">
+            <el-form-item :label="spec.specKey">
+              <el-input v-model="spec.specVal" readonly/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer">
+        <el-button @click="showSpec = false">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { delOrder, listOrder } from '@/api/mes/od/purchaseOrder'
+import { listDetail } from '@/api/mes/od/purchaseOrderDetail'
 import { listClient } from '@/api/mes/md/client'
 
 export default {
@@ -136,8 +182,11 @@ export default {
       // 客户采购订单表格数据
       orderList: [],
       clientList: [],
+      detailList: [],
+      specList: [],
       // 是否显示弹出层
-      open: false,
+      showDetail: false,
+      showSpec: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -185,7 +234,12 @@ export default {
     },
     onShowDetail(row) {
       let id = row ? row.id : this.ids[0]
-      this.$router.push('/order/purchaseEdit?id=' + id)
+      this.showDetail = true
+      listDetail({orderId: id}).then(res => this.detailList = res.rows)
+    },
+    onShowSpec(row) {
+      this.showSpec = true
+      this.specList = JSON.parse(row.specJson)
     },
     /** 删除按钮操作 */
     handleDelete(row) {

src/views/mes/order/sales/index.vue

@@ -112,10 +112,10 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-search"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['od:salesOrder:edit']"
-          >修改
+          >查看
           </el-button>
           <el-button
             size="mini"