소스 검색

采购合同查看,销售查找

18513069273 4 년 전
부모
커밋
8c464f9210

+ 6 - 3
src/lang/zh.js

@@ -480,9 +480,10 @@
     // 合同管理
     // 合同管理
     contractManagement: '合同管理',
     contractManagement: '合同管理',
     purchaseContract: '采购合同',
     purchaseContract: '采购合同',
-    salesContract: '销售合同'
-    ,
+    salesContract: '销售合同',
+    salesContractEdit: '销售合同编辑',
     salesContractExamine: '销售合同查看',
     salesContractExamine: '销售合同查看',
+    purchaseContractExamine: '采购合同查看',
     // 采购模块
     // 采购模块
     procurement: '采购管理',
     procurement: '采购管理',
     sparepart: '备件采购',
     sparepart: '备件采购',
@@ -4650,7 +4651,9 @@
   // 合同管理
   // 合同管理
   sales: {
   sales: {
     salesContract: '销售合同',
     salesContract: '销售合同',
-    salesContractExamine: '销售合同查看'
+    salesContractEdit: '销售合同编辑',
+    salesContractExamine: '销售合同查看',
+    purchaseContractExamine: '采购合同查看',
   },
   },
   purchase: {
   purchase: {
     purchaseContract: '采购合同',
     purchaseContract: '采购合同',

+ 31 - 0
src/views/contractManagement/component/routers/route.js

@@ -40,6 +40,21 @@ const contractManagementRouter = {
         keepAlive: true
         keepAlive: true
       }
       }
     },
     },
+    {
+      path: 'purchaseContractExamine',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/purchaseContractExamine'),
+      name: 'purchaseContractExamine',
+      meta: {
+        title: 'salesContractExamine',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.salesContract.purchaseContractExamine',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
     {
     {
       path: 'salesContractExamine',
       path: 'salesContractExamine',
       component: () =>
       component: () =>
@@ -54,7 +69,23 @@ const contractManagementRouter = {
         // module: 'procurement.sparepart.applDetail'
         // module: 'procurement.sparepart.applDetail'
       },
       },
       hidden: true
       hidden: true
+    },
+    {
+      path: 'salesContractEdit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/salesContractEdit'),
+      name: 'salesContractEdit',
+      meta: {
+        title: 'salesContractEdit',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.salesContract.salesContractEdit',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
     }
     }
+
   ],
   ],
 
 
 };
 };

+ 39 - 127
src/views/contractManagement/purchaseContract.vue

@@ -2,13 +2,42 @@
 <!--2019年5月30日 20:25:16 by jlx-->
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
 <template>
   <div>
   <div>
