3

src/views/order/orderList/orderList.vue

@@ -2,42 +2,9 @@
   <div class="app-container">
 
     <div class="filter-container">
-
-      <el-input :size="sizeType" v-model.trim="search.keyWord" placeholder="关键字" style="width: 200px;"
-                class="filter-item"/>
-
-      <el-button :size="sizeType" class="filter-item" type="primary" icon="el-icon-search" @click="searchData">
-        搜索
-      </el-button>
-
-      <el-button
-        class="filter-item"
-        type="green"
-        icon="el-icon-plus"
-        :size="sizeType"
-        @click="createOrderFun">
-        创建订单
-      </el-button>
-      <el-button :size="sizeType" type="warning" @click="combinedQuery = !combinedQuery">组合查询</el-button>
-      <el-card class="box-card" v-if="combinedQuery">
         <el-form :size="sizeType" ref="searchForm" :model="searchForm">
-          <el-row :gutter="20">
-            <el-col :span="6">
-              <el-form-item prop="orderCode">
-                <el-input placeholder="订单编号" :size="sizeType" v-model.trim="searchForm.orderCode"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item prop="clientName">
-                <el-input placeholder="客户名称" :size="sizeType" v-model.trim="searchForm.clientName"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item prop="orderName">
-                <el-input placeholder="订单名称" :size="sizeType" v-model.trim="searchForm.orderName"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
+          <el-row :gutter="15">
+            <el-col :span="5.5">
               <el-form-item prop="orderCode">
                 <el-date-picker
                   :size="sizeType"
@@ -52,30 +19,25 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item prop="createMan">
-                <el-input placeholder="制单人" :size="sizeType" v-model.trim="searchForm.createMan"></el-input>
+            <el-col :span="2">
+            <el-input :size="sizeType" v-model.trim="search.keyWord" placeholder="关键字" ></el-input>
+            </el-col>
+            <el-col :span="2">
+              <el-form-item prop="orderCode">
+                <el-input placeholder="订单编号" :size="sizeType" v-model.trim="searchForm.orderCode"></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20" style="margin-bottom: 0px">
-            <el-col :span="6">
-              <el-form-item label="产品类型" prop="idProduct">
-                <el-select v-model="searchForm.idProduct" :size="sizeType" filterable placeholder="产品类型" value-key="id">
-                  <el-option
-                    label="全部"
-                    value="-1">
-                  </el-option>
-                  <el-option
-                    v-for="item in productList"
-                    :key="item.id"
-                    :label="item.productName"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
+            <el-col :span="2">
+              <el-form-item prop="clientName">
+                <el-input placeholder="客户名称" :size="sizeType" v-model.trim="searchForm.clientName"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="2">
+              <el-form-item prop="orderName">
+                <el-input placeholder="订单名称" :size="sizeType" v-model.trim="searchForm.orderName"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
               <el-form-item label="订单状态" prop="voidFlag">
                 <el-select v-model="searchForm.voidFlag" :size="sizeType" filterable placeholder="订单状态" value-key="id">
                   <el-option
@@ -97,8 +59,15 @@
             @click="combinedQueryBtn">搜索
           </el-button>
           <el-button style="margin-bottom: 10px" @click="resetForm('searchForm')" :size="sizeType">重置</el-button>
+          <el-button
+            class="filter-item"
+            type="green"
+            icon="el-icon-plus"
+            :size="sizeType"
+            @click="createOrderFun">
+            创建订单
+          </el-button>
         </el-form>
-      </el-card>
       <!--      <el-select v-model="columnSelect" :size="sizeType" clearable placeholder="请选择视图" @change="selectedColumn">-->
       <!--        <el-option-->
       <!--          v-for="item in defaultColumnName"-->
@@ -178,166 +147,61 @@
         </el-table-column>
         <template v-for="column in columnnames">
           <el-table-column
