zhongtianhaoyuan 4 年之前
父節點
當前提交
e49f04cbe4

+ 3 - 1
src/api/V2/contract/index.js

@@ -1,2 +1,4 @@
 // 根据ID,常量类别获常量数据
-export const API_GET_CONTRACT_TENANT = '/contractManagementInfo/selectinfo'
+export const API_GET_CONTRACT_TENANT = '/contractManagementInfo/selectinfo'
+
+//export const API_GET_CONTRACT_TENANT = '/contractManagementInfo/selectinfo'

+ 7 - 0
src/model/contarct/index.js

@@ -0,0 +1,7 @@
+import {
+    API_GET_CONTRACT_TENANT,
+    
+  } from '@/api/V2/contract'
+  import { errorCatcher, errorHandle, filter } from 'base-core-lib'
+import { appRx } from '../defalutConfig/indexRx'
+export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)

+ 2 - 0
src/model/procurement/spare.js

@@ -78,6 +78,7 @@ import {
   API_POST_PURSPAPPLDETAIL_DELETEPART,
   API_POST_UPLOAD,
   API_POST_DELFILE,
+  API_GET_CONTRACT_TENANT
 } from '@/api/V2/purchase'
 export const fetchList = appRx.get(API_GET_SP_PAGE, errorCatcher, errorHandle, filter)
 export const selectHistory = appRx.get(API_GET_SP_PUR_HISTORY, errorCatcher, errorHandle, filter)
@@ -157,3 +158,4 @@ export const getMailHostTypeListByTypeId = appRx.get(API_GET_MAIL_DETAIL, errorC
 export const delApplTempOther = appRx.post(API_POST_PURSPAPPLDETAIL_DELETEPART, errorCatcher, errorHandle, filter)
 export const upload = appRx.post(API_POST_UPLOAD, errorCatcher, errorHandle, filter)
 export const delFile = appRx.post(API_POST_DELFILE, errorCatcher, errorHandle, filter)
+export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)

+ 1 - 1
src/views/contractManagement/purchaseContract.vue

@@ -82,7 +82,7 @@ export default {
       this.$router.push({ path: 'purchaseContractExamine' })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
-    handleClose() {
+    handleCloe() {
       this.dialogViewSpareMoney = false
     },
   },

+ 14 - 2
src/views/contractManagement/salesContract.vue

@@ -127,8 +127,9 @@
   </div>
 </template>
 <script>
-import { getVesselOne } from '@/model/procurement/basic'
-import { dayjs } from 'base-core-lib'
+import {
+  getList
+} from '@/model/procurement/spare'
 export default {
   name: 'viewSpareMoney',
   watch: {
@@ -182,6 +183,8 @@ export default {
         interviewResult: '1',
         interviewOpinion: '',
         aliasName: '',
+
+        
       },
     }
   },
@@ -189,9 +192,18 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
+    this.getList()
     this.showType = this.isShow
   },
   methods: {
+    getList(){
+      getList({
+        
+      }).toPromise().then(response => {
+        this.contractList = response
+      })
+    },
+    
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
       this.dialogViewSpareMoney = false

+ 2 - 12
src/views/contractManagement/salesContractEdit.vue

@@ -29,9 +29,8 @@
             <ws-form-item label="合同编号"
                           span="1"
                           prop="seafarerName">
-              <ws-input 
+              <ws-input  
                         v-model="deptBudgetList.seafarerName"
-
                         size="small" />
               <i v-if="isEdited && registered == '1'"
                  class="iconfont iconaddy1 ml10"
@@ -577,19 +576,11 @@
            <ws-input
                         v-model="deptBudgetList.seafarerName"
                         maxlength="100"
-                        type="textarea" height='100' />
-          <!-- <el-form-item label="备注信息">
-    <el-input type="textarea" v-model="form.desc"></el-input>
-  </el-form-item> -->
-           
+                        type="textarea" height='100' />      
           </ws-info-table>    
       </ws-form>
       </div>
   </div>
-  
-     
-  
-
 </template>
 <script>
 import { getVesselOne } from '@/model/procurement/basic'
@@ -629,7 +620,6 @@ export default {
       sexList:{},
       pickerBeginDateBefore:{},
       selectDuty:{},
-     
       selectIntendedShip:{},
       interviewTypeList:{},
     }

+ 1 - 1
vue.config.js

@@ -142,7 +142,7 @@ module.exports = {
 
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
-        target: 'http://192.168.1.124:8090/',
+        target: 'http://localhost:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址