-    <!-- 弹出页面-审核通过 -->
-    <BaseContentModalScrap
-      v-model="dialogApproveFormVisible"
-      :title="$t('common.opinion')"
-      :isRules="false"
-      @confirm="approve"
-    />
+    <el-table :data="tableData" style="width: 100%">
+      <el-table-column type="index" />
+      <el-table-column prop="date" label="合同编号" width="80">
+      </el-table-column>
+      <el-table-column prop="name" label="货名" width="80"> </el-table-column>
+      <el-table-column prop="address" label="品级"> </el-table-column>
+      <el-table-column prop="address" label="重量(吨)"> </el-table-column>
+      <el-table-column prop="address" label="合同单价(元)"> </el-table-column>
+      <el-table-column prop="address" label="包装方式"> </el-table-column>
+      <el-table-column prop="address" label="买方"> </el-table-column>
+      <el-table-column prop="address" label="卖方"> </el-table-column>
+      <el-table-column prop="address" label="已完成(吨)"> </el-table-column>
+      <el-table-column prop="address" label="状态"> </el-table-column>
+      <el-table-column prop="address" label="签订日期"> </el-table-column>
+      <el-table-column prop="address" label="已付款(元)"> </el-table-column>
+      <el-table-column prop="address" label="附件"> </el-table-column>
+      <el-table-column prop="address" label="操作" width="300">
+        <template slot-scope="scope">
+          <el-button
+            type="success"
+            size="small"
+            @click="handleExamine(scope.row)"
+            >查看</el-button
+          >
+          <el-button
+            type="primary"
+            size="small"
+            @click="handleUpdate(scope.row)"
+            >编辑</el-button
+          >
+          <el-button type="danger" size="small" @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -39,7 +68,7 @@ export default {
       year: '',
       year: '',
       // 提交类型
       // 提交类型
       submitType: true,
       submitType: true,
-      tableData: [],
+      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
     }
     }
   },
   },
   created() {
   created() {
@@ -49,126 +78,9 @@ export default {
     this.showType = this.isShow
     this.showType = this.isShow
   },
   },
   methods: {
   methods: {
-    // 获得船舶对象
-    getVesselData() {
-      getVesselOne({
-        vesselId: this.vesselId,
-      })
-        .toPromise()
-        .then((succ) => {
-          this.monetaryKey = succ.manageTypeKey
-          if (!this.monetaryKey) {
-            // this.monetaryKey = "1";
-            this.showType = false
-          }
-        })
-        .catch((error) => {
-          console.log(error)
-        })
+    handleExamine(row) {
+      this.$router.push({ path: 'purchaseContractExamine' })
     },
     },
-    // 行文字颜色控制
-    tableRowClassName(row) {
-      if (this.monetaryKey == 4) {
-        if (row.row.remainingAmountAterPurchase < 0) {
-          this.submitType = false
-          return 'error-row'
-        }
-      } else {
-        if (row.row.localCurrency > row.row.remainBudgetMoney) {
-          this.submitType = false
-          return 'error-row'
-        }
-      }
-    },
-    // 显示弹出框前准备
-    showDialog() {
-      this.$emit('viewSpareMoneyGetDate')
-    },
-    // 数据处理
-    viewSpareMoneyGetDate: async function (subData, showType) {
-      if (this.monetaryKey == 4) {
-        //备用金
-
-        let originalCoin = 0
-        let localCurrency = 0
-        // 数据整合
-        for (let i = 0; i < subData.length; i++) {
-          originalCoin += subData[i].originalCoin
-          localCurrency += subData[i].localCurrency
-        }
-
-        let moneydata = await this.getdate()
-        this.tableDate = [
-          {
-            originalCoin: originalCoin,
-            localCurrency: localCurrency,
-            imprestBalance: 0,
-            warningThreshold: 0,
-          },
-        ]
-        if (moneydata) {
-          this.tableDate[0].imprestBalance = parseFloat(
-            this.tableDate[0].imprestBalance *
-              (this.tableDate[0].warningThreshold / 100)
-          ).toFixed(2)
-
-          this.tableDate[0].warningThreshold = moneydata.warningThreshold
-        }
-        this.tableDate[0].remainingAmountAterPurchase = parseFloat(
-          this.tableDate[0].imprestBalance - this.tableDate[0].localCurrency
-        ).toFixed(2)
-
-        if (this.tableDate[0].remainingAmountAterPurchase < 0) {
-          this.submitType = false
-        }
-      } else {
-        //余额
-        if (this.budgetYear) {
-          // let myDate = new Date()
-          // this.year = myDate.getFullYear()
-          this.year = dayjs().format('YYYY')
-        } else {
-          this.year = this.budgetYear.substr(0, 4)
-        }
-
-        for (let i = 0; i < subData.length; i++) {
-          let moneydata = await this.getdate(subData[i].subjectId)
-          subData[i].budgetMoney = parseFloat(moneydata.budgetMoney).toFixed(2)
-          subData[i].remainBudgetMoney = parseFloat(
-            moneydata.remainBudgetMoney
-          ).toFixed(2)
-
-          subData[i].remainingAmountAterPurchase = parseFloat(
-            subData[i].remainBudgetMoney - subData[i].localCurrency
-          ).toFixed(2)
-
-          if (
-            subData[i].budgetMoney <= 0 ||
-            subData[i].remainingAmountAterPurchase <= 0
-          ) {
-            subData[i].remainingAmount = 0
-          } else {
-            subData[i].remainingAmount =
-              subData[i].remainingAmountAterPurchase / subData[i].budgetMoney
-          }
-          if (subData[i].remainingAmount <= 0) {
-            subData[i].remainingAmount = 0
-          }
-
-          if (subData[i].localCurrency > subData[i].remainBudgetMoney) {
-            this.submitType = false
-          }
-        }
-        this.tableDate = subData
-      }
-      if (showType != false) {
-        this.dialogViewSpareMoney = true
-      }
-      return Promise.resolve(this.submitType)
-    },
-    // 数据获取
-    getdate: async function (subId) {},
-
     // 关闭 dialog时 处理文件url 初始化upload组件
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
     handleClose() {
       this.dialogViewSpareMoney = false
       this.dialogViewSpareMoney = false

+ 546 - 0
src/views/contractManagement/purchaseContractExamine.vue

@@ -0,0 +1,546 @@
+<!--销售合同-->
+<!--2019年5月30日 20:25:16 by jlx-->
+<template>
+  <div class='container'>
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left">查看合同详情</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          >返回</el-button
+        >
+      </el-col>
+    </el-row>
+   
+    <ws-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
+      <div class="remark">
+      <h3>基本信息</h3>
+      <p>注:基本信息和货物信息均为必填项,“*” 标记的条目提交后不可修改。</p>
+    </div>
+        <ws-info-table>
+          <ws-form-item
+            label="合同编号"
+            span="1"
+            prop="seafarerName"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="运输方式"
+            span="1"
+            prop="crtDutyId"
+            key=""
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="买方"
+            span="1"
+            prop="registered"
+            :key=""
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="结算方式"
+            span="1"
+            prop="registered"
+            :key=""
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="卖方"
+            span="1"
+            prop="registered"
+            :key=""
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="货源地"
+            span="1"
+            prop="registered"
+            :key=""
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="买方电话"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="交货地"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+           <ws-form-item
+            label="卖方电话"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="包装方式"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="重量(吨)"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="验收方式"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="短溢装(%)"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="交货日期(起)"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="合同单价(元/吨)"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="交货日期(止)"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="合同总价(元)"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="签订日期"
+            span="1"
+            :prop="!deptBudgetList.add && registered != 1 ? 'birthday' : ''"
+            :key="
+              !deptBudgetList.add || registered != 1
+                ? 'birthday_haveProp'
+                : 'birthday_noProp'
+            "
+          >
+          </ws-form-item>
+        </ws-info-table>
+      </base-card>
+      <!--面试信息-->
+      <div class="remark">
+      <h3>货物信息</h3>
+    </div>
+        <ws-info-table>
+          <ws-form-item
+            label="货名"
+            span="1"
+            prop="dutyId"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="水分(%)<="
+            span="1"
+            prop="intendedShipId"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="品级"
+            span="1"
+            prop="interviewPersons"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="杂质(%)<="
+            span="1"
+            prop="interviewDates"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="容重(克/升)<="
+            span="1"
+            prop="interviewType"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="霉变粒(%)<="
+            span="1"
+            prop="interviewResult"
+            class="result"
+          >
+            
+          </ws-form-item>
+           <ws-form-item
+            label="焦糊粒(%)<="
+            span="1"
+            prop="interviewType"
+          >
+            
+          </ws-form-item>
+          <ws-form-item
+            label="不完善粒(%)<="
+            span="1"
+            prop="interviewResult"
+            class="result"
+          >
+            
+          </ws-form-item>
+        </ws-info-table>
+        <div class="remark">
+          <h3>流程信息</h3>
+        </div>
+        <ws-info-table>
+          <ws-form-item
+            label="合同收入(元)"
+            span="1"
+            prop="dutyId"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="已开发票(元)"
+            span="1"
+            prop="intendedShipId"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="合同外支出(元)"
+            span="1"
+            prop="interviewPersons"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="未开发票(元)"
+            span="1"
+            prop="interviewDates"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="未回款(元)"
+            span="1"
+            prop="interviewType"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="已完成发运量(吨)"
+            span="1"
+            prop="interviewResult"
+            class="result"
+          >
+          </ws-form-item>
+           <ws-form-item
+            label="双章原件回收情况"
+            span="1"
+            prop="interviewType"
+          >
+          </ws-form-item>
+          <ws-form-item
+            label="不完善粒(%)<="
+            span="1"
+            prop="interviewResult"
+            class="result"
+          >
+          </ws-form-item>
+        </ws-info-table>
+        <div class="remark">
+          <h3>备注信息</h3>
+        </div>
+        <ws-info-table>
+          
+        </ws-info-table>
+      </base-card>
+    </ws-form>
+    <div style='text-align:right;padding:10px;'>
+      <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          >关闭</el-button
+        >
+    </div>
+  </div>
+</template>
+<script>
+import { getVesselOne } from '@/model/procurement/basic'
+import { dayjs } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      // 提交类型
+      submitType: true,
+      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
+      ruleDeptBudget: [],
+      deptBudgetList: {},
+      mainReportAdd: {},
+    }
+  },
+  created() {
+    //cg.viewBudget
+    //cg.viewSpareMoney
+    // this.getVesselData();
+    this.showType = this.isShow
+  },
+  methods: {
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    handleExamine() {},
+    approve() {},
+    returnsales() {
+      this.$router.push({ path: 'purchaseContract' })
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.el-form {
+  padding: 0 20%;
+}
+.el-form-item {
+  width: 50%;
+}
+
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 10px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 20px 0px;
+}
+.remark h3 {
+  display: inline-block;
+  margin-right: 20px;
+}
+.remark p {
+  display: inline-block;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
+.winseaview-view {
+  padding: 10px 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+</style>

+ 5 - 5
src/views/contractManagement/salesContract.vue

@@ -108,10 +108,7 @@
             @click="handleExamine(scope.row)"
             @click="handleExamine(scope.row)"
             >查看</el-button
             >查看</el-button
           >
           >
-          <el-button
-            type="primary"
-            size="small"
-            @click="handleUpdate(scope.row)"
+          <el-button type="primary" size="small" @click="handleEdit(scope.row)"
             >编辑</el-button
             >编辑</el-button
           >
           >
           <el-button type="danger" size="small" @click="handleDelete(scope.row)"
           <el-button type="danger" size="small" @click="handleDelete(scope.row)"
@@ -199,7 +196,7 @@ export default {
     handleClose() {
     handleClose() {
       this.dialogViewSpareMoney = false
       this.dialogViewSpareMoney = false
     },
     },
-    handleExamine() {
+    handleExamine(row) {
       this.$router.push({ path: 'salesContractExamine' })
       this.$router.push({ path: 'salesContractExamine' })
     },
     },
     filtlistQuery() {},
     filtlistQuery() {},
@@ -207,6 +204,9 @@ export default {
     vesselIdSelected() {},
     vesselIdSelected() {},
     seelctShips() {},
     seelctShips() {},
     checkBtn() {},
     checkBtn() {},
+    handleEdit(row) {
+      this.$router.push({ path: 'salesContractEdit' })
+    },
     approve() {},
     approve() {},
     listQuery() {},
     listQuery() {},
     total() {},
     total() {},

+ 205 - 0
src/views/contractManagement/salesContractEdit.vue

@@ -0,0 +1,205 @@
+<template>
+  <div>       
+<el-row>
+  <el-col :span="12" >
+      <h2 class="bg-left">修改合同信息</h2>
+      </el-col> 
+  <el-col :span="12" class="bg-right">
+       <el-button class="bg-bottom"
+            type="primary"
+            size="small"
+            @click="returnsales()"
+            >返回</el-button
+          >
+      
+      </el-col>
+</el-row>
+
+  <div class="wenzi">
+      <h3>基本信息</h3><p>注:基本信息和货物信息均为必填项,“*” 标记的条目提交后不可修改。</p>
+  </div>
+  </div>
+  
+     
+  
+
+</template>
+<script>
+import { getVesselOne } from '@/model/procurement/basic'
+import { dayjs } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      // 提交类型
+      submitType: true,
+      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
+    }
+  },
+  created() {
+    //cg.viewBudget
+    //cg.viewSpareMoney
+    // this.getVesselData();
+    this.showType = this.isShow
+  },
+  methods: {
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+   returnsales(){
+       this.$router.push({ path: 'salesContract' })
+   }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left{
+    padding-left: 10px;
+}
+.bg-right{   
+      padding-right: 10px; 
+      text-align: right;
+}
+.bg-bottom{
+     margin: 20px 0px; 
+}
+
+
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+ 
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
+</style>

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

@@ -47,7 +47,7 @@ export default {
     },
     },
     handleExamine() {},
     handleExamine() {},
     approve() {},
     approve() {},
-  },
+  }
 }
 }
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>

+ 38 - 28
src/winseaUi/WsFormItem/src/index.vue

@@ -2,20 +2,24 @@
 Rising * @Last Modified time: 2020-01-03 16:36:23 * @Description: WsForm辅助组件
 Rising * @Last Modified time: 2020-01-03 16:36:23 * @Description: WsForm辅助组件
 */
 */
 <template>
 <template>
-  <el-form-item ref="theInput"
-                :label="label"
-                :rules="rules"
-                :prop="prop"
-                :required="rules ? false : requireFlag"
-                :class="{
+  <el-form-item
+    ref="theInput"
+    :label="label"
+    :rules="rules"
+    :prop="prop"
+    :required="JSON.stringify(rules) == '{}' ? false : requireFlag"
+    :class="{
       showInputToopTip: showInputToopTip,
       showInputToopTip: showInputToopTip,
-      showLableToopTip: showLableToopTip
-    }">
-    <el-tooltip v-if="showInputToopTip"
-                :content="tipContent"
-                placement="top-start"
-                popper-class="popper-class"
-                effect="light">
+      showLableToopTip: showLableToopTip,
+    }"
+  >
+    <el-tooltip
+      v-if="showInputToopTip"
+      :content="tipContent"
+      placement="top-start"
+      popper-class="popper-class"
+      effect="light"
+    >
       <span>{{ tipContent }}</span>
       <span>{{ tipContent }}</span>
     </el-tooltip>
     </el-tooltip>
     <slot v-if="!showInputToopTip"></slot>
     <slot v-if="!showInputToopTip"></slot>
