Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -968,109 +968,110 @@ export default {
             width: 245,
             index: 19,
             prop: 'driverRemarks'
-          }, {
-            label: '应收场站费',
-            width: 100,
-            precision: 2,
-            index: 20,
-            controls: false,
-            cell: true,
-            type: 'number',
-            prop: 'oneFeeD'
-          }, {
-            label: '应收港杂费',
-            width: 100,
-            precision: 2,
-            cell: true,
-            index: 21,
-            controls: false,
-            type: 'number',
-            prop: 'twoFeeD'
-          }, {
-            label: '应收扣款',
-            width: 100,
-            index: 22,
-            precision: 2,
-            cell: true,
-            controls: false,
-            type: 'number',
-            prop: 'threeFeeD'
-          }, {
-            label: '应收待时费',
-            width: 100,
-            precision: 2,
-            index: 23,
-            cell: true,
-            controls: false,
-            type: 'number',
-            prop: 'fourFeeD'
-          }, {
-            label: '应收其他',
-            width: 100,
-            index: 24,
-            precision: 2,
-            cell: true,
-            type: 'number',
-            controls: false,
-            prop: 'fiveFeeD'
-          }, {
-            label: '应收费用备注',
-            width: 245,
-            index: 25,
-            cell: true,
-            prop: 'feeRemarksD'
-          }, {
-            label: '应付场站费',
-            width: 100,
-            index: 26,
-            precision: 2,
-            cell: true,
-            controls: false,
-            type: 'number',
-            prop: 'oneFeeC'
-          }, {
-            label: '应付港杂费',
-            width: 100,
-            precision: 2,
-            index: 27,
-            cell: true,
-            controls: false,
-            type: 'number',
-            prop: 'twoFeeC'
-          }, {
-            label: '应付扣款',
-            width: 100,
-            index: 28,
-            precision: 2,
-            controls: false,
-            type: 'number',
-            cell: true,
-            prop: 'threeFeeC'
-          }, {
-            label: '应付待时费',
-            width: 100,
-            precision: 2,
-            index: 29,
-            controls: false,
-            cell: true,
-            type: 'number',
-            prop: 'fourFeeC'
-          }, {
-            label: '应付其他',
-            width: 100,
-            precision: 2,
-            index: 30,
-            type: 'number',
-            cell: true,
-            controls: false,
-            prop: 'fiveFeeC'
-          }, {
-            label: '应付费用备注',
-            width: 245,
-            index: 31,
-            cell: true,
-            prop: 'feeRemarksC'
-          }
+          },
+          // {
+          //   label: '应收场站费',
+          //   width: 100,
+          //   precision: 2,
+          //   index: 20,
+          //   controls: false,
+          //   cell: true,
+          //   type: 'number',
+          //   prop: 'oneFeeD'
+          // }, {
+          //   label: '应收港杂费',
+          //   width: 100,
+          //   precision: 2,
+          //   cell: true,
+          //   index: 21,
+          //   controls: false,
+          //   type: 'number',
+          //   prop: 'twoFeeD'
+          // }, {
+          //   label: '应收扣款',
+          //   width: 100,
+          //   index: 22,
+          //   precision: 2,
+          //   cell: true,
+          //   controls: false,
+          //   type: 'number',
+          //   prop: 'threeFeeD'
+          // }, {
+          //   label: '应收待时费',
+          //   width: 100,
+          //   precision: 2,
+          //   index: 23,
+          //   cell: true,
+          //   controls: false,
+          //   type: 'number',
+          //   prop: 'fourFeeD'
+          // }, {
+          //   label: '应收其他',
+          //   width: 100,
+          //   index: 24,
+          //   precision: 2,
+          //   cell: true,
+          //   type: 'number',
+          //   controls: false,
+          //   prop: 'fiveFeeD'
+          // }, {
+          //   label: '应收费用备注',
+          //   width: 245,
+          //   index: 25,
+          //   cell: true,
+          //   prop: 'feeRemarksD'
+          // }, {
+          //   label: '应付场站费',
+          //   width: 100,
+          //   index: 26,
+          //   precision: 2,
+          //   cell: true,
+          //   controls: false,
+          //   type: 'number',
+          //   prop: 'oneFeeC'
+          // }, {
+          //   label: '应付港杂费',
+          //   width: 100,
+          //   precision: 2,
+          //   index: 27,
+          //   cell: true,
+          //   controls: false,
+          //   type: 'number',
+          //   prop: 'twoFeeC'
+          // }, {
+          //   label: '应付扣款',
+          //   width: 100,
+          //   index: 28,
+          //   precision: 2,
+          //   controls: false,
+          //   type: 'number',
+          //   cell: true,
+          //   prop: 'threeFeeC'
+          // }, {
+          //   label: '应付待时费',
+          //   width: 100,
+          //   precision: 2,
+          //   index: 29,
+          //   controls: false,
+          //   cell: true,
+          //   type: 'number',
+          //   prop: 'fourFeeC'
+          // }, {
+          //   label: '应付其他',
+          //   width: 100,
+          //   precision: 2,
+          //   index: 30,
+          //   type: 'number',
+          //   cell: true,
+          //   controls: false,
+          //   prop: 'fiveFeeC'
+          // }, {
+          //   label: '应付费用备注',
+          //   width: 245,
+          //   index: 31,
+          //   cell: true,
+          //   prop: 'feeRemarksC'
+          // }
         ]
       },
       entrustOptionTwoT: {},