-            v-if="column.id == 3"
+            v-if="column.id == 1"
             :prop="column.field"
             :label="column.name"
             :width="column.width"
-            sortable="custom"
             fixed
             show-overflow-tooltip>
             <template slot-scope="{row}">
-              <a href="javascript:;" style="color: #20a0ff" @click="getOrderStep(row)">{{ row[column.field] }}
-                <span v-if="row.businessKind==3"
-                      style="display: inline-block;color: red">(补{{ row.rePrintIndex }})</span>
-                <el-image v-if="row.firstOrderFlag == 1" :src="new_badge"></el-image>
-              </a>
+              <a v-if="row.idProduct<0" href="javascript:;" style="color: #20a0ff"
+                 @click="openMaterialDetail(row)">{{ row[column.field] }}</a>
+              <a v-else href="javascript:;" style="color: #20a0ff" @click="openDetail(row)">{{ row[column.field] }}</a>
             </template>
           </el-table-column>
           <el-table-column
-            v-else-if="column.id == 22"
+            v-else-if="column.id == 3 || column.id == 2"
             :prop="column.field"
             :label="column.name"
             :width="column.width"
             fixed
             show-overflow-tooltip>
-            <template slot-scope="{row}">
-              <a v-if="row.idProduct<0" href="javascript:;" style="color: #20a0ff"
-                 @click="openMaterialDetail(row)">{{ row[column.field] }}</a>
-              <a v-else href="javascript:;" style="color: #20a0ff" @click="openDetail(row)">{{ row[column.field] }}</a>
-            </template>
           </el-table-column>
           <el-table-column
-            v-else-if="column.id == 2"
+            v-else-if="column.id == 15"
             :prop="column.field"
             :label="column.name"
             :width="column.width"
-            sortable="custom"
             align="left"
             show-overflow-tooltip>
             <template slot-scope="{row}">
-              <el-tag size="mini" v-if="row[column.field] == '待编辑'" type="info">{{ row[column.field] }}</el-tag>
-              <el-tag size="mini" v-else-if="row[column.field] == '待审核'" type="success">{{ row[column.field] }}</el-tag>
-              <el-tag size="mini" v-else-if="row[column.field] == '待组版'">{{ row[column.field] }}</el-tag>
-              <el-tag size="mini" v-else-if="row[column.field] == '已组版'" type="danger">{{ row[column.field] }}</el-tag>
-              <el-tag size="mini" v-else-if="row[column.field] == '未印刷'" type="danger">{{ row[column.field] }}</el-tag>
-              <el-tag
-                size="mini"
-                style="background: #9876aa !important;color: #fff !important"
-                v-else-if="row[column.field] == '已印刷'"
-                type="Success">{{ row[column.field] }}
-              </el-tag>
-              <el-tag size="mini" v-else-if="row[column.field] == '待入库'" type="green">{{ row[column.field] }}</el-tag>
-              <el-tag size="mini" v-else-if="row[column.field] == '待发货'">{{ row[column.field] }}</el-tag>
-              <el-tag size="mini" v-else-if="row[column.field] == '已发货'" type="info">{{ row[column.field] }}</el-tag>
-              <el-tag size="mini" v-else-if="row[column.field] == '文件待处理'" type="warning">{{
-                  row[column.field]
-                }}
-              </el-tag>
+              <el-tag size="mini" v-if="row[column.field] == '0'" type="info">待审核</el-tag>
+              <el-tag size="mini" v-else-if="row[column.field] == '1'" type="success">已审核</el-tag>
+              <el-tag size="mini" v-else-if="row[column.field] == '2'" type="danger">已作废</el-tag>
               <el-button size="mini" class="button-new-tag" v-else>{{ row[column.field] }}</el-button>
             </template>
           </el-table-column>
           <el-table-column
