2 次代码提交 60d0e9d70e ... 782132caf1

作者 SHA1 备注 提交日期
  zhouzh 782132caf1 4.1 3 年之前
  zhouzh 498af42316 4.1 3 年之前

+ 4 - 2
build/utils.js

@@ -15,8 +15,10 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index','appoint','configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-let devModules = ['all']
-// let devModules = ['index','appoint','sale','RMS'];
+
+ let devModules = ['all']
+// let devModules = ['index','sale','WMS']
+// let devModules = ['index','statisticalReport','appoint','sale','RMS','TMS'];
 // let devModules = ['index','appoint','WMS'];
 // let devModules = ['index','inward','SporadicManage']
 // let devModules = ['index','sale','RMS']

+ 13 - 30
src/components/DilCommonUI/packages/table/src/table.vue

@@ -199,11 +199,11 @@ export default {
       default: true,
     },
     // 行的 className 的回调方法,也可以使用字符串为所有行设置一个固定的 className。
-    // rowClassName: {
-    //   default() {
-    //     return ({ row, rowIndex }) => "";
-    //   },
-    // },
+    rowClassName: {
+      default() {
+        return ({ row, rowIndex }) => "";
+      },
+    },
     // 单元格的 className 的回调方法,也可以使用字符串为所有单元格设置一个固定的 className。
     cellClassName: {
       default() {
@@ -268,35 +268,18 @@ export default {
 
 <style lang="scss" scoped>
 
-.el-table .warning-row {
-    background: #fff ;
-    font-size: 22px;
-    height: 44px;
-    line-height: 46px;
-    font-size: 22px;
-    font-weight: 700;
-  }
-
-  .el-table .success-row {
-    background: #fff ;
-    font-size: 22px;
-    height: 44px;
-    line-height: 46px;
-    font-size: 22px;
-    font-weight: 700;
-  }
 @media print {
   .el-pagination {
     display: none;
   }
   
 }
-//  /deep/.el-table .success-row {
-//     background: #fff !important;
-//     color: #f56c6c;
-//     height: 44px;
-//     line-height: 46px;
-//     font-size: 22px;
-//     font-weight: 700;
-//   }
+ /deep/.el-table .success-row {
+    background: #fff !important;
+    color: #f56c6c;
+    height: 44px;
+    line-height: 46px;
+    font-size: 22px;
+    font-weight: 700;
+  }
 </style>

+ 31 - 16
src/views/sale/components/transport_excute/tms-offsite/arrivalResult.vue

@@ -31,19 +31,23 @@
     </div>
     <div class="table">
       <dilTable ref="excelDom" v-bind.sync="option" @func="func">
-        <el-table-column fixed="right" label="操作" width="100">
-          <template slot-scope="scope">
-             <el-button
-              type="text"
-              size="mini"
-              @click="photo(scope)"
-            >
-              满货箱照片
-            </el-button>
-          </template>
-        </el-table-column>
+          <el-table-column fixed="right" label="照片游览" width="120">
+          <template slot-scope="scope">
+            <el-button @click="toPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 6px">
+                抵达满货照片</el-button>
+          </template>
+      </el-table-column>
       </dilTable>
     </div>
+     <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+        <div class="demo-image__preview">
+          <el-image 
+            style=" height:731px;text-align:center"
+            :src="src" 
+            :preview-src-list="srcList">
+          </el-image>
+        </div>
+      </vxe-modal>
   </div>
 </template>
 
@@ -54,6 +58,9 @@ export default {
   data() {
     return {
       restaurants: [],
+       tsrcList:[],
+       src:"",
+       isShow:false,
       input: "",
       startTime: null,
       endTime: null,
@@ -67,13 +74,21 @@ export default {
    
   },
   methods: {
-    photo(scope){
-      console.log(scope.row.orderNumber)
-     this.axios
-       .post("/api/v1/tms/getReceiptPhoto?orderNumber="+scope.row.orderNumber)
+     toPhotoClick(orderNumber){
+    
+      this.axios
+       .post("/api/v1/tms/getReceiptPhoto?orderNumber="+orderNumber)
        .then((res)=>{
-         console.log("res.data.data",res.data.data)
+          this.srcList=[];
+          this.src=res.data.data;
+          this.isShow=true;
+          this.srcList.push(res.data.data);
        });
+       
+    },
+    photo(scope){
+      console.log(scope.row.orderNumber)
+    
     },
     onclick() {
       let startTime = null;

+ 112 - 123
src/views/sale/components/transport_excute/tms-offsite/receiptResult.vue

@@ -1,145 +1,134 @@
 <template>
-  <!-- 收货实绩信息页面 -->
-  <div class="receiptResult">
-  <div class="top">
-    <el-form :inline="true" style="margin-top: 0.5rem;">
-        <el-form-item>
-          <label class="el-form-item__label" style="width: auto;">时间段</label>
-         <el-date-picker
-      v-model="dateValue"
-      type="daterange"
-      range-separator="至"
-      start-placeholder="开始日期"
-      end-placeholder="结束日期">
-    </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-      <label class="el-form-item__label" style="width: auto;">产品分类</label>
-      <el-autocomplete
-        popper-class="my-autocomplete"
-        v-model="inputValue"
-        :fetch-suggestions="querySearch"
-        placeholder="请输入内容" 
+  <!-- 收货页面 -->
+   <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <span>收货时间:</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
       >
-        <i class="el-icon-edit el-input__icon" slot="suffix"> </i>
-      </el-autocomplete>
-        </el-form-item>
-        <el-form-item>
-      <label class="el-form-item__label" style="width: auto;margin-top: 0.4rem;">车牌号</label>
-      </el-form-item>
-      <el-form-item>
-          <el-input class="el-form-item__content" v-model="capacityNumber1" placeholder="请输入内容"></el-input>
-      </el-form-item>
-      <el-form-item>
-          <label class="el-form-item__label" style="width: auto;margin-top: 0.4rem;">收货单位</label>
-      </el-form-item>
-      <el-form-item>
-          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
-      </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSearch"><i class="el-icon-search"></i>查询</el-button>
-        </el-form-item>
-      </el-form>
-  </div>
-
-    <dilTable ref="tab" v-bind.sync="option">
-      <el-table-column fixed="right" label="照片浏览" width="400">
-        <template slot-scope="scope">
-          <el-button @click="toPhotoClick1(scope.row.resultEmptyContainerPhoto)" type="text" size="small" style="font-size: 17px"
-            >空货箱</el-button
-          >
-          <el-button @click="toPhotoClick2(scope.row.resultSignedNotePhoto)" type="text" size="small" style="font-size: 17px"
-            >签字送货单</el-button
-          >
-          <el-button @click="toPhotoClick3(scope.row.resultReceiveNotePhoto)" type="text" size="small" style="font-size: 17px"
-            >客户签收单</el-button
-          >
-          <el-button @click="toPhotoClick4(scope.row)" type="text" size="small" style="font-size: 17px"
-            >其他</el-button
-          >
-        </template>
-      </el-table-column>
-    </dilTable>
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+        <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <el-button type="primary" @click="refresh">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable ref="excelDom" v-bind.sync="option" @func="func">
+       <el-table-column fixed="right" label="照片游览" width="120">
+          <template slot-scope="scope">
+            <el-button @click="toPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 6px">
+                抵达满货照片</el-button>
+          </template>
+      </el-table-column>
+      </dilTable>
+    </div>
+    <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+        <div class="demo-image__preview">
+          <el-image 
+            style=" height:731px;text-align:center"
+            :src="src" 
+            :preview-src-list="srcList">
+          </el-image>
+        </div>
+      </vxe-modal>
   </div>
 </template>
 
-
 <script>
-
+import { sjTime } from '@/utils/sharedJsFile';
 export default {
-  name: "receiptResult",
+  name: "homeworkPath",
   data() {
     return {
-      dateValue:[new Date(), new Date()],
-      inputValue:"",
-      capacityNumber1:"",
-      consigneeCompanyName1:"",
-      status: "",
-      state: "",
-      option: {       
+      restaurants: [],
+      input: "",
+      srcList:[],
+       src:"",
+       isShow:false,
+      startTime: null,
+      endTime: null,
+      option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getReceiptResult?apiId=137",
+        requestUrl: "/api/v1/tms/getReceiptResult?apiId=470",
       },
     };
   },
-  mounted() {
-    this.restaurants = this.loadAll();
+  created(){
+   
   },
   methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
-    loadAll() {
-      return [
-        { value: "带钢"},
-        { value: "微粉"},
-        { value: "螺纹钢"},
-        { value: "钢坯"},
-        { value: "其他"},
-      ];
-    },
-
-
-    onSearch(){
-      //改变查询条件
-      this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
-                      "endTime": sjTime(this.dateValue[1]),
-                      "productClassification": this.inputValue,
-                      "capacityNumber1": this.capacityNumber1,
-                      "consigneeCompanyName1": this.consigneeCompanyName1});                         
-    },
-
-    toPhotoClick1(resultEmptyContainerPhoto){
-      this.$router.push("/receiptPhoto?photo="+resultEmptyContainerPhoto);
-    },
-    toPhotoClick2(resultSignedNotePhoto){
-      this.$router.push("/receiptPhoto?photo="+resultSignedNotePhoto);
-    },
-    toPhotoClick3(resultReceiveNotePhoto){
-      this.$router.push("/receiptPhoto?photo="+resultReceiveNotePhoto);
-    },
-    toPhotoClick4(row){
-      this.$router.push("/receiptChildPhoto?photo1="+row.otherPhoto1+"&photo2="+row.otherPhoto2+"&photo3="+row.otherPhoto3);
-    }
+     toPhotoClick(orderNumber){
+      console.log(orderNumber)
+      this.axios
+       .post("/api/v1/tms/getReceivingPhoto?orderNumber="+orderNumber)
+       .then((res)=>{
+         console.log(res)
+          this.srcList=[];
+          this.src=res.data.data.resultSignedNotePhoto;
+          this.isShow=true;
+          this.srcList.push(res.data.data.resultSignedNotePhoto);
+          this.srcList.push(res.data.data.resultEmptyContainerPhoto);
+          
+       });
+       
+    },
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = '/api/v1/tms/getReceiptResult?apiId=471' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        console.log(startTime && endTime)
+         this.option.requestUrl = '/api/v1/tms/getReceivingResult?apiId=471' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
+      }
     },
+   }
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 20px 30px;
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-date-editor{
+      margin: 20px;
+    }
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>