src/views/landTransportation/dispatchingCars/index.vue

@@ -12,8 +12,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.all }}</span>
-                  <span class="card-content-text">全部</span>
+                  <span class="card-content-num" :class="!activeName?'selected':''">{{ totalData.all }}</span>
+                  <span class="card-content-text" :class="!activeName?'selected':''">全部</span>
                 </div>
               </div>
             </div>
@@ -26,8 +26,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.zero }}</span>
-                  <span class="card-content-text">未调度</span>
+                  <span class="card-content-num" :class="activeName === '0'?'selected':''">{{ totalData.zero }}</span>
+                  <span class="card-content-text" :class="activeName === '0'?'selected':''">未调度</span>
                 </div>
               </div>
             </div>
@@ -40,8 +40,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.one }}</span>
-                  <span class="card-content-text">未派车</span>
+                  <span class="card-content-num" :class="activeName === '1'?'selected':''">{{ totalData.one }}</span>
+                  <span class="card-content-text" :class="activeName === '1'?'selected':''">未派车</span>
                 </div>
               </div>
             </div>
@@ -587,6 +587,9 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
+.selected{
+  color: #1e9fff !important;
+}
 .home-container {
   padding: 0px 5px 5px 5px;
   box-sizing: border-box;

src/views/landTransportation/driver/index.vue

@@ -12,8 +12,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.all }}</span>
-                  <span class="card-content-text">全部</span>
+                  <span class="card-content-num" :class="!activeName?'selected':''">{{ totalData.all }}</span>
+                  <span class="card-content-text" :class="!activeName?'selected':''">全部</span>
                 </div>
               </div>
             </div>
@@ -26,8 +26,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.two }}</span>
-                  <span class="card-content-text">未受理</span>
+                  <span class="card-content-num" :class="activeName === '2'?'selected':''">{{ totalData.two }}</span>
+                  <span class="card-content-text" :class="activeName === '2'?'selected':''">未受理</span>
                 </div>
               </div>
             </div>
@@ -40,8 +40,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.three }}</span>
-                  <span class="card-content-text">未完工</span>
+                  <span class="card-content-num" :class="activeName === '3'?'selected':''">{{ totalData.three }}</span>
+                  <span class="card-content-text" :class="activeName === '3'?'selected':''">未完工</span>
                 </div>
               </div>
             </div>
@@ -54,8 +54,8 @@
                     </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.four }}</span>
-                  <span class="card-content-text">已完工</span>
+                  <span class="card-content-num" :class="activeName === '4'?'selected':''">{{ totalData.four }}</span>
+                  <span class="card-content-text" :class="activeName === '4'?'selected':''">已完工</span>
                 </div>
               </div>
             </div>
