Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

package.json

@@ -2,7 +2,7 @@
   "name": "@winsea-product/winsea-product-platform-front",
   "version": "6.6.3-2-hot",
   "description": "用户前台前端",
-  "author": "赢海科技",
+  "author": "中天",
   "main": "main.js",
   "build": {
     "appId": "com.hangge.demo",
@@ -76,7 +76,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.0.0",
-    "autoprefixer": "^7.1.2",
+    "autoprefixer": "^9.5.1",
     "@babel/register": "7.0.0",
     "@pixul/node-rancher-api": "^1.4.0",
     "@vue/cli-plugin-babel": "3.6.0",
@@ -84,7 +84,6 @@
     "@vue/cli-plugin-pwa": "^3.12.1",
     "@vue/cli-service": "3.5.3",
     "@vue/test-utils": "1.0.0-beta.29",
-    "autoprefixer": "^9.5.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "chai": "^4.1.2",

src/api/V2/contract/index.js

@@ -1,4 +1,6 @@
 // 根据ID,常量类别获常量数据
+// 查看合同接口
+export const API_GET_EXAMINE_HISTORY = '/contractManagementInfo/getInfo'
 export const API_GET_CONTRACT_TENANT = '/contractManagementInfo/selectInfo'
                                         
 export const API_POST_ADD_CONTRACT_TENANT = '/contractManagementInfo/api/addInfo'
@@ -15,4 +17,3 @@ export const API_POST_CUSTOM_DOWN_DELETE = '/customDropDown/api/saveDelete'
 export const API_POST_EXPORT = '/contractManagementInfo/export'
 // 操作历史
 export const API_POST_BILL_OPERATE_HIS = '/billOperateHis/query/commonBillOperateHis'
-

src/model/contarct/index.js

@@ -4,13 +4,15 @@ import { appRx } from '../defalutConfig/indexRx'
 import {
     API_GET_CONTRACT_TENANT,
     API_POST_ADD_CONTRACT_TENANT,
+    API_GET_EXAMINE_HISTORY,
     API_POST_MANNER_OF_PACKING_TENANT,
     API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN,
     API_POST_CUSTOM_DOWN_ADD,
     API_POST_CUSTOM_DOWN_EDIT,
     API_POST_CUSTOM_DOWN_DELETE,
     API_POST_EXPORT,
-    API_POST_BILL_OPERATE_HIS
+    API_POST_BILL_OPERATE_HIS,
+    
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -18,6 +20,8 @@ export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHan
 export const addList = appRx.post(API_POST_ADD_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
 // 下拉
 export const packList = appRx.get(API_POST_MANNER_OF_PACKING_TENANT, errorCatcher, errorHandle, filter)
+//查看
+export const getInquiry = appRx.get(API_GET_EXAMINE_HISTORY,errorCatcher,errorHandle,filter)
 // 下拉
 export const xiala = appRx.get(API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
 export const addxiala = appRx.post(API_POST_CUSTOM_DOWN_ADD, errorCatcher, errorHandle, filter)

src/views/contractManagement/purchaseContract.vue

@@ -216,6 +216,7 @@ export default {
         searchKeyWord: this.searchKeyWord,
         startDate: this.startDate,
         endDate: this.endDate,
+        contrPage:this.contrPage,
       })
         .toPromise()
         .then((response) => {

src/views/contractManagement/purchaseContractExamine.vue

@@ -24,7 +24,7 @@
     >
       <div class="remark">
       <h3>基本信息</h3>
-    </div>
+      </div>
         <ws-info-table>
           <ws-form-item
             label="合同编号"
@@ -139,6 +139,7 @@
           </ws-form-item>
         </ws-info-table>
       </base-card>
+      
       <!--面试信息-->
       <div class="remark">
       <h3>货物信息</h3>

src/views/contractManagement/salesContract.vue

@@ -123,9 +123,9 @@
   </div>
 </template>
 <script>
-import {
-  getList
-} from '@/model/procurement/spare'
+import { getVesselOne } from '@/model/procurement/basic'
+import{getList}from'@/model/contarct/index'
+import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   watch: {
@@ -180,27 +180,41 @@ export default {
         interviewResult: '1',
         interviewOpinion: '',
         aliasName: '',
-
-        
+        contractType:1,
+        currentPage:1,
+        pageSize:10,
+        searchType:1,
+        searchKeyWord:'',
+        startDate:null,
+        endDate: null,
       },
     }
   },
   created() {
     //cg.viewBudget
     //cg.viewSpareMoney
-    // this.getVesselData();
+    // this.getVesselData();\
     this.getList()
-    this.showType = this.isShow
   },
   methods: {
-    getList(){
+    getList() {
       getList({
         
-      }).toPromise().then(response => {
-        this.contractList = response
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        contractType:this.contractType,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        searchKeyWord: this.searchKeyWord,
+        startDate: this.startDate,
+        endDate: this.endDate,
+        contrPage:this.contrPage,
       })
+        .toPromise()
+        .then((response) => {
+          this.contractList = response
+        })
     },
-    selectCrtDuty(){},
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
       this.dialogViewSpareMoney = false
@@ -306,6 +320,9 @@ export default {
     }
   }
 }
+/deep/.el-table .el-table__header .cell, /deep/.el-table .el-table__body .cell{
+    text-align: center;
+}
 .box-app {
   display: inline-block;
   

src/views/contractManagement/salesContractExamine.vue

@@ -1,5 +1,7 @@
+
 <!--销售合同-->
 <!--2019年5月30日 20:25:16 by jlx-->
+
 <template>
   <div class="container">
     <el-row>
@@ -28,10 +30,10 @@
             <ws-form-item label="合同编号"
                           span="1"
                           prop="seafarerName">
-              <!-- <ws-input 
+               <ws-input 
                         v-model="deptBudgetList.seafarerName"
                         maxlength="100"
-                        size="small" /> -->
+                        size="small" /> 
 
               <span v-if="!isEdited || deptBudgetList.add || registered === '1'"
                    
@@ -52,7 +54,7 @@
               ">
               {{
                 deptBudgetList.crtDutyName
-              }}</span>
+              }}
             </ws-form-item>
             <br>
             <!--买方-->
@@ -426,7 +428,7 @@
                          @change="selectDuty">
                 <ws-option v-for="item in dutyList"
                            :key="item.dutyId"
-                           v-if="item.enabled"
+                           
                            :label="item.chineseName"
                            :value="item.dutyId" />
               </ws-select>
@@ -683,27 +685,37 @@
                 deptBudgetList.interviewResult
               }}</span>
             </ws-form-item>
-           
+            
+           <div class="remark">
+          <h3>备注信息</h3>
+        </div>
+        {{deptBudgetList.contractProcessInfo.remarks}}
+        <img :src="deptBudgetList.contractProcessInfo.addressUrl" alt="">
+
           </ws-info-table>
   </ws-form>
-  
   </div>
   
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      tableData: [],
-      deptBudgetList: {},
-      ruleDeptBudget: [],
-    }
-  },
-  created() {
+import { getInquiry } from '@/model/contarct/index'
+
+  export default {
+    data() {
+      return {
+        tableData: [],
+        deptBudgetList:{},
+        ruleDeptBudget:[]
+      }
+    },
+    created() {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
+   
+    this.getInquiry()
+    
     this.showType = this.isShow
   },
   methods: {
@@ -713,9 +725,22 @@ export default {
     },
     handleExamine() {},
     approve() {},
-  },
-}
+    getInquiry(){
+      getInquiry({}).toPromise().then(response => {
+        this.contractForm = response
+      })
+      // }).then(response => {
+      //   this.getInquiry = response
+    } 
+
+      //  // 获取数据
+      // this.getInquiry({  
+      // }).then(response => {
+      //   this.getInquiry = response
+    },
+  }  
 </script>
+
 <style lang="scss" scoped>
 .bg-left {
   padding-left: 30px;
@@ -865,4 +890,4 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
-</style>
+</style>

src/viewsjs/procurement/procurementBasic/contractDetail.js

@@ -69,7 +69,7 @@ export default {
       // 获取数据
       getTypeList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        constCode: 'CONTRACT_TYPE'
+        constCode: 'CONTRACT_INQUIRY'
       }).toPromise().then(response => {
         this.contractList = response
       })