Althars123 vor 1 Jahr
Ursprung
Commit
cb621329c8
3 geänderte Dateien mit 40 neuen und 181 gelöschten Zeilen
  1. 14 0
      src/router/index.js
  2. 2 2
      src/views/order/info/index.vue
  3. 24 179
      src/views/order/items/item.vue

+ 14 - 0
src/router/index.js

@@ -91,8 +91,22 @@ export const constantRoutes = [
         name: 'Data',
         meta: { title: '字典数据', icon: '' }
       }
+
     ]
   },
+{
+  path: '/order',
+    component: Layout,
+  hidden: true,
+  children: [
+  {
+    path: 'item/data/:orderNo',
+      component: (resolve) => require(['@/views/order/items/item'], resolve),
+    name: 'Data',
+    meta: { title: '订单详情', icon: '' }
+  }
+]
+},
   {
     path: '/job',
     component: Layout,

+ 2 - 2
src/views/order/info/index.vue

@@ -204,10 +204,10 @@
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="生产单号" align="center" prop="orderNo" />
+      <!--<el-table-column label="生产单号" align="center" prop="orderNo" />-->
       <el-table-column label="生产单号" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <router-link :to="'/dict/type/data/' + scope.row.id" class="link-type">
+          <router-link :to="'/order/item/data/' + scope.row.orderNo" class="link-type">
             <span>{{ scope.row.orderNo }}</span>
           </router-link>
         </template>

+ 24 - 179
src/views/order/items/index.vue → src/views/order/items/item.vue

@@ -1,182 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="生产单号" prop="orderNo">
-        <el-input
-          v-model="queryParams.orderNo"
-          placeholder="请输入生产单号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="机组型号" prop="unitModel">
-        <el-input
-          v-model="queryParams.unitModel"
-          placeholder="请输入机组型号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="频率(Hz)" prop="rate">
-        <el-input
-          v-model="queryParams.rate"
-          placeholder="请输入频率(Hz)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="电压(V)" prop="voltage">
-        <el-input
-          v-model="queryParams.voltage"
-          placeholder="请输入电压(V)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="机组功率(kw)" prop="unitPowerKw">
-        <el-input
-          v-model="queryParams.unitPowerKw"
-          placeholder="请输入机组功率(kw)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="机组功率(kva)" prop="unitPowerKva">
-        <el-input
-          v-model="queryParams.unitPowerKva"
-          placeholder="请输入机组功率(kva)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="机组备用功率(kw)" prop="unitPowerKwSpare">
-        <el-input
-          v-model="queryParams.unitPowerKwSpare"
-          placeholder="请输入机组备用功率(kw)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="机组备用功率(kva)" prop="unitPowerKvaSpare">
-        <el-input
-          v-model="queryParams.unitPowerKvaSpare"
-          placeholder="请输入机组备用功率(kva)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="柴油机型号" prop="dieselEngineModel">
-        <el-input
-          v-model="queryParams.dieselEngineModel"
-          placeholder="请输入柴油机型号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="发电机型号" prop="fjd">
-        <el-input
-          v-model="queryParams.fjd"
-          placeholder="请输入发电机型号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="控制器型号" prop="controllerModel">
-        <el-input
-          v-model="queryParams.controllerModel"
-          placeholder="请输入控制器型号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="水套加热器" prop="heater">
-        <el-input
-          v-model="queryParams.heater"
-          placeholder="请输入水套加热器"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="ats" prop="ats">
-        <el-input
-          v-model="queryParams.ats"
-          placeholder="请输入ats"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="断路器" prop="breaker">
-        <el-input
-          v-model="queryParams.breaker"
-          placeholder="请输入断路器"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="电瓶" prop="battery">
-        <el-input
-          v-model="queryParams.battery"
-          placeholder="请输入电瓶"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="机壳颜色" prop="color">
-        <el-input
-          v-model="queryParams.color"
-          placeholder="请输入机壳颜色"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="数量" prop="number">
-        <el-input
-          v-model="queryParams.number"
-          placeholder="请输入数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="零售价" prop="priceRetail">
-        <el-input
-          v-model="queryParams.priceRetail"
-          placeholder="请输入零售价"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采购价" prop="pricePurchase">
-        <el-input
-          v-model="queryParams.pricePurchase"
-          placeholder="请输入采购价"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -217,12 +41,24 @@
           v-hasPermi="['order:items:export']"
         >导出</el-button>
       </el-col>
+
+
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="3">
+        生产单号:{{ this.orderNo }}
+      </el-col>
+      <el-col :span="3">
+        采购总价:{{ this.priceRetail }}
+      </el-col>
+      <el-col :span="3">
+        零售总价:{{ this.pricePurchase }}
+      </el-col>
+    </el-row>
     <el-table v-loading="loading" :data="itemsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+      <!--<el-table-column label="${comment}" align="center" prop="id" />-->
       <el-table-column label="生产单号" align="center" prop="orderNo" />
       <el-table-column label="机组型号" align="center" prop="unitModel" />
       <el-table-column label="频率(Hz)" align="center" prop="rate" />
@@ -346,6 +182,11 @@ export default {
   name: "Items",
   data() {
     return {
+      orderNo:null,
+      //零售
+      priceRetail:null,
+      //采购
+      pricePurchase:null,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -364,6 +205,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -415,12 +257,15 @@ export default {
     };
   },
   created() {
+    const orderNo = this.$route.params && this.$route.params.orderNo;
+    this.orderNo = orderNo;
     this.getList();
   },
   methods: {
     /** 查询订单详情列表 */
     getList() {
       this.loading = true;
+      this.queryParams.orderNo=this.orderNo;
       listItems(this.queryParams).then(response => {
         this.itemsList = response.rows;
         this.total = response.total;