@@ -462,58 +462,60 @@ export default {
           width: 245,
           index: 24,
           prop: 'driverRemarks'
-        },{
-          label: '场站费',
-          width: 100,
-          precision: 2,
-          cell: true,
-          index: 25,
-          controls: false,
-          type: 'number',
-          prop: 'oneFeeC'
-        }, {
-          label: '港杂费',
-          width: 100,
-          precision: 2,
-          cell: true,
-          index: 26,
-          controls: false,
-          type: 'number',
-          prop: 'twoFeeC'
-        }, {
-          label: '扣款',
-          width: 100,
-          precision: 2,
-          cell: true,
-          index: 27,
-          controls: false,
-          type: 'number',
-          prop: 'threeFeeC'
-        }, {
-          label: '待时费',
-          width: 100,
-          index: 28,
-          precision: 2,
-          cell: true,
-          controls: false,
-          type: 'number',
-          prop: 'fourFeeC'
-        }, {
-          label: '其他',
-          width: 100,
-          precision: 2,
-          index: 29,
-          cell: true,
-          type: 'number',
-          controls: false,
-          prop: 'fiveFeeC'
-        }, {
-          label: '费用备注',
-          width: 245,
-          index: 30,
-          cell: true,
-          prop: 'feeRemarksC'
-        },{
+        },
+        //   {
+        //   label: '场站费',
+        //   width: 100,
+        //   precision: 2,
+        //   cell: true,
+        //   index: 25,
+        //   controls: false,
+        //   type: 'number',
+        //   prop: 'oneFeeC'
+        // }, {
+        //   label: '港杂费',
+        //   width: 100,
+        //   precision: 2,
+        //   cell: true,
+        //   index: 26,
+        //   controls: false,
+        //   type: 'number',
+        //   prop: 'twoFeeC'
+        // }, {
+        //   label: '扣款',
+        //   width: 100,
+        //   precision: 2,
+        //   cell: true,
+        //   index: 27,
+        //   controls: false,
+        //   type: 'number',
+        //   prop: 'threeFeeC'
+        // }, {
+        //   label: '待时费',
+        //   width: 100,
+        //   index: 28,
+        //   precision: 2,
+        //   cell: true,
+        //   controls: false,
+        //   type: 'number',
+        //   prop: 'fourFeeC'
+        // }, {
+        //   label: '其他',
+        //   width: 100,
+        //   precision: 2,
+        //   index: 29,
+        //   cell: true,
+        //   type: 'number',
+        //   controls: false,
+        //   prop: 'fiveFeeC'
+        // }, {
+        //   label: '费用备注',
+        //   width: 245,
+        //   index: 30,
+        //   cell: true,
+        //   prop: 'feeRemarksC'
+        // },
+          {
           label: '制单日期',
           overHidden: true,
           prop: 'createTime',
@@ -789,6 +791,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.selected{
+  color: #1e9fff !important;
+}
 .home-container {
   padding: 0px 5px 5px 5px;
   box-sizing: border-box;

src/views/landTransportation/motorcadeDriver/index.vue

@@ -12,8 +12,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.all }}</span>
-                  <span class="card-content-text">全部</span>
+                  <span class="card-content-num" :class="!activeName?'selected':''">{{ totalData.all }}</span>
+                  <span class="card-content-text" :class="!activeName?'selected':''">全部</span>
                 </div>
               </div>
             </div>
@@ -26,8 +26,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.one }}</span>
-                  <span class="card-content-text">未派车</span>
+                  <span class="card-content-num" :class="activeName === '1'?'selected':''">{{ totalData.one }}</span>
+                  <span class="card-content-text" :class="activeName === '1'?'selected':''">未派车</span>
                 </div>
               </div>
             </div>
@@ -40,8 +40,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.two }}</span>
-                  <span class="card-content-text">未受理</span>
+                  <span class="card-content-num" :class="activeName === '2'?'selected':''">{{ totalData.two }}</span>
+                  <span class="card-content-text" :class="activeName === '2'?'selected':''">未受理</span>
                 </div>
               </div>
             </div>
@@ -54,8 +54,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.three }}</span>
-                  <span class="card-content-text">未完工</span>
+                  <span class="card-content-num" :class="activeName === '3'?'selected':''">{{ totalData.three }}</span>
+                  <span class="card-content-text" :class="activeName === '3'?'selected':''">未完工</span>
                 </div>
               </div>
             </div>
@@ -68,8 +68,8 @@
                     </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.four }}</span>
