前端

sdy

src/api/V2/contract/index.js

@@ -17,10 +17,9 @@ export const API_POST_EXPORT = '/contractManagementInfo/export'
 // 操作历史
 export const API_GET_BILL_OPERATE_HIS = '/billOperateHis/query/commonBillOperateHis'
 // 修改状态
-<<<<<<< HEAD
 export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'
 //销售合同修改编辑
 export const API_POST_EDITINFO ='/contractManagementInfo/editInfo'
-=======
-export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'
->>>>>>> 110c456e325af9782535b7bcbce2d1b72d0f4f03
+//删除
+export const API_POST_CONTRACT_DELETE = '/contractManagementInfo/deleteInfo'
+                                         

src/model/contarct/index.js

@@ -13,8 +13,8 @@ import {
     API_GET_BILL_OPERATE_HIS,
     API_POST_EDITSTATUS,
     API_GET_CONTRACT_MANAGEMENTINFO,
-    API_POST_EDITINFO
-
+    API_POST_EDITINFO,
+    API_POST_CONTRACT_DELETE
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -36,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 editInfo = appRx.post(API_POST_EDITINFO, errorCatcher, errorHandle, filter)
+export const editInfo = appRx.post(API_POST_EDITINFO, errorCatcher, errorHandle, filter)
+//删除
+export const deletecontract = appRx.post(API_POST_CONTRACT_DELETE,errorCatcher,errorHandle,filter)

src/views/contractManagement/purchaseContract.vue

@@ -97,17 +97,12 @@
           <el-popover
             placement="left"
             :width="400"
-<<<<<<< HEAD
             trigger="click"
             visible-arrow="false"
-            
-=======
-            trigger="hover"
             @show="history(scope.row)"
->>>>>>> 110c456e325af9782535b7bcbce2d1b72d0f4f03
           >
-            <template #reference>
-              <span @show="history(scope.row)" slot="reference">{{ scope.row.status }}</span>
+            <template >
+              <span  slot="reference">{{ scope.row.status }}</span>
             </template>
             <div>
               <p>操作历史</p>
@@ -183,6 +178,7 @@ import {
   export1,
   editstatus,
   billoperatehis,
+  deletecontract,
 } from '@/model/contarct/index'
 import { downloadFile } from '@/utils/batchDown'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -243,7 +239,6 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
-    console.log(11111)
     this.getList()
     this.showType = this.isShow
   },
@@ -370,6 +365,43 @@ export default {
         type: 'xls',
       })
     },
