Browse Source

前端mxx

gjy 4 years ago
parent
commit
c198cee29e

+ 2 - 0
src/api/V2/contract/index.js

@@ -20,3 +20,5 @@ export const API_GET_BILL_OPERATE_HIS = '/billOperateHis/query/commonBillOperate
 export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'
 //删除销售合同
 export const API_POST_CONTRACT_DELETE ='contractManagementInfo/deleteInfo '
+//销售合同修改编辑
+export const API_POST_EDITINFO = '/contractManagementInfo/editInfo'

+ 4 - 1
src/model/contarct/index.js

@@ -14,6 +14,7 @@ import {
     API_POST_EDITSTATUS,
     API_GET_CONTRACT_MANAGEMENTINFO,
     API_POST_CONTRACT_DELETE,
+    API_POST_EDITINFO
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -35,4 +36,6 @@ export const billoperatehis = appRx.get(API_GET_BILL_OPERATE_HIS, errorCatcher,
 // 修改状态
 export const editstatus = appRx.post(API_POST_EDITSTATUS, errorCatcher, errorHandle, filter)
 //删除销售合同
-export const deletecontract = appRx.post(API_POST_CONTRACT_DELETE,errorCatcher,errorHandle,filter) 
+export const deletecontract = appRx.post(API_POST_CONTRACT_DELETE,errorCatcher,errorHandle,filter) 
+//修改销售合同编辑
+export const editInfo = appRx.post(API_POST_EDITINFO, errorCatcher, errorHandle, filter)

+ 74 - 19
src/views/contractManagement/purchaseContract.vue

@@ -97,11 +97,12 @@
           <el-popover
             placement="left"
             :width="400"
-            trigger="hover"
+            trigger="click"
+            visible-arrow="false"
             @show="history(scope.row)"
           >
-            <template #reference>
-              <span>{{ scope.row.status }}</span>
+            <template>
+              <span slot="reference">{{ scope.row.status }}</span>
             </template>
             <div>
               <p>操作历史</p>
@@ -147,28 +148,34 @@
         </template>
       </el-table-column>
     </el-table>
-
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
     <!-- 附件弹框 -->
-    <!-- <WinseaContentModal
+    <WinseaContentModal
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose"
     >
+      <p>查看附件</p>
       <ws-upload
-        ref="uploads"
-        table-name="ism_circular_management_info "
-        :vesselId="my_vesselId ? my_vesselId : ''"
-        oss-key="circularLetter"
-        :editable="false"
-        :appendix-ids="appendixIdss"
+        ref="upload"
+        table-name="maintain_work_order"
+        oss-key="mainPlan"
         :comp-id="compId"
+        :appendix-ids="appendixIdsAdd"
+        :vesselId="deptBudgetList.addressUrl"
+        :size-limit="size"
+        @uploadSuccess="uploadSuccess"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
-      <template slot="footer" class="dialog-footer">
-        <ws-button @click="hiddenHistory">{{
-          $t('crew.interviewManagement.button.cancel')
-        }}</ws-button>
-      </template>
-    </WinseaContentModal> -->
+    </WinseaContentModal>
   </div>
 </template>
 <script>
@@ -179,9 +186,15 @@ import {
   billoperatehis,
 } from '@/model/contarct/index'
 import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
   watch: {
     vesselId(val) {
       this.getList()
@@ -199,12 +212,15 @@ export default {
       monetaryKey: null,
       // 表格显示数据
       tableDate: [],
+      size: 10,
       // 是否显示
       showType: true,
       // 年
       year: '',
+      deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
+      appendixIdsAdd: '',
       searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
@@ -213,6 +229,7 @@ export default {
       endDate: null,
       // 提交类型
       submitType: true,
+      deptCircularPage: {},
       date: {
         year: dayjs().format('YYYY'),
         month: dayjs().format('MM'),
@@ -220,6 +237,7 @@ export default {
       contractList: [],
       deptBudgetList: {},
       historyList: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -242,6 +260,17 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
     getList() {
       getList({
         compId: sessionStorage.getItem('ws-pf_compId'),
@@ -256,9 +285,23 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
           this.contractList = response
         })
     },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+
+      // this.deptBudgetList.
+      // this.formData.append('files', files)
+      // this.feedbackObj.uploadNameAttachment = data.appendixName
+      // this.feedbackObj.pathUploadAttachment = data.appendixPath
+      // // this.newAppendixs = files
+      // this.onChangeFlag = true
+    },
     editClick(row) {
       var status = ''
       if (row.status == '待执行' || row.status == '已完成') {
@@ -298,7 +341,7 @@ export default {
         }
       }
     },
-    fujian() {
+    fujian(row) {
       if (
         row.receiveAttachmentPath === null ||
         row.receiveAttachmentPath === ''
@@ -370,6 +413,14 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.wrap {
+  width: 400px;
+  position: absolute;
+  top: 131px;
+  left: 794px;
+  transform-origin: right center;
+  z-index: 2005;
+}
 .vertical-line {
   height: 100px;
   border-left: 2px solid;
@@ -378,7 +429,11 @@ export default {
   // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
   // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
 }
-
+.el-pagination {
+  padding: 10px 15px;
+  margin-bottom: 0;
+  text-align: right;
+}
 .vertical-circle {
   float: left;
   width: 10px;

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

@@ -138,7 +138,7 @@
             {{deptBudgetList.signingDate}}
           </ws-form-item>
         </ws-info-table>
-      </base-card>
+      <base-card>
       
       <!--面试信息-->
       <div class="remark">

+ 6 - 8
src/views/contractManagement/salesContract.vue

@@ -333,8 +333,13 @@ historyList:{},
     seelctShips() {},
     checkBtn() {},
     handleEdit(row) {
-      this.$router.push({ path: 'salesContractEdit' })
+      this.$router.push({
+        name: 'salesContractEdit',
+
+        params: { id: row.id },
+      })
     },
+
     approve() {},
     listQuery() {},
     total() {},
@@ -345,13 +350,6 @@ historyList:{},
         return time.getTime() > Date.now()
       },
     },
-    
-    handleDelete(row){
-     this.$router.push({
-       name:'salesContractExamine',
-       params:{id:row.id},
-     })
-    },
     handleDelete(row){
     var handleDelete = ''
       if (row.handleDelete == '待执行' || row.handleDelete == '已完成') {

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

@@ -507,8 +507,8 @@
   </div>
 </template>
 <script>
-// import { getVesselOne } from '@/model/procurement/basic'
-// import { dayjs } from 'base-core-lib'
+ import { getVesselOne } from '@/model/procurement/basic'
+ import { dayjs } from 'base-core-lib'
 import {
   packList,
   addList,
@@ -731,9 +731,9 @@ export default {
     },
     handleExamine() {},
     approve() {},
-    returnsales() {
-      this.$router.push({ path: 'purchaseContract' })
-    },
+    // returnsales() {
+    //   this.$router.push({ path: 'purchaseContract' })
+    // },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
         if (this.ChapterTwoList[i].constValue == e) {

+ 234 - 207
src/views/contractManagement/salesContractEdit.vue

@@ -43,17 +43,16 @@
           <!--运输方式-->
           <ws-form-item label="运输方式" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.shippingType"
               maxlength="100"
               size="small"
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
 
           <!--买方-->
           <ws-form-item label="买方" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.buyer"
               maxlength="100"
               size="small"
             />
@@ -63,17 +62,16 @@
           <!--结算方式-->
           <ws-form-item label="结算方式" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.settlementMethod"
               maxlength="100"
               size="small"
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
 
           <!--卖方-->
           <ws-form-item label="卖方" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.seller"
               maxlength="100"
               size="small"
             />
@@ -83,40 +81,36 @@
           <!--货源地-->
           <ws-form-item label="货源地" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.sourceGoods"
               maxlength="100"
               size="small"
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
           <!--买方电话-->
           <ws-form-item label="买方电话" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.buyerPhone"
               maxlength="100"
               size="small"
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
 
           <!--交货地-->
           <ws-form-item label="交货地" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.placeDelivery"
               maxlength="100"
               size="small"
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
 
           <!--卖方电话-->
           <ws-form-item label="卖方电话" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.sellerPhone"
               maxlength="100"
               size="small"
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
 
           <!--包装方式-->
@@ -125,7 +119,7 @@
               v-model="deptBudgetList.packingMethod"
               placeholder=""
               class="typeselect"
-              @change="selectCrtDuty"
+              @change="selectpackingMethod"
             >
               <ws-option
                 v-for="item in packtypeList"
@@ -135,44 +129,90 @@
               />
             </ws-select>
           </ws-form-item>
-
           <!--重量(吨)-->
           <ws-form-item label="重量(吨)" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.weight"
               maxlength="100"
               size="small"
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
 
           <!--验收方式-->
-          <ws-form-item label="验收方式" span="1" prop="packingMethod">
-            <ws-select
-              v-model="deptBudgetList.packingMethod"
-              placeholder=""
-              class="typeselect"
-              @change="selectCrtDuty"
+          <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
+            <el-select
+              v-model="deptBudgetList.acceptanceMethod"
+              placeholder="请选择验收方式"
+              style="width: 100%"
+              filterable
+              @change="selectunitList"
             >
-              <ws-option
-                v-for="item in packtypeList"
-                :key="item.constKey"
+              <el-option
+                v-for="(item, index) in unitList"
+                :key="item.constValue"
                 :label="item.constValue"
                 :value="item.constValue"
-              />
-            </ws-select>
+              >
+                <span class="unit-left" style="float: left">
+                  <span v-if="item.flag == 'delete'">
+                    {{ item.constValue }}</span
+                  >
+                  <!-- 新增文本框 -->
+                  <div
+                    style="width: 160px"
+                    v-if="item.flag !== 'delete'"
+                    @click.stop
+                  >
+                    <ws-input
+                      v-model="item.constValue"
+                      clearable
+                      maxlength="10"
+                      style="width: 100%"
+                    ></ws-input>
+                  </div>
+                </span>
+                <span style="float: right; color: #8492a6; font-size: 13px">
+                  <!-- 对号 -->
+                  <i
+                    class="el-icon-check"
+                    style="line-height: 29px; margin-left: 10px"
+                    v-if="item.flag !== 'delete'"
+                    @click.stop="saveClick(item, index)"
+                  ></i>
+                  <!-- 编辑 -->
+                  <i
+                    class="el-icon-edit"
+                    style="line-height: 29px; margin-left: 10px"
+                    v-if="item.flag == 'delete'"
+                    @click.stop="editClick(item, index)"
+                  ></i>
+                  <!-- 删除 -->
+                  <i
+                    class="el-icon-delete"
+                    style="line-height: 29px"
+                    @click.stop="deleteClick(item, index)"
+                  ></i>
+                </span>
+              </el-option>
+              <!-- 新增按钮 -->
+              <el-option value="" label="">
+                <div style="text-align: center">
+                  <ws-button type="primary" @click.stop="addClick">{{
+                    $t('button.add')
+                  }}</ws-button>
+                </div>
+              </el-option>
+            </el-select>
           </ws-form-item>
 
           <!--溢短装(%)-->
-          <ws-form-item label="溢短装(%)" span="1" prop="contractNo">
+          <ws-form-item label="溢短装(%)" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.overShort"
               maxlength="100"
               size="small"
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
-
           <!--交货日期(起)-->
           <ws-form-item
             label="交货日期(起)"
@@ -193,7 +233,7 @@
           <!--合同单价(元/吨)-->
           <ws-form-item label="合同单价(元/吨)" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.unitContractPrice"
               maxlength="100"
               size="small"
             />
@@ -201,14 +241,10 @@
           </ws-form-item>
 
           <!--交货日期(止)-->
-          <ws-form-item
-            label="交货日期(止)"
-            span="1"
-            prop="deliveryDateStart"
-          >
+          <ws-form-item label="交货日期(止)" span="1" prop="deliveryDateEnd">
             <ws-date-picker
               :picker-options="pickerBeginDateBefore"
-              v-model="deptBudgetList.deliveryDateStart"
+              v-model="deptBudgetList.deliveryDateEnd"
               type="date"
               default-value="1980-01-01"
               placeholder="起始日期"
@@ -220,17 +256,16 @@
           <!--合同总价-->
           <ws-form-item label="合同总价" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="deptBudgetList.totalContractPrice"
               maxlength="100"
               size="small"
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
           <!--签订日期-->
-          <ws-form-item label="签订日期" span="1" prop="deliveryDateStart">
+          <ws-form-item label="签订日期" span="1" prop="signingDate">
             <ws-date-picker
               :picker-options="pickerBeginDateBefore"
-              v-model="deptBudgetList.deliveryDateStart"
+              v-model="deptBudgetList.signingDate"
               type="date"
               default-value="1980-01-01"
               placeholder="起始日期"
@@ -238,261 +273,204 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-
-          <!-- <base-card> -->
-          <div class="wenzi">
-            <h3>货物信息</h3>
-          </div>
+        </ws-info-table>
+      </ws-form>
+      <!-- <base-card> -->
+      <div class="wenzi">
+        <h3>货物信息</h3>
+      </div>
+      <div class="center">
+        <ws-form
+          ref="deptBudgetList"
+          :rules="ruleDeptBudget"
+          :model="deptBudgetList"
+        >
           <!--货物信息-->
           <ws-info-table>
             <!--货名-->
-            <ws-form-item label="货名" span="1" prop="seafarerName">
-              <ws-input
-                v-model="deptBudgetList.seafarerName"
-                maxlength="100"
-                size="small"
-              />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
+            <ws-form-item label="货名" span="1" prop="goodsName">
+              <ws-select
+                v-model="deptBudgetList.contractGoodsInfo.goodsName"
+                placeholder=""
+                class="typeselect"
+                @change="selectpackingMethod"
+              >
+                <ws-option
+                  v-for="item in goodnameList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+              <span class="unchangeable">*</span>
             </ws-form-item>
 
             <!--水分(%)<=-->
-            <ws-form-item label="水分(%)<=" span="1" prop="seafarerName">
+            <ws-form-item label="水分(%)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractGoodsInfo.waterContent"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
 
             <!--品级-->
-            <ws-form-item label="品级" span="1" prop="seafarerName">
-              <ws-input
-                v-model="deptBudgetList.seafarerName"
-                maxlength="100"
-                size="small"
-              />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
+            <ws-form-item label="品级" span="1" prop="grade">
+              <ws-select
+                v-model="deptBudgetList.contractGoodsInfo.grade"
+                placeholder=""
+                class="typeselect"
+                @change="selectgrade"
+              >
+                <ws-option
+                  v-for="item in gradeList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
             </ws-form-item>
 
             <!--杂质(%)<=-->
-            <ws-form-item label="杂质(%)<=" span="1" prop="seafarerName">
+            <ws-form-item label="杂质(%)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractGoodsInfo.impurity"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
 
             <!--容量(克/升)>=-->
-            <ws-form-item label="容量(克/升)>=" span="1" prop="seafarerName">
+            <ws-form-item label="容量(克/升)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
 
             <!--霉变粒(%)<=-->
-            <ws-form-item label="霉变粒(%)<=" span="1" prop="seafarerName">
+            <ws-form-item label="霉变粒(%)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
 
-            <!--焦糊粒(%)<=-->
-            <ws-form-item label="焦糊粒(%)<=" span="1" prop="seafarerName">
+            <!--热损伤(%)<=-->
+            <ws-form-item label="热损伤(%)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
             <!--不完整粒(%)<=-->
-            <ws-form-item label="不完整粒(%)<=" span="1" prop="seafarerName">
+            <ws-form-item label="不完整粒(%)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
           </ws-info-table>
-
-          <div class="wenzi">
-            <h3>流程信息</h3>
-          </div>
-
+        </ws-form>
+      </div>
+      <div class="wenzi">
+        <h3>流程信息</h3>
+      </div>
+      <div class="center">
+        <ws-form
+          ref="deptBudgetList"
+          :rules="ruleDeptBudget"
+          :model="deptBudgetList"
+        >
           <!--流程信息-->
 
           <ws-info-table>
             <!--合同收入(元)-->
-            <ws-form-item label="合同收入(元)" span="1" prop="seafarerName">
+            <ws-form-item label="合同收入(元)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
 
             <!--已开发票(元)-->
-            <ws-form-item label="已开发票(元)" span="1" prop="seafarerName">
+            <ws-form-item label="已开发票(元)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractProcessInfo.goodsName"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
 
-            <!--合同外支出(元)-->
-            <ws-form-item label="合同外支出(元)" span="1" prop="seafarerName">
+            <!--费用支出(元)-->
+            <ws-form-item label="费用支出(元)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractProcessInfo.waterContent"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
 
             <!--未开发票(元)-->
-            <ws-form-item label="未开发票(元)" span="1" prop="seafarerName">
+            <ws-form-item label="未开发票(元)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractProcessInfo.impurity"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
-
             <!--未回款(元)-->
-            <ws-form-item label="未回款(元)" span="1" prop="seafarerName">
+            <ws-form-item label="未回款(元)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractProcessInfo.mildewGrain"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
 
             <!--已完成发货量(吨)-->
-            <ws-form-item
-              label="已完成发货量(吨)"
-              span="1"
-              prop="seafarerName"
-            >
+            <ws-form-item label="已完成发货量(吨)" span="1" prop="contractNo">
               <ws-input
-                v-model="deptBudgetList.seafarerName"
+                v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
                 maxlength="100"
                 size="small"
               />
-              <i
-                v-if="isEdited && registered == '1'"
-                class="iconfont iconaddy1 ml10"
-                style="cursor: pointer"
-                @click="dialogFormVisible = true"
-              />
             </ws-form-item>
             <!--双章原件回收情况-->
-            <ws-form-item
-              label="双章原件回收情况"
-              span="1"
-              :prop="!deptBudgetList.add && registered != 1 ? 'crtDutyId' : ''"
-              :key="
-                !deptBudgetList.add || registered != 1
-                  ? 'crtDutyId_haveProp'
-                  : 'crtDutyId_noProp'
-              "
-            >
+            <ws-form-item label="双章原件回收情况" span="1" prop="grade">
               <ws-select
-                v-model="deptBudgetList.crtDutyId"
-                :placeholder="$t('common.selected')"
-                @change="selectCrtDuty"
+                v-model="deptBudgetList.contractProcessInfo.grade"
+                placeholder=""
+                class="typeselect"
+                @change="selectpackingMethod"
               >
                 <ws-option
-                  v-for="item in dutyList"
-                  :key="item.dutyId"
-                  :label="item.aliasName"
-                  :value="item.dutyId"
+                  v-for="item in ChapterTwoList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
                 />
               </ws-select>
             </ws-form-item>
           </ws-info-table>
-          <div class="wenzi">
-            <h3>备注信息</h3>
-          </div>
+        </ws-form>
+      </div>
+
+      <div class="wenzi">
+        <h3>备注信息</h3>
+      </div>
+      <div class="ce">
+        <ws-form
+          ref="deptBudgetList"
+          :rules="ruleDeptBudget"
+          :model="deptBudgetList"
+        >
+          <!--备注信息-->
           <ws-input
             v-model="deptBudgetList.remarks"
             type="textarea"
@@ -508,12 +486,13 @@
             :appendix-ids="appendixIdsAdd"
             :vesselId="deptBudgetList.addressUrl"
             :size-limit="size"
+            @uploadSuccess="uploadSuccess"
+            @onChange="onChange"
             accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
           />
-          <!-- </base-card> -->
-        </ws-info-table>
-      </ws-form>
-      <div style="text-align: right; padding: 10px">
+        </ws-form>
+      </div>
+      <div style="text-align: right; padding: 10px" class="center">
         <el-button
           class="bg-bottom"
           type="primary"
@@ -528,7 +507,7 @@
 <script>
 // import { getVesselOne } from '@/model/procurement/basic'
 // import { dayjs } from 'base-core-lib'
-
+import { examineList, editInfo, packList } from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   watch: {
@@ -555,8 +534,15 @@ export default {
       // 提交类型
       submitType: true,
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
+      pickerBeginDateBefore: {},
+      // selectpackingMethod:{},
+      selectunitList: {},
+      //  change:{},
+      unitList: {},
       packtypeList: {},
-
+      compId: {},
+      appendixIdsAdd: {},
+      size: {},
       deptBudgetList: {},
       ruleDeptBudget: {},
       isEdited: false,
@@ -575,6 +561,10 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
+    this.loaddata()
+    this.editInfo()
+    this.showType = this.isShow
+    console.log(this.$route.params)
     this.showType = this.isShow
   },
   methods: {
@@ -585,6 +575,43 @@ export default {
     returnsales() {
       this.$router.push({ path: 'salesContract' })
     },
+    loaddata() {
+      // 数据
+      examineList({ id: this.$route.params.id })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
+        })
+      // 包装方式
+      packList({ constId: 'CON1' })
+        .toPromise()
+        .then((response) => {
+          this.packtypeList = response
+        })
+      // 验收方式
+      this.getUnitList()
+      // 货名
+      packList({ constId: 'CON2' })
+        .toPromise()
+        .then((response) => {
+          this.goodnameList = response
+        })
+      // 品级
+      packList({ constId: 'CON3' })
+        .toPromise()
+        .then((response) => {
+          this.gradeList = response
+        })
+      // 双章
+      packList({ constId: 'CON4' })
+        .toPromise()
+        .then((response) => {
+          this.ChapterTwoList = response
+        })
+    },
+    editInfo() {
+      editInfo({})
+    },
     // getList(){}
   },
 }