-            v-else-if="column.id == 6"
-            header-align="center"
-            :prop="column.field"
-            :label="column.name"
-            show-overflow-tooltip
-            :width="column.width">
-            <template slot-scope="{row}">
-              <template v-if="row.orderMessage">
-                <el-button size="mini" circle icon="el-icon-plus" @click="openMessage(row)"></el-button>
-                <a href="javascript:;" style="color: #20a0ff" @click="openMessage(row)">{{ row.orderMessage }}</a>
-              </template>
-              <template v-else>
-                <el-button size="mini" circle icon="el-icon-plus" @click="openMessage(row)"></el-button>
-              </template>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-else-if="column.id == 11"
-            header-align="center"
-            :prop="column.field"
-            :label="column.name"
-            :width="column.width"
-            show-overflow-tooltip
-          >
-            <template slot-scope="{row}">
-              <el-link :href="row.originFileLink" target="_blank" style="color: #20a0ff">{{ row[column.field] }}
-              </el-link>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-else-if="column.id == 12"
-            align="center"
-            header-align="center"
-            :prop="column.field"
-            :label="column.name"
-            :width="column.width"
-            sortable="custom"
+              v-else-if="column.id == 14"
+              :label="column.name"
+              :prop="column.field"
+              :width="column.width"
+              align="center"
+              header-align="center"
+              sortable="custom"
           >
             <template slot-scope="{row}">
               <span v-if="row.createTime">{{ row.createTime | getTime }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            v-else-if="column.id == 24"
-            align="center"
-            header-align="center"
-            :prop="column.field"
-            :label="column.name"
-            :width="column.width"
-          >
-            <template slot-scope="{row}">
-              <el-tag size="mini" type="primary" v-if="row[column.field] == 0">正常业务</el-tag>
-              <el-tag size="mini" type="warning" v-else-if="row[column.field]== 1">外协订单</el-tag>
-              <el-tag size="mini" type="success" v-else-if="row[column.field] == 2">物料订单</el-tag>
-              <el-tag size="mini" type="danger" v-else-if="row[column.field] == 3">补印订单</el-tag>
-              <span v-if="row.traceFlag==1" @click.stop="traceClick(row)" style="cursor: pointer;font-size: 16px"><i class="el-icon-camera"></i></span>
-            </template>
-
-          </el-table-column>
-          <el-table-column
-            v-else-if="column.id == 1 || column.id == 8|| column.id == 10"
-            :prop="column.field"
-            :label="column.name"
-            :width="column.width"
-            sortable="custom"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
-            v-else-if="column.id == 23"
-            header-align="center"
-            :prop="column.field"
-            :label="column.name"
-            :width="column.width"
-            show-overflow-tooltip
-          >
-            <template slot-scope="{row}">
-              <el-link :href="row.attachFileLink" target="_blank" style="color: #20a0ff">{{ row[column.field] }}
-              </el-link>
-            </template>
-          </el-table-column>
-          <el-table-column
             v-else
             :prop="column.field"
             :label="column.name"
             :width="column.width"
             show-overflow-tooltip>
           </el-table-column>
-
         </template>
-        <el-table-column
-          label="操作"
-          align="left"
-          width="100px"
-        >
-          <template slot-scope="{row}">
-            <el-button type="green" v-if="permissionFlag1" size="mini" @click="maintainLifeCycle(row.id)" title="生命周期维护">生命周期
-            </el-button>
-          </template>
-        </el-table-column>
-
-
       </el-table>
       <!--      <span>总计：</span>-->
       <pagination
@@ -346,9 +210,7 @@
         :page.sync="listData.page"
         :limit.sync="listData.pageSize"
         @pagination="getList"/>
-
     </div>
-
     <el-dialog title="自定义列" :visible.sync="columnVisible">
       <el-row :gutter="20">
         <el-col :span="10" :offset="14">
@@ -471,10 +333,6 @@
           </el-form-item>
         </el-form>
       </el-card>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="orderPayVisible = false">取 消</el-button>
-        <el-button type="primary" @click="orderPaySure" :disabled="orderPayLoading">确 定</el-button>
-      </div>
     </el-dialog>
     <el-dialog title="收款单" :close-on-click-modal="false" :visible.sync="paymentBillVisible" width="1000px">
       <el-table :data="paymentBillList" border size="mini">
@@ -725,70 +583,58 @@ const lifeForm = {
 
 const defaultItems = [
   {
-    name: '订单编号', id: 3, field: 'orderCode', width: '132px'
+    name: '订单编号', id: 1, field: 'orderCode', width: '132px'
+  },
+  {
+    name: '印品名称', id: 2, field: 'orderName', width: '100px'
+  },
+  {
+    name: '客户名称', id: 3, field: 'clientName', width: '120'
   },
   {
-    name: '印品名称', id: 22, field: 'orderName', width: '100px'
+    name: '订单状态', id: 15, field: 'orderState', width: ''
   },
   {
-    name: '产品类型', id: 1, field: 'productName', width: '130px'
+    name: '产品类型', id: 4, field: 'productName', width: '130px'
   },
   {
-    name: '业务类型', id: 24, field: 'businessKind', width: '130px'
+    name: '订单数量', id: 5, field: 'printQty', width: '120'
   },
   {
-    name: '制单时间', id: 12, field: 'createTime', width: '160'
+    name: '单价', id: 6, field: 'printPrice', width: '100'
   },
   {
-    name: '订单状态', id: 2, field: 'stateMemo', width: ''
+    name: '订单金额', id: 7, field: 'printMoneyTotal', width: '100'
   },
-  // {
-  //   name: '应收单号', id: 4, field: 'financeCode', width: '125px'
-  // },
   {
-    name: '施工单号', id: 5, field: 'printBillCode', width: '90px'
+    name: '联数', id: 8, field: 'receiptsCount', width: '100'
   },
   {
-    name: '订单消息', id: 6, field: 'orderMessage', width: '170'
+    name: '材料类型', id: 9, field: 'paperName', width: '100'
   },
   {
-    name: '客户名称', id: 8, field: 'clientName', width: '120'
+    name: '每本页数', id: 10, field: 'pageCount', width: '100'
   },
-  // {
-  // name: '客户级别', id: 9, field: 'clientLevel', width: ''
-  // },
   {
-    name: '文件描述', id: 11, field: 'fileDescription', width: '100px'
-  }, {
-    name: '制单人', id: 13, field: 'createMan', width: '75'
+    name: '印刷颜色', id: 11, field: 'printColor', width: '100'
   },
   {
-    name: '总金额', id: 17, field: 'orderMoneyTotal', width: '120'
+    name: '生产工艺', id: 12, field: 'printAllCoverFlag', width: '100'
   },
   {
-    name: '订单印量', id: 14, field: 'orderQty', width: '120'
+    name: '送货地址', id: 13, field: 'sendAddress', width: '100'
   },
-  // {
-  //   name: '成品规格', id: 15, field: 'productSize', width: '125px '
-  // },
   {
-    name: '定金', id: 16, field: 'orderMoneyPre', width: '100'
-  }, {
-    name: '已收金额', id: 18, field: 'payMoney', width: '120'
+    name: '制单时间', id: 14, field: 'createTime', width: '160'
   },
-  // {
-  //   name: '提成比例', id: 19, field: '', width: ''
-  // },
   {
-    name: '平台单号', id: 20, field: 'platformOrderID', width: '220px'
+    name: '原图文件', id: 16, field: 'fileDescription', width: '100px'
   },
   {
-    name: 'p数', id: 21, field: 'pageQty', width: ''
-  }, {
-    name: '资质文件', id: 23, field: 'attachFile', width: '190px'
+    name: '附件', id: 17, field: 'attachFile', width: '190px'
   },
   {
-    name: '客户编码', id: 7, field: 'clientCode', width: '100'
+    name: '制单人', id: 18, field: 'createMan', width: '75'
   }
 ]