@@ -34,15 +38,21 @@ export default {
     // input的标题
     // input的标题
     label: {
     label: {
       type: String,
       type: String,
-      default: null
+      default: null,
+    },
+    rules: {
+      type: Object,
+      default() {
+        return {}
+      },
     },
     },
     // 检验索引key
     // 检验索引key
     prop: {
     prop: {
       type: String,
       type: String,
-      default: ''
-    }
+      default: '',
+    },
   },
   },
-  data () {
+  data() {
     return {
     return {
       // 是否显示tip
       // 是否显示tip
       showInputToopTip: false,
       showInputToopTip: false,
@@ -52,7 +62,7 @@ export default {
       // 是否必填
       // 是否必填
       requireFlag: false,
       requireFlag: false,
       // tip显示内容
       // tip显示内容
-      tipContent: ''
+      tipContent: '',
       //
       //
       // dictArray: []
       // dictArray: []
     }
     }
@@ -63,9 +73,9 @@ export default {
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.autoLableTip()
         this.autoLableTip()
       })
       })
-    }
+    },
   },
   },
-  mounted () {
+  mounted() {
     // 获取全部的字典
     // 获取全部的字典
     // let zh_array = sessionStorage.getItem("InterNational_zh_array");
     // let zh_array = sessionStorage.getItem("InterNational_zh_array");
     // if (zh_array) {
     // if (zh_array) {
@@ -79,14 +89,14 @@ export default {
       this.autoLableTip()
       this.autoLableTip()
     })
     })
   },
   },
