前端

src/components/pdf/pdf.vue

@@ -1,19 +1,15 @@
 <template>
   <div class="pdf">
-    <pdf v-for="i in numPages"
-         :key="i"
-         :src="pdfUrl"
-         :page="i">
-    </pdf>
+      <!-- <iframe :src="'/public/static/pdfjs/web/viewer.html?file=' + getFileUrl"
+        style="width: 100%; height: 440px"
+      ></iframe> -->
+      <div id="mypdf"></div>
   </div>
 </template>
 <script>
-import pdf from 'vue-pdf'
+import PDFObject from 'pdfobject'
 export default {
   name: 'Pdf',
-  components: {
-    pdf
-  },
   props: {
     loadUrl: {
       type: String,
@@ -33,7 +29,9 @@ export default {
     }
   },
   mounted: function () {
-    this.pdfTask(this.getFileUrl)
+    console.log(this.loadUrl)
+    PDFObject.embed(this.loadUrl, "#mypdf");
+    // this.pdfTask(this.getFileUrl)
   },
   methods: {
     pdfTask (pdfUrl) {
@@ -59,5 +57,9 @@ export default {
 .pdf {
   background-repeat: no-repeat;
   background-position: center;
+  height:70vh;
+}
+#mypdf{
+  height:70vh;
 }
 </style>

src/views/contractManagement/purchaseContract.vue

@@ -140,10 +140,10 @@
       <el-table-column width='120' prop="contractExpenditure" label="粮款支出"> </el-table-column>
       <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
 
-      <!-- <el-table-column width='130' prop="mildewGrain" label="已付款（元）"> -->
-      </el-table-column>
+      <!-- <el-table-column width='130' prop="mildewGrain" label="已付款（元）"> 
+      </el-table-column>-->
       <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column>
-      <el-table-column prop="statementUrl" label="结算单">
+      <!-- <el-table-column prop="statementUrl" label="结算单">
         <template slot-scope="scope">
           <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
             src="../../../public/img/fujian.png" @click="settlement(scope.row)" alt="" />
@@ -151,7 +151,7 @@
             {{ scope.row.statementUrl? scope.row.statementUrl.split(",").length : "" }}
           </span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column width='120' prop="goodsNames" label="已开发票 （元）">
         <template slot-scope="scope">
           <div v-if="!scope.row.editgoodsNames">

src/views/outboundManagement/weighingManagementNew.vue

@@ -2268,7 +2268,6 @@
             this.weighingList.tips = this.taskNolist[i].businessDescribe
             data = this.taskNolist[i]
             if(this.taskNolist[i].inOutType=='移库出库'){ 
-              
               this.weighingList.contractNo = this.taskNolist[i].moveTaskNo
               gettask({contractNo:this.taskNolist[i].moveTaskNo,compId:localStorage.getItem('ws-pf_compId')}).toPromise().then((response) => {
                 // console.log(response)

src/views/personnelManagement/component/router/route.js

@@ -59,22 +59,22 @@ const checkWorkListRouter = {
             },
             // hidden: true
         },
-        // {
-        //     path: 'carNoList',
-        //     component: () =>
-        //         import ( /* webpackChunkName: "applDetail" */ '@/views/personnelManagement/carNoList'),
-        //     name: 'carNoList',
-        //     meta: {
-        //         title: '车辆管理',
-        //         shortcutEntrance: 'leaveList',
-        //         module: 'kaoqin.buka.view',
-        //         permissicon: [],
-        //         keepAlive: true,
-        //         _title:'车辆管理'
-        //         // module: 'procurement.sparepart.applDetail'
-        //     },
-        //     // hidden: true
-        // },
+        {
+            path: 'carNoList',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/personnelManagement/carNoList'),
+            name: 'carNoList',
+            meta: {
+                title: '车辆管理',
+                shortcutEntrance: 'leaveList',
+                module: 'kaoqin.buka.view',
+                permissicon: [],
+                keepAlive: true,
+                _title:'车辆管理'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            // hidden: true
+        },
 
 
     ],

src/views/warehousenew/gooddetail.vue

@@ -81,6 +81,19 @@
               <span v-if="scope.row.transferFlag==2">{{scope.row.avgCost}}</span>
             </template>
           </el-table-column>
+          <el-table-column prop="addressUrl" label="附件">
+        <template slot-scope="scope">
+          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+          <span v-if="scope.row.addressUrlArray != null">
+            {{
+                scope.row.addressUrlArray.length == 0
+                  ? ''
+                  : scope.row.addressUrlArray.length
+            }}
+          </span>
+        </template>
+      </el-table-column>
           <el-table-column width="120" prop="updateDate" label="日期">
           </el-table-column>
         </el-table>
@@ -96,6 +109,11 @@
           <div>{{ item.weight }}</div>
         </div>
       </el-dialog>
+      <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+    </WinseaContentModal>
     </div>
   </div>
 </template>
@@ -125,12 +143,20 @@ import {
         currectData:{},
         compId:localStorage.getItem('ws-pf_compId'),
         binNumbershow:false,
+        accessoryTFs:false,
+        appendixIdss:'',
       }
     },
     activated() {
       this.getList()
     },
     methods: {
+      fujian(row) {
+      this.id = row.id
+      this.accessoryTFs = true
+      this.appendixIdss = row.addressUrl
+      console.log(this.appendixIdss)
+    },
       lookbinNumber(item){
         this.currectData=item
         this.binNumbershow=true
@@ -169,6 +195,11 @@ import {
             compId:localStorage.getItem('ws-pf_compId'),
           })
           .toPromise()
+          if(response.records.length>0){
+            for (let i = 0; i < response.records.length; i++) {
+              response.records[i].addressUrlArray=response.records[i].addressUrl.split(',')
+            }
+          }
             this.tableData = response.records
            this.deptBudgetTotal = response.total
       },

src/views/warehousenew/goodsrollIn.vue

@@ -76,6 +76,10 @@
             <el-form-item label="合计重量">
                 <el-input disabled v-model="form.transferOutWeight" placeholder="自动计算，不可编辑"></el-input>
             </el-form-item>
+            <el-form-item label-width='160px' label="附件">
+            <ws-upload ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId"
+              :appendix-ids="form.addressUrl" :size-limit="size" :limit="99" @onChange="onChange" />
+          </el-form-item>
             <el-form-item>
                 <el-button type="primary" @click="onSubmit">提交</el-button>
             </el-form-item>
@@ -114,9 +118,12 @@ import {
   import {
     getwarehouse
   } from '@/model/houseSelfCollect/index'
+  import WsUpload from '@/components/WsUpload'
 import {xialaNo} from '@/model/tasksport/index'
   export default {
-    components: {},
+    components: {
+      WsUpload
+    },
     data() {
       return {
         cusationinfo:[],
@@ -127,6 +134,7 @@ import {xialaNo} from '@/model/tasksport/index'
         warehouseList:[],
         binNumberList:[],
         rollweight:0,
+        size:100,
         compId: localStorage.getItem('ws-pf_compId'),
         customerList:[],
         form:{
@@ -141,6 +149,17 @@ import {xialaNo} from '@/model/tasksport/index'
       this.getList()
     },
     methods: {
+      onChange() {
+      this.$refs.upload
+        .handleSaveBill()
+        .then(async response => {
+          this.form.addressUrl = response
+        })
+        .catch(res => {
+          EventBus.$emit('error', (JSON.parse(res) || {}).message)
+          this.$refs.upload.clearFiles()
+        })
+    },
     amountinginput(e){
         if(this.form.amountEdPayable){
             this.form.amountNotPayable=e-this.form.amountEdPayable

src/views/warehousenew/warehouseManagementRecord.vue

@@ -2,7 +2,7 @@
   <div class="container">
     <el-row>
       <el-col :span="18">
-        <h2 class="bg-left title">流转记录</h2>
+        <h2 class="bg-left title1">流转记录</h2>
       </el-col>
       <el-col :span="6" class="bg-right">
         <el-button class="bg-bottom" type="primary" size="small" @click="iossrecord()" v-show="this.warehouseType != 2">
@@ -67,7 +67,7 @@
             src="../../../public/img/sousuo.png" alt />
         </ws-button>
         <el-button type="primary" @click="batchPrint">批量打印</el-button>
-        <!-- <el-button type="primary" @click="salesTransfer">销售转移</el-button> -->
+        <el-button type="primary" @click="salesTransfer">销售转移</el-button>
         <el-table show-summary ref="tableData" :data="warehouseList.records" height="570"
           v-show="this.warehouseType== '1'" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
@@ -187,8 +187,8 @@
               <span v-if='scope.row.inOutFlag==1'>{{ scope.row.backOffice }}</span>
             </template>
           </el-table-column>
-          <!-- <el-table-column prop="salesTransferStatus" label="销售转移状态"  width="150px">
-          </el-table-column> -->
+          <el-table-column prop="salesTransferStatus" label="销售转移状态"  width="150px">
+          </el-table-column>
           
           <el-table-column prop="addressUrl" label="操作" width="100px">
             <template slot-scope="scope">
@@ -292,8 +292,8 @@
           <el-table-column prop="agent" label="经办人">
           </el-table-column>
           <el-table-column prop="backOffice" label="操作人"> </el-table-column>
-          <!-- <el-table-column prop="salesTransferStatus" label="销售转移状态"  width="150px">
-          </el-table-column> -->
+          <el-table-column prop="salesTransferStatus" label="销售转移状态"  width="150px">
+          </el-table-column>
           <el-table-column prop="addressUrl" label="附件">
             <template slot-scope="scope">
               <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
@@ -326,15 +326,16 @@
       <el-image style="width: 100px; height: 100px" :src="appendixIdss" :preview-src-list="srcList">
       </el-image>
     </WinseaContentModal>
-    <WinseaContentModal v-model="show" title="销售转移"
+    <WinseaContentModal class="sale-form" v-model="show" title="销售转移"
       @on-cancel="handleClose">
       <div>
+        <div class="title">转移前</div>
         <div style="display:inline-block;" v-for="item in modification">{{ item.carNo }} ({{ item.netWeight }})</div>
       </div>
       <div>合计：{{modification.length}}车 {{num}}吨 合同编号：{{currectdata.contractNo}}（{{currectdata.pointOut}}）</div>
       
       <el-form label-position="left" class="sale-form" ref="form" :model="currectdata" label-width="160px">
-        
+        <div class="title">转移后</div>
         <el-form-item label="出入库任务">
           <el-select @change="taskNochange" v-model="currectdata.taskNoNew" placeholder="选择转移后的出入库任务编号">
             <el-option v-for="item in arr2"  :key="item.id" :label="item.inOutTaskNo+(item.taskFlag?'（'+item.taskFlag+'）':'')" :value="item.inOutTaskNo"></el-option>
@@ -349,11 +350,9 @@
             <el-option  v-for="item in taskInfo" :label="item.taskNo" :value="item.taskNo"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="show=false">取消</el-button>
-          <el-button type="primary" @click="onSubmit">提交</el-button>
-        </el-form-item>
       </el-form>
+      <div style="text-align:center;"><el-button @click="show=false">取消</el-button>
+          <el-button type="primary" @click="onSubmit">提交</el-button></div>
     </WinseaContentModal>
   </div>
 
@@ -957,11 +956,11 @@
     text-align: center;
   }
 
-  .title {
+  .title1 {
     position: relative;
   }
 
-  .title::before {
+  .title1::before {
     content: '';
     display: inline-block;
     width: 5px;
@@ -1319,7 +1318,13 @@
     left: 0;
     right: 0;
     margin: auto;
-    height: 410px;
+    height: 369px;
     border-radius: 10px;
   }
+  /deep/.sale-form .title{
+    font-weight:600;
+  }
+  /deep/.sale-form .el-form-item__label{
+    font-weight:500;
+  }
 </style>