前端gjy

src/model/contarct/index.js

@@ -1,3 +1,4 @@
+
 import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 import { appRx } from '../defalutConfig/indexRx'
 import {
@@ -28,4 +29,4 @@ export const export1 = appRx.get(API_POST_EXPORT)
 // 操作历史
 export const billoperatehis = appRx.get(API_GET_BILL_OPERATE_HIS, errorCatcher, errorHandle, filter)
 // 修改状态
-export const editstatus = appRx.post(API_POST_EDITSTATUS, errorCatcher, errorHandle, filter)
+export const editstatus = appRx.post(API_POST_EDITSTATUS, errorCatcher, errorHandle, filter)

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)

src/views/contractManagement/purchaseContract.vue

@@ -74,6 +74,7 @@
       </template>
     </BaseHeaderLayout>
     <el-table
+      class="wenzi"
       :data="contractList.records"
       style="width: 100%; margin-top: 10px"
     >
@@ -321,7 +322,7 @@ export default {
       this.$router.push({ path: 'purchaseContractEdit' })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
-    handleClose() {
+    handleCloe() {
       this.dialogViewSpareMoney = false
     },
     history(row) {

src/views/contractManagement/purchaseContractAdd.vue

@@ -274,7 +274,7 @@
         />
           </ws-form-item>
         </ws-info-table>
-      </base-card>
+      <base-card>
       <!--面试信息-->
       <div class="remark">
       <h3>货物信息</h3>

src/views/contractManagement/salesContract.vue

@@ -2,41 +2,12 @@
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="10">
+    <BaseHeaderLayout :leftSpan="16"> 
+     
       <template slot="left">
-        <ws-button
-          type="primary"
-          :disable="checkBtn"
-          @click="handleAdd()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >添加</ws-button
-        >
-        <ws-button
-          :disable="checkBtn"
-          @click="enquiry(3)"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >导出</ws-button
-        >
-      </template>
-      <template slot="right">
-        <ws-select
-          v-model="deptBudgetList.crtDutyId"
-          placeholder=""
-          class="typeselect"
-          @change="selectCrtDuty"
-        >
-          <ws-option
-            v-for="item in taskTypeList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-          />
-        </ws-select>
-        <ws-date-picker
+       
+       
+        <ws-date-picker class="times"
           :picker-options="pickerBeginDateBefore"
           v-model="deptBudgetList.birthday"
           type="date"
@@ -46,7 +17,7 @@
           value-format="yyyy-MM-dd"
         />
         <span>至</span>
-        <ws-date-picker
+        <ws-date-picker class="times"
           :picker-options="pickerBeginDateBefore"
           v-model="deptBudgetList.birthday"
           type="date"
@@ -55,7 +26,7 @@
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
         />
-        <ws-input
+        <ws-input 
           v-model="deptBudgetList.interviewOpinion"
           placeholder="可按照合同编号、买方名称、卖方名称进行查找"
           clearable
@@ -73,8 +44,42 @@
           "
           >查找</ws-button
         >
+          <ws-select
+          v-model="deptBudgetList.crtDutyId"
+          placeholder=""
+          class="typeselect"
+          @change="selectCrtDuty"
+        >
+       
+          <ws-option class="topcenter"
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+          />
+        </ws-select>
       </template>
-    </BaseHeaderLayout>
+       <template slot="right" >
+         
+        <ws-button
+          type="primary"
+          :disable="checkBtn"
+          @click="handleAdd()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >添加</ws-button
+        >
+        <ws-button
+          :disable="checkBtn"
+          @click="enquiry(3)"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >导出</ws-button
+        >
+      </template>
+    </BaseHeaderLayout> 
     <el-table :data="tableData" style="width: 100%; margin-top: 10px">
       <el-table-column type="index" />
       <el-table-column prop="date" label="合同编号" width="80">
@@ -118,8 +123,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: {
@@ -148,6 +154,7 @@ export default {
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
+      pickerBeginDateBefore:{},
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
       taskTypeList: [
         { value: '未完成（默认）' },
@@ -173,6 +180,8 @@ export default {
         interviewResult: '1',
         interviewOpinion: '',
         aliasName: '',
+
+        
       },
     }
   },
@@ -180,9 +189,18 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
+    this.getList()
     this.showType = this.isShow
   },
   methods: {
+    getList(){
+      getList({
+        
+      }).toPromise().then(response => {
+        this.contractList = response
+      })
+    },
+    selectCrtDuty(){},
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
       this.dialogViewSpareMoney = false
@@ -208,7 +226,10 @@ export default {
   },
 }
 </script>
+
 <style lang="scss" scoped>
+
+
 .padding-xs {
   padding: 15px;
   text-align: right;
@@ -287,7 +308,7 @@ export default {
 }
 .box-app {
   display: inline-block;
-  float: left;
+  
   margin-left: 30px;
   line-height: 50px;
 }
@@ -370,4 +391,4 @@ export default {
     padding: 0 !important;
   }
 }
-</style>
+</style>

vue.config.js

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