-  updated () {
+  updated() {
     this.initTip()
     this.initTip()
   },
   },
   methods: {
   methods: {
     // 判断插槽中是否插入标签 如果未插入则认为使用该标签进行反显
     // 判断插槽中是否插入标签 如果未插入则认为使用该标签进行反显
     // 不推荐这么做 为了不影响对外API只能读取插槽内容来读取显示的文本
     // 不推荐这么做 为了不影响对外API只能读取插槽内容来读取显示的文本
     // 缺点 开发时当插槽内容改变时,tip内容不会改变 需刷新页面
     // 缺点 开发时当插槽内容改变时,tip内容不会改变 需刷新页面
-    initTip () {
+    initTip() {
       // const labelIi18 = this.dictArray.find((item, index) => {
       // const labelIi18 = this.dictArray.find((item, index) => {
       //   return item.value === this.label;
       //   return item.value === this.label;
       // });
       // });
@@ -110,7 +120,7 @@ export default {
       }
       }
     },
     },
     // tip自动开关
     // tip自动开关
-    autoInputTip () {
+    autoInputTip() {
       let VDOM = this.$refs['theInput']
       let VDOM = this.$refs['theInput']
       if (VDOM) {
       if (VDOM) {
         let inputDOM = VDOM.$el.querySelectorAll('.el-form-item__content')
         let inputDOM = VDOM.$el.querySelectorAll('.el-form-item__content')
@@ -126,7 +136,7 @@ export default {
       }
       }
     },
     },
     // tip自动开关
     // tip自动开关
-    autoLableTip () {
+    autoLableTip() {
       let VDOM = this.$refs['theInput']
       let VDOM = this.$refs['theInput']
       if (VDOM) {
       if (VDOM) {
         let lableDOM = VDOM.$el.querySelectorAll('.el-form-item__label')
         let lableDOM = VDOM.$el.querySelectorAll('.el-form-item__label')
@@ -142,8 +152,8 @@ export default {
           }
           }
         }
         }
       }
       }
-    }
-  }
+    },
+  },
 }
 }
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
@@ -170,10 +180,10 @@ export default {
 
 
 /deep/.el-form-item__content {
 /deep/.el-form-item__content {
   white-space: nowrap;
   white-space: nowrap;
-  .el-select{
+  .el-select {
     width: 100%;
     width: 100%;
   }
   }
-  .el-input-number.is-without-controls .el-input__inner{
+  .el-input-number.is-without-controls .el-input__inner {
     text-align: left;
     text-align: left;
   }
   }
 }
 }