55

src/styles/transition/common.scss

@@ -81,4 +81,30 @@
 
 .ele-form-search .el-form-item {
   margin-bottom: 4px !important;
-}
+}
+
+
+
+.el-dialog {
+  margin-top: 5vh !important;
+}
+
+.el-table--medium .el-table__cell {
+  padding: 2px 0 !important;
+}
+
+.el-button--medium {
+  padding: 7px 10px  !important;
+  font-size: 12px  !important;
+  border-radius: 3px  !important;
+}
+.el-button--small {
+  padding: 7px 10px  !important;
+  font-size: 12px  !important;
+  border-radius: 3px  !important;
+}
+
+.el-input--medium .el-input__inner {
+  height: 32px  !important;
+  line-height: 32px  !important;
+}

src/views/saleOrder/components/order-search.vue

@@ -103,22 +103,22 @@
           <el-button @click="reset"  size="mini" icon="el-icon-refresh-left" type="primary">重置</el-button>
         </div>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }" v-if="activeName == 'first'">
+      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }" >
         <el-form-item label-width="0px">
           <div class="btn-wrapper">
-            <el-button @click="goProduct"  size="mini">转生产计划</el-button>
+            <el-button @click="goProduct"  size="mini"  v-if="activeName != 'second'"> 转生产计划</el-button>
             <el-button type="primary"  size="mini" @click="orderRefresh" :loading="loading">订单刷新</el-button>
-            <el-button type="success"  size="mini" @click="toCreate">创建订单</el-button>
+            <el-button type="success"  size="mini" @click="toCreate" v-if="activeName == 'first'">创建订单</el-button>
 
 
-            <el-upload class="avatar-uploader" action="#" :show-file-list="false" :http-request="uploadFile"
+            <el-upload class="avatar-uploader" action="#" :show-file-list="false"  v-if="activeName == 'first'":http-request="uploadFile"
               :before-upload="beforeUpload" :on-change="handleChange" ref="uploadFile">
               <el-button type="warning"  size="mini">批量导入</el-button>
             </el-upload>
             <el-button type="info"  size="mini">
               <a :href="fileUrl" download="销售订单导入模板.xls" class="button-link">下载模板</a>
             </el-button>
-            <el-button type="danger"  size="mini" @click="batchDelete">批量删除</el-button>
+            <el-button type="danger"  size="mini" @click="batchDelete" v-if="activeName == 'first'">批量删除</el-button>
           </div>
         </el-form-item>
       </el-col>

src/views/saleOrder/index.vue

@@ -10,6 +10,7 @@
       </order-search>
       <el-tabs v-model="activeName" type="card">
         <el-tab-pane label="待排产" name="first"></el-tab-pane>
+        <el-tab-pane label="未排完" name="three"></el-tab-pane>
         <el-tab-pane label="已排产" name="second"></el-tab-pane>
       </el-tabs>
       <!-- 数据表格 -->
@@ -387,7 +388,11 @@
       async datasource({ page, limit, where, order }) {
         if (this.activeName == 'first') {
           where.status = [1];
-        } else {
+        } else if (this.activeName == 'three') {
+          where.status = [0];
+        }
+        
+        else {
           if (where.proStu) {
             where.status = [where.proStu];
           } else {

src/views/workOrder/index.vue

@@ -243,7 +243,8 @@
             label: '创建时间',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 110,
+             sortable: 'custom'
           },
           {
             slot: 'status',