-                  <span class="card-content-text">已完工</span>
+                  <span class="card-content-num" :class="activeName === '4'?'selected':''">{{ totalData.four }}</span>
+                  <span class="card-content-text" :class="activeName === '4'?'selected':''">已完工</span>
                 </div>
               </div>
             </div>
@@ -631,58 +631,60 @@ export default {
             width: 245,
             index: 23,
             prop: 'driverRemarks'
-          }, {
-            label: '场站费',
-            width: 100,
-            precision: 2,
-            cell: true,
-            index: 24,
-            controls: false,
-            type: 'number',
-            prop: 'oneFeeC'
-          }, {
-            label: '港杂费',
-            width: 100,
-            precision: 2,
-            cell: true,
-            index: 25,
-            controls: false,
-            type: 'number',
-            prop: 'twoFeeC'
-          }, {
-            label: '扣款',
-            width: 100,
-            precision: 2,
-            index: 26,
-            cell: true,
-            controls: false,
-            type: 'number',
-            prop: 'threeFeeC'
-          }, {
-            label: '待时费',
-            width: 100,
-            precision: 2,
-            index: 27,
-            cell: true,
-            controls: false,
-            type: 'number',
-            prop: 'fourFeeC'
-          }, {
-            label: '其他',
-            width: 100,
-            precision: 2,
-            index: 28,
-            cell: true,
-            type: 'number',
-            controls: false,
-            prop: 'fiveFeeC'
-          }, {
-            label: '费用备注',
-            width: 245,
-            index: 29,
-            cell: true,
-            prop: 'feeRemarksC'
-          }, {
+          },
+          // {
+          //   label: '场站费',
+          //   width: 100,
+          //   precision: 2,
+          //   cell: true,
+          //   index: 24,
+          //   controls: false,
+          //   type: 'number',
+          //   prop: 'oneFeeC'
+          // }, {
+          //   label: '港杂费',
+          //   width: 100,
+          //   precision: 2,
+          //   cell: true,
+          //   index: 25,
+          //   controls: false,
+          //   type: 'number',
+          //   prop: 'twoFeeC'
+          // }, {
+          //   label: '扣款',
+          //   width: 100,
+          //   precision: 2,
+          //   index: 26,
+          //   cell: true,
+          //   controls: false,
+          //   type: 'number',
+          //   prop: 'threeFeeC'
+          // }, {
+          //   label: '待时费',
+          //   width: 100,
+          //   precision: 2,
+          //   index: 27,
+          //   cell: true,
+          //   controls: false,
+          //   type: 'number',
+          //   prop: 'fourFeeC'
+          // }, {
+          //   label: '其他',
+          //   width: 100,
+          //   precision: 2,
+          //   index: 28,
+          //   cell: true,
+          //   type: 'number',
+          //   controls: false,
+          //   prop: 'fiveFeeC'
+          // }, {
+          //   label: '费用备注',
+          //   width: 245,
+          //   index: 29,
+          //   cell: true,
+          //   prop: 'feeRemarksC'
+          // },
+          {
             label: '制单日期',
             overHidden: true,
             prop: 'createTime',
@@ -961,6 +963,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.selected{
+  color: #1e9fff !important;
+}
 .home-container {
   padding: 0px 5px 5px 5px;
   box-sizing: border-box;

src/views/landTransportation/placeAnOrder/index.vue

@@ -12,8 +12,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.all }}</span>
-                  <span class="card-content-text">全部</span>
+                  <span class="card-content-num" :class="!activeName?'selected':''">{{ totalData.all }}</span>
+                  <span class="card-content-text" :class="!activeName?'selected':''">全部</span>
                 </div>
               </div>
             </div>
@@ -26,8 +26,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.last }}</span>
-                  <span class="card-content-text">未提交</span>
+                  <span class="card-content-num" :class="activeName === '999'?'selected':''">{{ totalData.last }}</span>
+                  <span class="card-content-text" :class="activeName === '999'?'selected':''">未提交</span>
                 </div>
               </div>
             </div>
@@ -40,8 +40,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.zero }}</span>
-                  <span class="card-content-text">未调度</span>
+                  <span class="card-content-num" :class="activeName === '0'?'selected':''">{{ totalData.zero }}</span>
+                  <span class="card-content-text" :class="activeName === '0'?'selected':''">未调度</span>
                 </div>
               </div>
             </div>