+    // deletecontract(){},
+    //删除
+   handleDelete(row){
+    var handleDelete = ' '//sfdkd
+      if (row.handleDelete == '待执行' || row.handleDelete == '已完成') {
+       handleDelete = '执行中'
+      } else if (row.handleDelete == '执行中') {
+        handleDelete = '已完成'
+        
+      }
+      this.$confirm(`合同删除后不可恢复，是否继续删除？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      
+      })
+        .then(() => {
+          
+          deletecontract({id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '删除成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    }
+
+    
   },
 }
 </script>

src/views/contractManagement/purchaseContractAdd.vue

@@ -435,6 +435,9 @@ import {
 import WsUpload from '@/components/WsUpload'
 export default {
   name: 'viewSpareMoney',
+   components: {
+    WsUpload,
+  },
   watch: {
     vesselId(val) {
       this.getVesselData()
@@ -446,9 +449,7 @@ export default {
       this.loaddata()
     },
   },
-  components: {
-    WsUpload,
-  },
+ 
   data() {
     return {
       //弹出框

src/views/contractManagement/salesContract.vue

@@ -24,10 +24,11 @@
       </template>
       <template slot="right">
         <ws-select
-          v-model="deptBudgetList.crtDutyId"
+          v-model="searchTypeText"
           placeholder=""
           class="typeselect"
-          @change="selectCrtDuty"
+          @change="selecttaskType"
+          :value="searchType"
         >
           <ws-option
             v-for="item in taskTypeList"
@@ -38,7 +39,7 @@
         </ws-select>
         <ws-date-picker
           :picker-options="pickerBeginDateBefore"
-          v-model="deptBudgetList.birthday"
+          v-model="startDate"
           type="date"
           default-value="1980-01-01"
           placeholder="起始日期"
@@ -48,7 +49,7 @@
         <span>至</span>
         <ws-date-picker
           :picker-options="pickerBeginDateBefore"
-          v-model="deptBudgetList.birthday"
+          v-model="endDate"
           type="date"
           default-value="1980-01-01"
           placeholder="截止日期"
@@ -56,7 +57,7 @@
           value-format="yyyy-MM-dd"
         />
         <ws-input
-          v-model="deptBudgetList.interviewOpinion"
+          v-model="searchKeyWord"
           placeholder="可按照合同编号、买方名称、卖方名称进行查找"
           clearable
           maxlength="500"
@@ -67,7 +68,7 @@
         <ws-button
           type="primary"
           :disable="checkBtn"
-          @click="enquiry(3)"
+          @click="find()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
@@ -128,7 +129,7 @@ import {
   editstatus,
   billoperatehis,
 } from '@/model/contarct/index'
-import { dayjs } from 'base-core-lib'
+// import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   watch: {
@@ -161,22 +162,16 @@ export default {
       searchKeyWord: '',
       startDate: null,
       endDate: null,
-
       submitType: true,
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
-<<<<<<< HEAD
-      // pickerBeginDateBefore:{},
-=======
-      pickerBeginDateBefore: {},
->>>>>>> 110c456e325af9782535b7bcbce2d1b72d0f4f03
       tableData: [],
       taskTypeList: [
-        { value: '未完成（默认）' },
-        { value: '已完成' },
-        { value: '待回款' },
-        { value: '全部合同' },
+        { value: '未完成' ,type:1},
+        { value: '已完成' ,type:2},
+        { value: '待回款' ,type:3},
+        { value: '全部合同',type:'' },
       ],
       deptBudgetList: {
         compId: sessionStorage.getItem('ws-pf_compId'),
@@ -197,14 +192,7 @@ export default {
         interviewOpinion: '',
         aliasName: '',
       },
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
       searchTypeText: '未完成',
-      searchKeyWord: '',
-      contractType: 1,
-      startDate: null,
-      endDate: null,
     }
   },
   activated() {
@@ -228,6 +216,17 @@ export default {
         .then((response) => {
           this.tableData = response
         })
+    },
+     selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
+     find() {
+       console.log(this)
+      this.getList()
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {

src/views/contractManagement/salesContractAdd.vue

@@ -209,7 +209,7 @@
           </ws-form-item>
 
           <!--溢短装（%）-->
-          <ws-form-item label="溢短装（%））" span="1" prop="contractNo">
+          <ws-form-item label="溢短装（%）" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.overShort"
               maxlength="100"
@@ -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,
@@ -517,8 +517,14 @@ import {
   editxiala,
   delxiala,
 } from '@/model/contarct/index'
+import WsUpload from '@/components/WsUpload'
+
 export default {
   name: 'viewSpareMoney',
+  components:{
+  WsUpload,
+
+  },
   watch: {
     vesselId(val) {
       this.getVesselData()
@@ -721,14 +727,11 @@ export default {
           })
       }
     },
-    selectContract(val) {
-      let key = this.unitList.find((item) => item.constValue === val).constKey
-      this.pleaseChoose = val
-    },
-    selectContract(val) {
-      let key = this.unitList.find((item) => item.constValue === val).constKey
-      this.pleaseChoose = val
-    },
+    // selectContract(val) {
+    //   let key = this.unitList.find((item) => item.constValue === val).constKey
+    //   this.pleaseChoose = val
+    // },
+   
     handleExamine() {},
     approve() {},
     // returnsales() {

src/views/contractManagement/salesContractEdit.vue

@@ -32,12 +32,13 @@
         <ws-info-table>
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <ws-input
+            <!-- <ws-input
               v-model="deptBudgetList.contractNo"
               maxlength="100"
               size="small"
-            />
-            <span class="unchangeable">*</span>
+            /> -->
+            {{deptBudgetList.contractNo}}
+            
           </ws-form-item>
 
           <!--运输方式-->
@@ -50,13 +51,10 @@
           </ws-form-item>
 
           <!--买方-->
-           <ws-form-item label="买方" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.buyer"
-              maxlength="100"
-              size="small"
-            />
-            <span class="unchangeable">*</span>
+          <ws-form-item label="买方" span="1" prop="contractNo">
+            
+            {{deptBudgetList.buyer}}
+            
           </ws-form-item>
 
           <!--结算方式-->
@@ -70,12 +68,9 @@
 
           <!--卖方-->
           <ws-form-item label="卖方" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.seller"
-              maxlength="100"
-              size="small"
-            />
-            <span class="unchangeable">*</span>
+           
+            {{deptBudgetList.seller}}
+          
           </ws-form-item>
 
           <!--货源地-->
@@ -205,8 +200,8 @@
             </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.overShort"
               maxlength="100"
@@ -253,7 +248,7 @@
             />
           </ws-form-item>
 
-           <!--合同总价-->
+          <!--合同总价-->
           <ws-form-item label="合同总价" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.totalContractPrice"
@@ -261,7 +256,7 @@
               size="small"
             />
           </ws-form-item>
-           <!--签订日期-->
+          <!--签订日期-->
           <ws-form-item label="签订日期" span="1" prop="signingDate">
             <ws-date-picker
               :picker-options="pickerBeginDateBefore"
@@ -273,236 +268,205 @@
               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>
+      <!-- <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="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="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> -->
+              {{deptBudgetList.contractGoodsInfo.goodsName}}
+              
+            </ws-form-item>
 
             <!--水分（%）<=-->
-          <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 label="水分（%）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractGoodsInfo.waterContent"
+                maxlength="100"
+                size="small"
               />
-            </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>
+
+            <!--品级-->
+            <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="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="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-              maxlength="100"
-              size="small"
-            />
-          </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-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="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.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="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="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.mildewGrain"
-              maxlength="100"
-              size="small"
-            />
-          </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="grade">
-            <ws-select
-              v-model="deptBudgetList.contractProcessInfo.grade"
-              placeholder=""
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <ws-option
-                v-for="item in ChapterTwoList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
+            <ws-form-item label="未回款（元）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+                maxlength="100"
+                size="small"
               />
-            </ws-select>
-          </ws-form-item>
+            </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="grade">
+              <ws-select
+                v-model="deptBudgetList.contractProcessInfo.grade"
+                placeholder=""
+                class="typeselect"
+                @change="selectpackingMethod"
+              >
+                <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>
+        </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>
+      <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"
@@ -518,12 +482,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"
@@ -532,18 +497,16 @@
           >提交</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'
+import { examineList, editInfo, packList , xiala,
+  addxiala,
+  editxiala,
+  delxiala,} from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   watch: {
@@ -570,25 +533,39 @@ export default {
       // 提交类型
       submitType: true,
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
-      pickerBeginDateBefore:{},
+      pickerBeginDateBefore: {
+         disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
       // selectpackingMethod:{},
-       selectunitList:{},
-      //  change:{},
-     unitList:{},
-      packtypeList: {},
-      compId:{},
-      appendixIdsAdd:{},
-      size:{},
-      deptBudgetList: {},
+     selectunitList: {},
+      //change:{},
+      onChange:{},
+      uploadSuccess:{},
+      selectgrade:{},
+      goodnameList: {},
+     selectpackingMethod:{},
+      unitList: {},
+      packtypeList: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      appendixIdsAdd: '',
+      size: 10,
+      deptBudgetList: {
+         contractGoodsInfo: {
+          goodsName: '',
+        },
+        contractProcessInfo: {},
+      },
       ruleDeptBudget: {},
       isEdited: false,
       registered: {},
       selectCrtDuty: {},
       dutyList: {},
       sexList: {},
-      pickerBeginDateBefore: {},
       selectDuty: {},
-
+gradeList:{},
+ChapterTwoList:{},
       selectIntendedShip: {},
       interviewTypeList: {},
     }
@@ -597,10 +574,10 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
-     this.loaddata()
-     this.editInfo()
+    this.loaddata()
+    this.editInfo()
     this.showType = this.isShow
-    console.log(this.$route.params)
+  // console.log(this.$route.params)
     this.showType = this.isShow
   },
   methods: {
@@ -611,7 +588,7 @@ export default {
     returnsales() {
       this.$router.push({ path: 'salesContract' })
     },
-     loaddata() {
+    loaddata() {
       // 数据
       examineList({ id: this.$route.params.id })
         .toPromise()
@@ -645,14 +622,121 @@ export default {
           this.ChapterTwoList = response
         })
     },
-    editInfo(){
-       editInfo({
-        
+    
+     getUnitList() {
+      xiala({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        constCode: 'TYPEYAN',
+      })
+        .toPromise()
+        .then((response) => {
+          this.unitList = response
+          let currItem
+          this.unitList.forEach((item, index, arr) => {
+            item.flag = 'delete'
+            if (this.vModel == item.constKey) {
+              currItem = item
+            }
+          })
+          //
+          if (currItem) {
+            this.selectContract(currItem.constValue)
+          }
+        })
+    },
+    // 编辑
+    editClick(item, index) {
+      const map = JSON.parse(JSON.stringify(item))
+      if (Object.is(item.id, 1)) {
+        return
+      }
+      if (Object.is(this.unitList[index].flag, 'delete')) {
+        map.flag = 'check'
+        this.$set(this.unitList, index, map)
+      } else {
+        map.flag = 'delete'
+        this.$set(this.unitList, index, map)
+      }
+    },
+    // 删除
+    deleteClick(item, index) {
+      if (Object.is(item.constKey, 1)) {
+        return
+      }
+      if (!item.constValue) {
+        this.unitList.splice(index, 1)
+        return
+      }
+      delxiala({ id: this.unitList[index].id })
+        .toPromise()
+        .then((response) => {
+          this.getUnitList()
+          this.pleaseChoose = ''
+        })
+    },
+     saveClick(item, index) {
+    //  console.log(item)
 
-       })
-    }
+      if (Object.is(item.id, 1)) {
+        return
+      }
+      if (Object.is(this.unitList[index].flag, 'delete')) {
+        this.$set(this.unitList, index, { flag: 'check' })
+      } else {
+        this.$set(this.unitList, index, { flag: 'delete' })
+      }
+      if (!item.constValue) {
+        this.unitList.splice(index, 1)
+        return
+      }
+      if (item.flag == 'add') {
+        item.constKey = Math.random() * 20
+        this.trainingMethods.compId = sessionStorage.getItem('ws-pf_compId')
+        this.trainingMethods.constKey = item.constKey
+        this.trainingMethods.constCode = 'TYPEYAN'
+        this.trainingMethods.constValue = item.constValue
+        this.trainingMethods.id = item.id
+        addxiala(this.trainingMethods)
+          .toPromise()
+          .then((response) => {
+            this.getUnitList()
+          })
+      } else if (item.flag == 'check') {
+        this.trainingMethods.compId = sessionStorage.getItem('ws-pf_compId')
+        this.trainingMethods.constKey = item.constKey
+        this.trainingMethods.constCode = 'TYPEYAN'
+        this.trainingMethods.constValue = item.constValue
+        this.trainingMethods.id = item.id
+        editxiala(this.trainingMethods)
+          .toPromise()
+          .then((response) => {
+            this.getUnitList()
+          })
+      }
+    },
+    submit() { 
+      this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = this.compId
+          this.deptBudgetList.contractType = 1
+         editInfo(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'salesContract' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
+    editInfo() {
+      editInfo({})
+    },
     // getList(){}
   },
+  
 }
 </script>