前端gjy

src/api/V2/contract/index.js

@@ -17,4 +17,6 @@ export const API_POST_EXPORT = '/contractManagementInfo/export'
 // 操作历史
 export const API_GET_BILL_OPERATE_HIS = '/billOperateHis/query/commonBillOperateHis'
 // 修改状态
-export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'
+export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'
+//销售合同修改编辑
+export const API_POST_EDITINFO = '/contractManagementInfo/editInfo'

src/model/contarct/index.js

@@ -12,7 +12,9 @@ import {
     API_POST_EXPORT,
     API_GET_BILL_OPERATE_HIS,
     API_POST_EDITSTATUS,
-    API_GET_CONTRACT_MANAGEMENTINFO
+    API_GET_CONTRACT_MANAGEMENTINFO,
+    API_POST_EDITINFO
+
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -33,3 +35,5 @@ 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 editInfo = appRx.post(API_POST_EDITINFO, errorCatcher, errorHandle, filter)

src/views/contractManagement/purchaseContract.vue

@@ -98,10 +98,13 @@
             placement="left"
             :width="400"
             trigger="click"
+            visible-arrow="false"
             @show="history(scope.row)"
           >
             <template #reference>
-              <span @click="history(scope.row)">{{ scope.row.status }}</span>
+              <span @show="history(scope.row)" slot="reference">{{
+                scope.row.status
+              }}</span>
             </template>
             <div>
               <p>操作历史</p>

src/views/contractManagement/purchaseContractExamine.vue

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

src/views/contractManagement/salesContract.vue

@@ -166,7 +166,7 @@ export default {
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
-      pickerBeginDateBefore: {},
+      // pickerBeginDateBefore:{},
       tableData: [],
       taskTypeList: [
         { value: '未完成（默认）' },
@@ -241,8 +241,13 @@ export default {
     seelctShips() {},
     checkBtn() {},
     handleEdit(row) {
-      this.$router.push({ path: 'salesContractEdit' })
+      this.$router.push({
+        name: 'salesContractEdit',
+
+        params: { id: row.id },
+      })
     },
+
     approve() {},
     listQuery() {},
     total() {},
@@ -253,23 +258,6 @@ export default {
         return time.getTime() > Date.now()
       },
     },
-    getList() {
-      getList({
-        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
-        })
-    },
   },
 }
 </script>

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) {

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-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="起始日期"
@@ -217,20 +253,19 @@
             />
           </ws-form-item>
 
-          <!--合同总价-->
+           <!--合同总价-->
           <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,258 +273,233 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-
+         </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-form-item>
+            </ws-select>
+            <span class="unchangeable">*</span>
+          </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>
-
-            <!--品级-->
-            <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>
-
-            <!--杂质（%）<=-->
-            <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>
-
-            <!--容量（克/升）>=-->
-            <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>
-
-            <!--霉变粒（%）<=-->
-            <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>
-
-            <!--焦糊粒（%）<=-->
-            <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="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.waterContent"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--品级-->
+          <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-form-item>
+            </ws-select>
+          </ws-form-item>
+
+             <!--杂质（%）<=-->
+          <ws-form-item label="杂质（%）" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.impurity"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--容量（克/升）>=-->
+          <ws-form-item label="容量（克/升）" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--霉变粒（%）<=-->
+          <ws-form-item label="霉变粒（%）" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--热损伤（%）<=-->
+          <ws-form-item label="热损伤（%）" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
+              maxlength="100"
+              size="small"
+            />
+          </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>
+              <ws-form-item label="不完整粒（%）" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
           </ws-info-table>
-
+ </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-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>
-
-            <!--已开发票（元）-->
-            <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>
-
-            <!--合同外支出（元）-->
-            <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>
-
-            <!--未开发票（元）-->
-            <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>
+          <ws-form-item label="合同收入（元）" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--已开发票（元）-->
+          <ws-form-item label="已开发票（元）" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.goodsName"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+
+            <!--费用支出（元）-->
+          <ws-form-item label="费用支出（元）" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.waterContent"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
 
+          <!--未开发票（元）-->
+          <ws-form-item label="未开发票（元）" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.impurity"
+              maxlength="100"
+              size="small"
+            />
+          </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>
+          <ws-form-item label="未回款（元）" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+              maxlength="100"
+              size="small"
+            />
+          </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>
+          <!--已完成发货量（吨）-->
+          <ws-form-item label="已完成发货量（吨）" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
+              maxlength="100"
+              size="small"
+            />
+          </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.contractProcessInfo.grade"
+              placeholder=""
+              class="typeselect"
+              @change="selectpackingMethod"
             >
-              <ws-select
-                v-model="deptBudgetList.crtDutyId"
-                :placeholder="$t('common.selected')"
-                @change="selectCrtDuty"
-              >
-                <ws-option
-                  v-for="item in dutyList"
-                  :key="item.dutyId"
-                  :label="item.aliasName"
-                  :value="item.dutyId"
-                />
-              </ws-select>
-            </ws-form-item>
+              <ws-option
+                v-for="item in ChapterTwoList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </ws-select>
+          </ws-form-item>
           </ws-info-table>
+<<<<<<< HEAD
+  
+      </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"
+          row="3"
+          placeholder="请输入备注信息，不超过200字"
+          maxlength="200"
+        />
+        <ws-upload
+          ref="upload"
+          table-name="maintain_work_order"
+          oss-key="mainPlan"
+          :comp-id="compId"
+          :appendix-ids="appendixIdsAdd"
+          :vesselId="deptBudgetList.addressUrl"
+          :size-limit="size"
+          @uploadSuccess="uploadSuccess"
+          @onChange="onChange"
+          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        />
+      </ws-form>
+        </div>
+      <div style="text-align: right; padding: 10px" class="center">
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+        >提交</el-button
+      >
+    </div>
+=======
           <div class="wenzi">
             <h3>备注信息</h3>
           </div>
@@ -522,13 +532,18 @@
           >提交</el-button
         >
       </div>
+>>>>>>> 110c456e325af9782535b7bcbce2d1b72d0f4f03
     </div>
   </div>
 </template>
 <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 +570,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 +597,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 +611,46 @@ 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(){}
   },
 }