@@ -54,8 +54,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.one }}</span>
-                  <span class="card-content-text">未派车</span>
+                  <span class="card-content-num" :class="activeName === '1'?'selected':''">{{ totalData.one }}</span>
+                  <span class="card-content-text" :class="activeName === '1'?'selected':''">未派车</span>
                 </div>
               </div>
             </div>
@@ -68,8 +68,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.two }}</span>
-                  <span class="card-content-text">未受理</span>
+                  <span class="card-content-num" :class="activeName === '2'?'selected':''">{{ totalData.two }}</span>
+                  <span class="card-content-text" :class="activeName === '2'?'selected':''">未受理</span>
                 </div>
               </div>
             </div>
@@ -82,8 +82,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.three }}</span>
-                  <span class="card-content-text">未完工</span>
+                  <span class="card-content-num" :class="activeName === '3'?'selected':''">{{ totalData.three }}</span>
+                  <span class="card-content-text" :class="activeName === '3'?'selected':''">未完工</span>
                 </div>
               </div>
             </div>
@@ -96,8 +96,8 @@
                     </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{ totalData.four }}</span>
-                  <span class="card-content-text">工单关闭</span>
+                  <span class="card-content-num" :class="activeName === '4'?'selected':''">{{ totalData.four }}</span>
+                  <span class="card-content-text" :class="activeName === '4'?'selected':''">工单关闭</span>
                 </div>
               </div>
             </div>
@@ -544,6 +544,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.selected{
+  color: #1e9fff !important;
+}
 .home-container {
   padding: 0px 5px 5px 5px;
   box-sizing: border-box;
@@ -666,7 +669,7 @@ export default {
       }
 
       &-title7 {
-        color: rgba(255, 98, 14, 0.63);
+        color: rgba(231, 90, 15, 0.63);
         background-color: rgba(220, 150, 42, 0.15);
       }
 

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -24,12 +24,12 @@
               </el-tooltip>
             </template>
             <template slot="status" slot-scope="{row}">
-              <span v-if="row.status == 0" style="color: #E45656;">未调度</span>
-              <span v-if="row.status == 1" style="color: #F56C6C;">未派车</span>
-              <span v-if="row.status == 2" style="color: #F1A532;">未受理</span>
-              <span v-if="row.status == 3" style="color: #53C21D;">未完工</span>
+              <span v-if="row.status == 0" style="color: #ffa21e;">未调度</span>
+              <span v-if="row.status == 1" style="color: #fb5b60;">未派车</span>
+              <span v-if="row.status == 2" style="color: #42bc6f;">未受理</span>
+              <span v-if="row.status == 3" style="color: #14cde1;">未完工</span>
               <span v-if="row.status == 5" style="color: #F56C6C;">未到厂</span>
-              <span v-if="row.status == 4" style="color: #3C9CFF;">工单关闭</span>
+              <span v-if="row.status == 4" style="color: #04421fa1;">工单关闭</span>
               <span v-if="row.status == 6" style="color: #3C9CFF;">未提箱</span>
             </template>
           </avue-crud>

src/views/wel/home/landTransportation/landTransportation.vue

@@ -25,7 +25,8 @@ export default {
   props:{
     sysType:Number
   },
-  created() {},
+  created() {
+  },
   components: {
     quickLaunch,
     auditData,

src/views/workManagement/requisition/detail.vue

@@ -310,7 +310,7 @@
                   size="small"
                   @click.stop="importStagList(scope.row,scope.index)"
                   v-if="activeName=='searchList'"
-                  :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1"
+                  :disabled="goodsListSave.findIndex(item => item.goodsId == scope.row.goodsId) !== -1"
                 >选择
                 </el-button>
                 <el-button
@@ -564,7 +564,6 @@ export default {
       goodsOption
     );
     //getStockList
-
     getStockList({
       size: 10,
       current: 1,
@@ -617,7 +616,11 @@ export default {
       return num ? Number(num).toFixed(2) : "0.00";
     },
     storageFormat(row, storageOptions) {
-      return row = storageOptions.find(item => item.id == row).cname
+      if (storageOptions.find(item => item.id == row)){
+        return row = storageOptions.find(item => item.id == row).cname
+      }else {
+        return
+      }
     }
   },
   methods: {