66

src/styles/transition/common.scss

@@ -61,9 +61,13 @@
 
 
 .sort-wrap {
+  display: flex;
+  flex-direction: column;
+
   i {
-    font-size: 24px;
+    font-size:16px;
     cursor: pointer;
+
   }
 
   .el-icon-caret-top {
@@ -75,8 +79,6 @@
   }
 }
 
-.ele-form-search{
-  .el-input{
-    margin-bottom: 0 !important;
-  }
+.ele-form-search .el-form-item {
+  margin-bottom: 4px !important;
 }

src/views/materialPlan/components/plan-edit-dialog.vue

@@ -224,7 +224,8 @@ export default {
           slot: 'code',
           showOverflowTooltip: true,
           align: 'center',
-          minWidth: 170
+          minWidth: 170,
+          sortable: true
         },
         {
           prop: 'customerName',

src/views/materialPlan/components/produce-edit-dialog.vue

@@ -205,7 +205,8 @@ export default {
           prop: 'salesOrderCode',
           label: '销售订单号',
           align: 'center',
-          minWidth: 110
+          minWidth: 110,
+          sortable: true
         },
         {
           prop: 'customerName',

src/views/materialPlan/components/saleOrderPop.vue

@@ -51,7 +51,8 @@ export default {
                     align: 'center',
                     showOverflowTooltip: true,
                     minWidth: 150,
-                    slot: 'code'
+                    slot: 'code',
+                    sortable: true
                 },
                 {
                     prop: 'lineNumber',

src/views/materialPlan/components/workOrderPop.vue

@@ -54,7 +54,8 @@ export default {
                     prop: 'salesOrderCode',
                     label: '销售订单号',
                     align: 'center',
-                    minWidth: 110
+                    minWidth: 110,
+                    sortable: true
                 },
                 {
                     prop: 'productionPlanCode',

src/views/productionPlan/index.vue

@@ -40,7 +40,9 @@
             <el-tag type="success" size="mini" v-if="row.joinPlanCode"
               >拆</el-tag
             >
-            <el-tag type="danger" v-if="row.splitBatch == 2"> 和</el-tag>
+            <el-tag type="danger" size="mini" v-if="row.splitBatch == 2">
+              和</el-tag
+            >
           </el-link>
         </template>
 
@@ -51,28 +53,30 @@
         </template>
 
         <template v-slot:priority="{ row }">
-     
-              <el-input
-            v-model="row.priority"
-            type="number"
-            size="mini"
-            :min="0"
-            :max="10"
-            @change="priorityChange(row)"
-          ></el-input>
-
-          <el-popover
-            placement="right"
-            width="200"
-            trigger="hover"
-            content="数值越大优先级越高（0-3普通, 4-6优先, 7-10紧急）"
-          >
-            <div class="sort-wrap" slot="reference">
-              <i class="el-icon-caret-top" @click="sortTop(row)"></i>
-              <i class="el-icon-caret-bottom" @click="sortBottom(row)"></i>
-            </div>
-          </el-popover>
-   
+          <div style="display: flex">
+            <el-input
+              v-model="row.priority"
+              type="number"
+              size="mini"
+              :min="0"
+              :max="10"
+              @change="priorityChange(row)"
+              style="width: 100px"
+            >
+            </el-input>
+
+            <el-popover
+              placement="right"
+              width="200"
+              trigger="hover"
+              content="数值越大优先级越高（0-3普通, 4-6优先, 7-10紧急）"
+            >
+              <div class="sort-wrap" slot="reference">
+                <i class="el-icon-caret-top" @click="sortTop(row)"></i>
+                <i class="el-icon-caret-bottom" @click="sortBottom(row)"></i>
+              </div>
+            </el-popover>
+          </div>
         </template>
 
         <template v-slot:productWeight="{ row }">
@@ -278,8 +282,6 @@
             showOverflowTooltip: true
           },
 
-
-
           {
             slot: 'batchNo',
             prop: 'batchNo',
@@ -289,15 +291,13 @@
             showOverflowTooltip: true
           },
 
-          
           {
-         
-         prop: 'joinBatchNo',
-         label: '原批次号',
-         align: 'center',
-         minWidth: 120,
-         showOverflowTooltip: true
-       },
+            prop: 'joinBatchNo',
+            label: '原批次号',
+            align: 'center',
+            minWidth: 120,
+            showOverflowTooltip: true
+          },
 
           {
             slot: 'code',
@@ -317,7 +317,6 @@
             minWidth: 100
           },
 
-
           {
             prop: 'productCode',
             label: '产品编码',
@@ -333,7 +332,6 @@
             minWidth: 140
           },
 
-   
           {
             prop: 'brandNo',
             label: '牌号',
@@ -688,8 +686,4 @@
   };
 </script>
 
-<style lang="scss" scoped>
-
-
-
-</style>
+<style lang="scss" scoped></style>

src/views/saleOrder/components/AdditionalOrder.vue

@@ -112,7 +112,8 @@
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110,
-            slot: 'code'
+            slot: 'code',
+            sortable: true
           },
           {
             prop: 'lineNumber',

src/views/saleOrder/index.vue

@@ -31,25 +31,28 @@
         </template>
 
         <template v-slot:priority="{ row }">
-          <el-input
-            v-model="row.priority"
-            type="number"
-            size="mini"
-            :min="0"
-            :max="10"
-            @change="priorityChange(row)"
-          ></el-input>
-          <el-popover
-            placement="right"
-            width="200"
-            trigger="hover"
-            content="数值越大优先级越高（0-3普通, 4-6优先, 7-10紧急）"
-          >
-            <div class="sort-wrap" slot="reference">
-              <i class="el-icon-caret-top" @click="sortTop(row)"></i>
-              <i class="el-icon-caret-bottom" @click="sortBottom(row)"></i>
-            </div>
-          </el-popover>
+          <div style="display: flex">
+            <el-input
+              v-model="row.priority"
+              type="number"
+              size="mini"
+              :min="0"
+              :max="10"
+              @change="priorityChange(row)"
+              style="width: 100px"
+            ></el-input>
+            <el-popover
+              placement="right"
+              width="200"
+              trigger="hover"
+              content="数值越大优先级越高（0-3普通, 4-6优先, 7-10紧急）"
+            >
+              <div class="sort-wrap" slot="reference">
+                <i class="el-icon-caret-top" @click="sortTop(row)"></i>
+                <i class="el-icon-caret-bottom" @click="sortBottom(row)"></i>
+              </div>
+            </el-popover>
+          </div>
         </template>
 
         <template v-slot:productSumWeight="{ row }">
@@ -57,12 +60,9 @@
         </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
-          <template >
-
-
-
+          <template>
             <el-link
-             v-if="row.orderSource != 1"
+              v-if="row.orderSource != 1"
               type="primary"
               :underline="false"
               icon="el-icon-edit"
@@ -71,9 +71,8 @@
               修改
             </el-link>
 
-
             <el-popconfirm
-            v-if="row.orderSource != 1"
+              v-if="row.orderSource != 1"
               class="ele-action"
               title="确定要删除此销售订单吗？"
               @confirm="remove(row)"
@@ -92,9 +91,6 @@
     <order-detail @refresh="reload" ref="detailDialog"> </order-detail>
     <!-- 创建订单 -->
     <create-order ref="createDialog" @refresh="reload"> </create-order>
-
-
-    
   </div>
 </template>
 
@@ -102,7 +98,7 @@
   import OrderSearch from './components/order-search.vue';
   import OrderDetail from './components/order-detail.vue';
   import CreateOrder from './components/create-order.vue';
- 
+
   import {
     getPageList,
     deleteOrder,
@@ -118,7 +114,6 @@
       OrderSearch,
       OrderDetail,
       CreateOrder
-
     },
     data() {
       return {
@@ -159,7 +154,8 @@
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 150,
-            slot: 'code'
+            slot: 'code',
+            sortable: true
           },
           {
             prop: 'lineNumber',
@@ -214,7 +210,7 @@
             prop: 'priority',
             label: '优先级',
             align: 'center',
-            minWidth: 120,
+            minWidth: 140,
             slot: 'priority',
             sortable: 'custom'
           },
@@ -227,14 +223,13 @@
           },
           {
             prop: 'contractNum',
-            label: this.clientEnvironmentId == '4' ? '交付数量' : '合同数量' ,
-            align: 'center',
-            
+            label: this.clientEnvironmentId == '4' ? '交付数量' : '合同数量',
+            align: 'center'
           },
           {
             prop: 'lackNum',
             label: '欠交数量',
-            align: 'center',
+            align: 'center'
           },
           // {
           //   prop: 'moCount',
@@ -346,8 +341,6 @@
     methods: {
       getFieldModel() {
         fieldModel({ fieldModel: 't_main_category' }).then((res) => {
-        
-
           const privateColumn = [];
           if (this.activeName == 'first') {
             privateColumn.push({
@@ -364,17 +357,17 @@
             privateColumn = [];
           }
 
-          let newRes = res.map(m => {
+          let newRes = res.map((m) => {
             return {
               prop: 'extField.' + m.prop,
               label: m.label,
               align: 'center',
               showOverflowTooltip: true
-            }
-          })
+            };
+          });
 
           this.newColumns = [...this.columns, ...newRes, ...privateColumn];
-   
+
           this.$forceUpdate();
         });
       },
@@ -414,7 +407,6 @@
         this.$refs.createDialog.open(row);
       },
 
-
       remove(row) {
         deleteOrder([row.id]).then((res) => {
           this.$message.success(res);