前端

src/api/V2/contract/index.js

@@ -1,5 +1,5 @@
 // 根据ID,常量类别获常量数据
-export const API_GET_CONTRACT_TENANT = '/contractManagementInfo/selectInfo'                    
+export const API_GET_CONTRACT_TENANT = '/contractManagementInfo/selectInfo'
 export const API_POST_ADD_CONTRACT_TENANT = '/contractManagementInfo/api/addInfo'
 export const API_POST_MANNER_OF_PACKING_TENANT = '/commonSysParameter/getInfo'
 // 查看
@@ -17,6 +17,10 @@ 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_EDITINFO ='/contractManagementInfo/editInfo'
+=======
+export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'
+>>>>>>> 110c456e325af9782535b7bcbce2d1b72d0f4f03

src/views/contractManagement/purchaseContract.vue

@@ -97,9 +97,14 @@
           <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>
@@ -185,7 +190,7 @@ export default {
   name: 'viewSpareMoney',
   watch: {
     vesselId(val) {
-      this.getVesselData()
+      this.getList()
     },
     isShow(val) {
       this.showType = val
@@ -234,10 +239,11 @@ export default {
       ],
     }
   },
-  mounted() {
+  activated() {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
+    console.log(11111)
     this.getList()
     this.showType = this.isShow
   },

src/views/contractManagement/purchaseContractAdd.vue

@@ -1,7 +1,7 @@
 <!--销售合同-->
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
-  <div class='container'>
+  <div class="container">
     <el-row>
       <el-col :span="12">
         <h2 class="bg-left">创建销售合同</h2>
@@ -16,336 +16,277 @@
         >
       </el-col>
     </el-row>
-   
+
     <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
       :model="deptBudgetList"
     >
       <div class="remark">
-      <h3>基本信息</h3>
-      <p>注：基本信息和货物信息均为必填项，“*” 标记的条目提交后不可修改。</p>
-    </div>
-        <ws-info-table>
-          <ws-form-item
-            label="合同编号"
-            span="1"
-            prop="contractNo"
-          >
-          <ws-input
-              v-model="deptBudgetList.contractNo"
-              maxlength="100"
-              size="small"
-            />
-            <span class='unchangeable'>*</span>
-          </ws-form-item>
-          <ws-form-item
-            label="运输方式"
-            span="1"
-            prop="shippingType"
-          >
+        <h3>基本信息</h3>
+        <p>注：基本信息和货物信息均为必填项，“*” 标记的条目提交后不可修改。</p>
+      </div>
+      <ws-info-table>
+        <ws-form-item label="合同编号" span="1" prop="contractNo">
           <ws-input
-              v-model="deptBudgetList.shippingType"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="买方"
-            span="1"
-            prop="buyer"
-          >
+            v-model="deptBudgetList.contractNo"
+            maxlength="100"
+            size="small"
+          />
+          <span class="unchangeable">*</span>
+        </ws-form-item>
+        <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input
-              v-model="deptBudgetList.buyer"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="结算方式"
-            span="1"
-            prop="settlementMethod"
-          >
+            v-model="deptBudgetList.shippingType"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="买方" span="1" prop="buyer">
           <ws-input
-              v-model="deptBudgetList.settlementMethod"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="卖方"
-            span="1"
-            prop="seller"
-          >
+            v-model="deptBudgetList.buyer"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="结算方式" span="1" prop="settlementMethod">
           <ws-input
-              v-model="deptBudgetList.seller"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="货源地"
-            span="1"
-            prop="sourceGoods"
-          >
+            v-model="deptBudgetList.settlementMethod"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="卖方" span="1" prop="seller">
           <ws-input
-              v-model="deptBudgetList.sourceGoods"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="买方电话"
-            span="1"
-            prop="buyerPhone"
-           
-          >
+            v-model="deptBudgetList.seller"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="货源地" span="1" prop="sourceGoods">
           <ws-input
-              v-model="deptBudgetList.buyerPhone"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="交货地"
-            span="1"
-            prop="placeDelivery"
-          >
+            v-model="deptBudgetList.sourceGoods"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="买方电话" span="1" prop="buyerPhone">
           <ws-input
-              v-model="deptBudgetList.placeDelivery"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-           <ws-form-item
-            label="卖方电话"
-            span="1"
-            prop="sellerPhone"
-          >
+            v-model="deptBudgetList.buyerPhone"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="交货地" span="1" prop="placeDelivery">
           <ws-input
-              v-model="deptBudgetList.sellerPhone"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="包装方式"
-            span="1"
-            prop="packingMethod"
-          >
-          <ws-select
-          v-model="deptBudgetList.packingMethod"
-          placeholder=""
-          class="typeselect"
-          @change="selectpackingMethod"
-        >
-          <ws-option
-            v-for="item in packtypeList"
-            :key="item.constKey"
-            :label="item.constValue"
-            :value="item.constValue"
+            v-model="deptBudgetList.placeDelivery"
+            maxlength="100"
+            size="small"
           />
-        </ws-select>
-          </ws-form-item>
-          <ws-form-item
-            label="重量（吨）"
-            span="1"
-            prop="weight"
-          >
+        </ws-form-item>
+        <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
           <ws-input
-              v-model="deptBudgetList.weight"
-              maxlength="100"
-              size="small"
+            v-model="deptBudgetList.sellerPhone"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="包装方式" span="1" prop="packingMethod">
+          <ws-select
+            v-model="deptBudgetList.packingMethod"
+            placeholder=""
+            class="typeselect"
+            @change="selectpackingMethod"
+          >
+            <ws-option
+              v-for="item in packtypeList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
             />
-          </ws-form-item>
-          <ws-form-item
-            label="验收方式"
-            span="1"
-            prop="acceptanceMethod"
-          >
-            <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式"  style="width: 100%;" filterable @change="selectunitList">
-              <el-option v-for="(item,index) in unitList"
-               :key="item.constValue"
-               :label=" item.constValue"
-               :value="item.constValue">
-                <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"
+          </ws-select>
+        </ws-form-item>
+        <ws-form-item label="重量（吨）" span="1" prop="weight">
+          <ws-input
+            v-model="deptBudgetList.weight"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
+          <el-select
+            v-model="deptBudgetList.acceptanceMethod"
+            placeholder="请选择验收方式"
+            style="width: 100%"
+            filterable
+            @change="selectunitList"
+          >
+            <el-option
+              v-for="(item, index) in unitList"
+              :key="item.constValue"
+              :label="item.constValue"
+              :value="item.constValue"
+            >
+              <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>
+                    style="width: 100%"
+                  ></ws-input>
                 </div>
-              </el-option>
-            </el-select>
-          </ws-form-item>
-          <ws-form-item
-            label="溢短装（%）"
-            span="1"
-            prop="overShort"
-          >
+              </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="overShort">
           <ws-input
-              v-model="deptBudgetList.overShort"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="交货日期（起）"
-            span="1"
-            prop="deliveryDateStart"
-          >
+            v-model="deptBudgetList.overShort"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
           <ws-date-picker
-          :picker-options="pickerBeginDateBefore"
-          v-model="deptBudgetList.deliveryDateStart"
-          type="date"
-          default-value="1980-01-01"
-          placeholder="起始日期"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-        />
-          </ws-form-item>
-          <ws-form-item
-            label="合同单价（元/吨）"
-            span="1"
-            prop="unitContractPrice"
-          >
+            :picker-options="pickerBeginDateBefore"
+            v-model="deptBudgetList.deliveryDateStart"
+            type="date"
+            default-value="1980-01-01"
+            placeholder="交货日期（起）"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+          />
+        </ws-form-item>
+        <ws-form-item
+          label="合同单价（元/吨）"
+          span="1"
+          prop="unitContractPrice"
+        >
           <ws-input
-              v-model="deptBudgetList.unitContractPrice"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="交货日期（止）"
-            span="1"
-            prop="deliveryDateEnd"
-          >
+            v-model="deptBudgetList.unitContractPrice"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
           <ws-date-picker
-          :picker-options="pickerBeginDateBefore"
-          v-model="deptBudgetList.deliveryDateEnd"
-          type="date"
-          default-value="1980-01-01"
-          placeholder="起始日期"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-        />
-          </ws-form-item>
-          <ws-form-item
-            label="合同总价（元）"
-            span="1"
-            prop="totalContractPrice"
-          >
+            :picker-options="pickerBeginDateBefore"
+            v-model="deptBudgetList.deliveryDateEnd"
+            type="date"
+            default-value="1980-01-01"
+            placeholder="交货日期（止）"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+          />
+        </ws-form-item>
+        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
           <ws-input
-              v-model="deptBudgetList.totalContractPrice"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="签订日期"
-            span="1"
-            prop="signingDate"
-          >
+            v-model="deptBudgetList.totalContractPrice"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="签订日期" span="1" prop="signingDate">
           <ws-date-picker
-          :picker-options="pickerBeginDateBefore"
-          v-model="deptBudgetList.signingDate"
-          type="date"
-          default-value="1980-01-01"
-          placeholder="起始日期"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-        />
-          </ws-form-item>
-        </ws-info-table>
+            :picker-options="pickerBeginDateBefore"
+            v-model="deptBudgetList.signingDate"
+            type="date"
+            default-value="1980-01-01"
+            placeholder="签订日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+          />
+        </ws-form-item>
+      </ws-info-table>
       <base-card>
-      <!--面试信息-->
-      <div class="remark">
-      <h3>货物信息</h3>
-    </div>
+        <!--面试信息-->
+        <div class="remark">
+          <h3>货物信息</h3>
+        </div>
         <ws-info-table>
-          <ws-form-item
-            label="货名"
-            span="1"
-            prop="goodsName"
-          >
+          <ws-form-item label="货名" span="1" prop="goodsName">
             <ws-select
-          v-model="deptBudgetList.contractGoodsInfo.goodsName"
-          placeholder=""
-          class="typeselect"
-          @change="selectgoodsName"
-        >
-          <ws-option
-            v-for="item in goodnameList"
-            :key="item.constKey"
-            :label="item.constValue"
-            :value="item.constValue"
-          />
-        </ws-select>
-          </ws-form-item>
-          <ws-form-item
-            label="水分（%）<="
-            span="1"
-            prop="waterContent"
-          >
-          <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.goodsName"
+              placeholder=""
+              class="typeselect"
+              @change="selectgoodsName"
+            >
+              <ws-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </ws-select>
+          </ws-form-item>
+          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
+            <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.constValue"
-            :label="item.constValue"
-            :value="item.constValue"
-          />
-        </ws-select>
-          </ws-form-item>
-          <ws-form-item
-            label="杂质（%）<="
-            span="1"
-            prop="interviewDates"
-          >
-          <ws-input
+          <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.constValue"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </ws-select>
+          </ws-form-item>
+          <ws-form-item label="杂质（%）<=" span="1" prop="interviewDates">
+            <ws-input
               v-model="deptBudgetList.contractGoodsInfo.impurity"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
-            label="容重（克/升）<="
-            span="1"
-            prop="interviewType"
-          >
-          <ws-input
+          <ws-form-item label="容重（克/升）<=" span="1" prop="interviewType">
+            <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
               maxlength="100"
               size="small"
@@ -363,11 +304,7 @@
               size="small"
             />
           </ws-form-item>
-           <ws-form-item
-            label="热损伤（%）<="
-            span="1"
-            prop="jiaorenli"
-          >
+          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
               maxlength="100"
@@ -380,7 +317,7 @@
             prop="imperfectGrain"
             class="result"
           >
-             <ws-input
+            <ws-input
               v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
               maxlength="100"
               size="small"
@@ -391,56 +328,36 @@
           <h3>流程信息</h3>
         </div>
         <ws-info-table>
-          <ws-form-item
-            label="合同收入（元）"
-            span="1"
-            prop="goodsNameKey"
-          >
-          <ws-input
+          <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
+            <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
-            label="已开发票（元）"
-            span="1"
-            prop="goodsName"
-          >
-          <ws-input
+          <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
+            <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsName"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
-            label="费用支出（元）"
-            span="1"
-            prop="waterContent"
-          >
-          <ws-input
+          <ws-form-item label="费用支出（元）" span="1" prop="waterContent">
+            <ws-input
               v-model="deptBudgetList.contractProcessInfo.waterContent"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
-            label="未开发票（元）"
-            span="1"
-            prop="impurity"
-          >
-          <ws-input
+          <ws-form-item label="未开发票（元）" span="1" prop="impurity">
+            <ws-input
               v-model="deptBudgetList.contractProcessInfo.impurity"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
-            label="未回款（元）"
-            span="1"
-            prop="mildewGrain"
-          >
-          <ws-input
+          <ws-form-item label="未回款（元）" span="1" prop="mildewGrain">
+            <ws-input
               v-model="deptBudgetList.contractProcessInfo.mildewGrain"
               maxlength="100"
               size="small"
@@ -452,55 +369,56 @@
             prop="Prettier"
             class="imperfectGrain"
           >
-          <ws-input
+            <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="selectChapterTwo"
-        >
-          <ws-option
-            v-for="item in ChapterTwoList"
-            :key="item.constValue"
-            :label="item.constValue"
-            :value="item.constValue"
-          />
-        </ws-select>
+          <ws-form-item label="双章原件回收情况" span="1" prop="grade">
+            <ws-select
+              v-model="deptBudgetList.contractProcessInfo.grade"
+              placeholder=""
+              class="typeselect"
+              @change="selectChapterTwo"
+            >
+              <ws-option
+                v-for="item in ChapterTwoList"
+                :key="item.constValue"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </ws-select>
           </ws-form-item>
         </ws-info-table>
         <div class="remark">
           <h3>备注信息</h3>
         </div>
-            <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-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"
+        />
       </base-card>
     </ws-form>
-    <div style='text-align:right;padding:10px;'>
-      <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="submit()"
-          >提交</el-button>
+    <div style="text-align: right; padding: 10px">
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+        >提交</el-button
+      >
     </div>
   </div>
 </template>
@@ -524,6 +442,9 @@ export default {
     isShow(val) {
       this.showType = val
     },
+    $route(to, from) {
+      this.loaddata()
+    },
   },
   components: {
     WsUpload,
@@ -575,7 +496,7 @@ export default {
       ],
     }
   },
-  created() {
+  activated() {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();

src/views/contractManagement/purchaseContractEdit.vue

@@ -31,6 +31,7 @@
             span="1"
             prop="contractNo"
           >
+          
           {{deptBudgetList.contractNo}}
           </ws-form-item>
           <ws-form-item
@@ -38,7 +39,11 @@
             span="1"
             prop="shippingType"
           >
-          {{deptBudgetList.shippingType}}
+          <ws-input
+              v-model="deptBudgetList.shippingType"
+              maxlength="100"
+              size="small"
+            />
           </ws-form-item>
           <ws-form-item
             label="买方"
@@ -51,7 +56,12 @@
             label="结算方式"
             span="1"
             prop="settlementMethod"
-          >{{deptBudgetList.settlementMethod}}
+          >
+          <ws-input
+              v-model="deptBudgetList.settlementMethod"
+              maxlength="100"
+              size="small"
+            />
           </ws-form-item>
           <ws-form-item
             label="卖方"
@@ -63,55 +73,131 @@
             label="货源地"
             span="1"
             prop="sourceGoods"
-          >{{deptBudgetList.sourceGoods}}
+          >
+          <ws-input
+              v-model="deptBudgetList.sourceGoods"
+              maxlength="100"
+              size="small"
+            />
           </ws-form-item>
           <ws-form-item
             label="买方电话"
             span="1"
             prop="buyerPhone"
-          >{{deptBudgetList.buyerPhone}}
+          >
+          <ws-input
+              v-model="deptBudgetList.buyerPhone"
+              maxlength="100"
+              size="small"
+            />
           </ws-form-item>
           <ws-form-item
             label="交货地"
             span="1"
             prop="placeDelivery">
-            {{deptBudgetList.placeDelivery}}
+            <ws-input
+              v-model="deptBudgetList.placeDelivery"
+              maxlength="100"
+              size="small"
+            />
           </ws-form-item>
            <ws-form-item
             label="卖方电话"
             span="1"
             prop="sellerPhone">
-            {{deptBudgetList.sellerPhone}}
+            <ws-input
+              v-model="deptBudgetList.sellerPhone"
+              maxlength="100"
+              size="small"
+            />
           </ws-form-item>
           <ws-form-item
             label="包装方式"
             span="1"
             prop="packingMethod">
-            {{deptBudgetList.packingMethod}}
+            <ws-select
+          v-model="deptBudgetList.packingMethod"
+          placeholder=""
+          class="typeselect"
+          @change="selectpackingMethod"
+        >
+          <ws-option
+            v-for="item in packtypeList"
+            :key="item.constKey"
+            :label="item.constValue"
+            :value="item.constValue"
+          />
+        </ws-select>
           </ws-form-item>
           <ws-form-item
             label="重量（吨）"
             span="1"
             prop="weight">
-            {{deptBudgetList.weight}}
+            <ws-input
+              v-model="deptBudgetList.weight"
+              maxlength="100"
+              size="small"
+            />
           </ws-form-item>
           <ws-form-item
             label="验收方式"
             span="1"
             prop="acceptanceMethod">
-            {{deptBudgetList.acceptanceMethod}}
+             <el-select v-model="deptBudgetList.acceptanceMethod" :value='deptBudgetList.acceptanceMethod' placeholder="请选择验收方式"  style="width: 100%;" filterable @change="selectunitList">
+              <el-option v-for="(item,index) in unitList"
+               :key="item.constValue"
+               :label=" item.constValue"
+               :value="item.constValue">
+                <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="overShort">
-            {{deptBudgetList.overShort}}
+            <ws-input
+              v-model="deptBudgetList.overShort"
+              maxlength="100"
+              size="small"
+            />
           </ws-form-item>
           <ws-form-item
             label="交货日期（起）"
             span="1"
             prop="deliveryDateStart">
-            {{deptBudgetList.deliveryDateStart}}
+            <ws-date-picker
+          :picker-options="pickerBeginDateBefore"
+          v-model="deptBudgetList.deliveryDateStart"
+          type="date"
+          default-value="1980-01-01"
+          placeholder="交货日期（起）"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        />
           </ws-form-item>
           <ws-form-item
             label="合同单价（元/吨）"
@@ -123,19 +209,39 @@
             label="交货日期（止）"
             span="1"
             prop="deliveryDateEnd">
-            {{deptBudgetList.deliveryDateEnd}}
+           <ws-date-picker
+          :picker-options="pickerBeginDateBefore"
+          v-model="deptBudgetList.deliveryDateEnd"
+          type="date"
+          default-value="1980-01-01"
+          placeholder="交货日期（止）"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        />
           </ws-form-item>
           <ws-form-item
             label="合同总价（元）"
             span="1"
             prop="totalContractPrice">
-            {{deptBudgetList.totalContractPrice}}
+            <ws-input
+            v-model="deptBudgetList.totalContractPrice"
+            maxlength="100"
+            size="small"
+          />
           </ws-form-item>
           <ws-form-item
             label="签订日期"
             span="1"
             prop="signingDate">
-            {{deptBudgetList.signingDate}}
+            <ws-date-picker
+          :picker-options="pickerBeginDateBefore"
+          v-model="deptBudgetList.deliveryDateEnd"
+          type="date"
+          default-value="1980-01-01"
+          placeholder="签订日期"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        />
           </ws-form-item>
         </ws-info-table>
       </base-card>
@@ -316,10 +422,15 @@ export default {
       },
       mainReportAdd: {},
       list: {},
+      unitList: [],
+      packtypeList: [],
+      goodnameList: [],
+      gradeList: [],
+      ChapterTwoList: [],
     }
   },
 
-  created() {
+  activated() {
     this.loaddata()
     this.showType = this.isShow
   },

src/views/contractManagement/purchaseContractExamine.vue

@@ -319,7 +319,7 @@ export default {
     }
   },
 
-  created() {
+  activated() {
     this.loaddata()
     this.showType = this.isShow
   },

src/views/contractManagement/salesContract.vue

@@ -74,22 +74,26 @@
           >查找</ws-button
         >
       </template>
-    </BaseHeaderLayout> 
+    </BaseHeaderLayout>
     <el-table :data="tableData.records" style="width: 100%; margin-top: 10px">
       <el-table-column type="index" />
       <el-table-column prop="contractNo" label="合同编号" width="80">
       </el-table-column>
-      <el-table-column prop="goodsName" label="货名" width="80"> </el-table-column>
+      <el-table-column prop="goodsName" label="货名" width="80">
+      </el-table-column>
       <el-table-column prop="grade" label="品级"> </el-table-column>
       <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-      <el-table-column prop="unitContractPrice" label="合同单价（元）"> </el-table-column>
+      <el-table-column prop="unitContractPrice" label="合同单价（元）">
+      </el-table-column>
       <el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
       <el-table-column prop="buyer" label="买方"> </el-table-column>
       <el-table-column prop="seller" label="卖方"> </el-table-column>
-      <el-table-column prop="imperfectGrain" label="已完成（吨）"> </el-table-column>
+      <el-table-column prop="imperfectGrain" label="已完成（吨）">
+      </el-table-column>
       <el-table-column prop="status" label="状态"> </el-table-column>
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column prop="mildewGrain" label="未回款（元）"> </el-table-column>
+      <el-table-column prop="mildewGrain" label="未回款（元）">
+      </el-table-column>
       <el-table-column prop="addressUrl" label="附件"> </el-table-column>
       <el-table-column prop="address" label="操作" width="300">
         <template slot-scope="scope">
@@ -149,21 +153,24 @@ export default {
       // 年
       year: '',
       // 提交类型
-      
-    contractType:1,
-        currentPage:1,
-        pageSize:10,
-        searchType:1,
-        searchKeyWord:'',
-        startDate:null,
-        endDate: null,
 
+      contractType: 1,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      startDate: null,
+      endDate: null,
 
       submitType: true,
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
+<<<<<<< HEAD
       // pickerBeginDateBefore:{},
+=======
+      pickerBeginDateBefore: {},
+>>>>>>> 110c456e325af9782535b7bcbce2d1b72d0f4f03
       tableData: [],
       taskTypeList: [
         { value: '未完成（默认）' },
@@ -189,7 +196,6 @@ export default {
         interviewResult: '1',
         interviewOpinion: '',
         aliasName: '',
-        
       },
       currentPage: 1,
       pageSize: 10,
@@ -201,27 +207,26 @@ export default {
       endDate: null,
     }
   },
-  mounted() {
+  activated() {
     this.getList()
     this.showType = this.isShow
   },
   methods: {
     getList() {
       getList({
-        
         compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType:this.contractType,
+        contractType: this.contractType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
         startDate: this.startDate,
         endDate: this.endDate,
-        contrPage:this.contrPage,
+        contrPage: this.contrPage,
       })
         .toPromise()
         .then((response) => {
-          this.tableData= response
+          this.tableData = response
         })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件

src/views/contractManagement/salesContractAdd.vue

@@ -543,7 +543,7 @@ export default {
       // 提交类型
       submitType: true,
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
-     
+
       packtypeList: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
       mainReportAdd: {},
@@ -583,7 +583,7 @@ export default {
       interviewTypeList: {},
     }
   },
-  created() {
+  activated() {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();

src/views/contractManagement/salesContractEdit.vue

@@ -458,6 +458,7 @@
             </ws-select>
           </ws-form-item>
           </ws-info-table>
+<<<<<<< HEAD
   
       </ws-form>
     </div>
@@ -498,6 +499,40 @@
         >提交</el-button
       >
     </div>
+=======
+          <div class="wenzi">
+            <h3>备注信息</h3>
+          </div>
+          <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"
+            accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+          />
+          <!-- </base-card> -->
+        </ws-info-table>
+      </ws-form>
+      <div style="text-align: right; padding: 10px">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="submit()"
+          >提交</el-button
+        >
+      </div>
+>>>>>>> 110c456e325af9782535b7bcbce2d1b72d0f4f03
     </div>
   </div>
 </template>
@@ -558,7 +593,7 @@ export default {
       interviewTypeList: {},
     }
   },
-  created() {
+  activated() {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();

src/views/contractManagement/salesContractExamine.vue

@@ -3,7 +3,7 @@
 <!--2019年5月30日 20:25:16 by jlx-->
 
 <template>
-  <div class='container'>
+  <div class="container">
     <el-row>
       <el-col :span="12">
         <h2 class="bg-left">查看合同详情</h2>
@@ -24,263 +24,163 @@
       :model="deptBudgetList"
     >
       <div class="remark">
-      <h3>基本信息</h3>
+        <h3>基本信息</h3>
       </div>
-        <ws-info-table>
-          <ws-form-item
-            label="合同编号"
-            span="1"
-            prop="contractNo"
-          >
-          {{deptBudgetList.contractNo}}
-          </ws-form-item>
-          <ws-form-item
-            label="运输方式"
-            span="1"
-            prop="shippingType"
-          >
-          {{deptBudgetList.shippingType}}
-          </ws-form-item>
-          <ws-form-item
-            label="买方"
-            span="1"
-            prop="buyer"
-          >
-          {{deptBudgetList.buyer}}
-          </ws-form-item>
-          <ws-form-item
-            label="结算方式"
-            span="1"
-            prop="settlementMethod"
-          >{{deptBudgetList.settlementMethod}}
-          </ws-form-item>
-          <ws-form-item
-            label="卖方"
-            span="1"
-            prop="seller"
-          >{{deptBudgetList.seller}}
-          </ws-form-item>
-          <ws-form-item
-            label="货源地"
-            span="1"
-            prop="sourceGoods"
-          >{{deptBudgetList.sourceGoods}}
-          </ws-form-item>
-          <ws-form-item
-            label="买方电话"
-            span="1"
-            prop="buyerPhone"
-          >{{deptBudgetList.buyerPhone}}
-          </ws-form-item>
-          <ws-form-item
-            label="交货地"
-            span="1"
-            prop="placeDelivery">
-            {{deptBudgetList.placeDelivery}}
-          </ws-form-item>
-           <ws-form-item
-            label="卖方电话"
-            span="1"
-            prop="sellerPhone">
-            {{deptBudgetList.sellerPhone}}
-          </ws-form-item>
-          <ws-form-item
-            label="包装方式"
-            span="1"
-            prop="packingMethod">
-            {{deptBudgetList.packingMethod}}
-          </ws-form-item>
-          <ws-form-item
-            label="重量（吨）"
-            span="1"
-            prop="weight">
-            {{deptBudgetList.weight}}
-          </ws-form-item>
-          <ws-form-item
-            label="验收方式"
-            span="1"
-            prop="acceptanceMethod">
-            {{deptBudgetList.acceptanceMethod}}
-          </ws-form-item>
-          <ws-form-item
-            label="溢短装（%）"
-            span="1"
-            prop="overShort">
-            {{deptBudgetList.overShort}}
-          </ws-form-item>
-          <ws-form-item
-            label="交货日期（起）"
-            span="1"
-            prop="deliveryDateStart">
-            {{deptBudgetList.deliveryDateStart}}
-          </ws-form-item>
-          <ws-form-item
-            label="合同单价（元/吨）"
-            span="1"
-            prop="unitContractPrice">
-            {{deptBudgetList.unitContractPrice}}
-          </ws-form-item>
-          <ws-form-item
-            label="交货日期（止）"
-            span="1"
-            prop="deliveryDateEnd">
-            {{deptBudgetList.deliveryDateEnd}}
-          </ws-form-item>
-          <ws-form-item
-            label="合同总价（元）"
-            span="1"
-            prop="totalContractPrice">
-            {{deptBudgetList.totalContractPrice}}
-          </ws-form-item>
-          <ws-form-item
-            label="签订日期"
-            span="1"
-            prop="signingDate">
-            {{deptBudgetList.signingDate}}
-          </ws-form-item>
-
-        </ws-info-table>
+      <ws-info-table>
+        <ws-form-item label="合同编号" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <ws-form-item label="运输方式" span="1" prop="shippingType">
+          {{ deptBudgetList.shippingType }}
+        </ws-form-item>
+        <ws-form-item label="买方" span="1" prop="buyer">
+          {{ deptBudgetList.buyer }}
+        </ws-form-item>
+        <ws-form-item label="结算方式" span="1" prop="settlementMethod"
+          >{{ deptBudgetList.settlementMethod }}
+        </ws-form-item>
+        <ws-form-item label="卖方" span="1" prop="seller"
+          >{{ deptBudgetList.seller }}
+        </ws-form-item>
+        <ws-form-item label="货源地" span="1" prop="sourceGoods"
+          >{{ deptBudgetList.sourceGoods }}
+        </ws-form-item>
+        <ws-form-item label="买方电话" span="1" prop="buyerPhone"
+          >{{ deptBudgetList.buyerPhone }}
+        </ws-form-item>
+        <ws-form-item label="交货地" span="1" prop="placeDelivery">
+          {{ deptBudgetList.placeDelivery }}
+        </ws-form-item>
+        <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
+          {{ deptBudgetList.sellerPhone }}
+        </ws-form-item>
+        <ws-form-item label="包装方式" span="1" prop="packingMethod">
+          {{ deptBudgetList.packingMethod }}
+        </ws-form-item>
+        <ws-form-item label="重量（吨）" span="1" prop="weight">
+          {{ deptBudgetList.weight }}
+        </ws-form-item>
+        <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
+          {{ deptBudgetList.acceptanceMethod }}
+        </ws-form-item>
+        <ws-form-item label="溢短装（%）" span="1" prop="overShort">
+          {{ deptBudgetList.overShort }}
+        </ws-form-item>
+        <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
+          {{ deptBudgetList.deliveryDateStart }}
+        </ws-form-item>
+        <ws-form-item
+          label="合同单价（元/吨）"
+          span="1"
+          prop="unitContractPrice"
+        >
+          {{ deptBudgetList.unitContractPrice }}
+        </ws-form-item>
+        <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
+          {{ deptBudgetList.deliveryDateEnd }}
+        </ws-form-item>
+        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
+          {{ deptBudgetList.totalContractPrice }}
+        </ws-form-item>
+        <ws-form-item label="签订日期" span="1" prop="signingDate">
+          {{ deptBudgetList.signingDate }}
+        </ws-form-item>
+      </ws-info-table>
 
       <!-- </base-card> -->
-      
+
       <!--面试信息-->
       <div class="remark">
-      <h3>货物信息</h3>
-    </div>
-        <ws-info-table>
-          <ws-form-item
-            label="货名"
-            span="1"
-            prop="waterContent"
-          >
-          {{deptBudgetList.contractGoodsInfo.goodsName}}
-          </ws-form-item>
-          <ws-form-item
-            label="水分（%）<="
-            span="1"
-            prop="intendedShipId"
-          >
-          {{deptBudgetList.contractGoodsInfo.waterContent}}
-          </ws-form-item>
-          <ws-form-item
-            label="品级"
-            span="1"
-            prop="grade"
-          >
-           {{deptBudgetList.contractGoodsInfo.grade}}
-          </ws-form-item>
-          <ws-form-item
-            label="杂质（%）<="
-            span="1"
-            prop="impurity"
-          >
-          {{deptBudgetList.contractGoodsInfo.impurity}}
-          </ws-form-item>
-          <ws-form-item
-            label="容重（克/升）<="
-            span="1"
-            prop="bulkDensity"
-          >
-          {{deptBudgetList.contractGoodsInfo.bulkDensity}}
-          </ws-form-item>
-          <ws-form-item
-            label="霉变粒（%）<="
-            span="1"
-            prop="mildewGrain"
-            class="result"
-          >
-            {{deptBudgetList.contractGoodsInfo.mildewGrain}}
-          </ws-form-item>
-           <ws-form-item
-            label="热损伤（%）<="
-            span="1"
-            prop="jiaorenli"
-          >
-            {{deptBudgetList.contractGoodsInfo.jiaorenli}}
-          </ws-form-item>
-          <ws-form-item
-            label="不完善粒（%）<="
-            span="1"
-            prop="imperfectGrain"
-            class="result"
-          >
-            {{deptBudgetList.contractGoodsInfo.imperfectGrain}}
-          </ws-form-item>
-        </ws-info-table>
-        <div class="remark">
-          <h3>流程信息</h3>
-        </div>
-        <ws-info-table>
-          <ws-form-item
-            label="合同收入（元）"
-            span="1"
-            prop="goodsNameKey"
-          >
-          {{deptBudgetList.contractProcessInfo.goodsNameKey}}
-          </ws-form-item>
-          <ws-form-item
-            label="已开发票（元）"
-            span="1"
-            prop="goodsName"
-          >
-          {{deptBudgetList.contractProcessInfo.goodsName}}
-          </ws-form-item>
-          <ws-form-item
-            label="费用支出（元）"
-            span="1"
-            prop="waterContent"
-          >{{deptBudgetList.contractProcessInfo.waterContent}}
-          </ws-form-item>
-          <ws-form-item
-            label="未开发票（元）"
-            span="1"
-            prop="impurity"
-          >{{deptBudgetList.contractProcessInfo.impurity}}
-          </ws-form-item>
-          <ws-form-item
-            label="未回款（元）"
-            span="1"
-            prop="mildewGrain"
-          >{{deptBudgetList.contractProcessInfo.mildewGrain}}
-          </ws-form-item>
-          <ws-form-item
-            label="已完成发运量（吨）"
-            span="1"
-            prop="imperfectGrain"
-            class="result"
-          >{{deptBudgetList.contractProcessInfo.imperfectGrain}}
-          </ws-form-item>
-           <ws-form-item
-            label="双章原件回收情况"
-            span="1"
-            prop="grade"
-          >{{deptBudgetList.contractProcessInfo.grade}}
-          </ws-form-item>
-        </ws-info-table>
-        <div class="remark">
-          <h3>备注信息</h3>
-        </div>
-        {{deptBudgetList.contractProcessInfo.remarks}}
-        <img :src="deptBudgetList.contractProcessInfo.addressUrl" alt="">
+        <h3>货物信息</h3>
+      </div>
+      <ws-info-table>
+        <ws-form-item label="货名" span="1" prop="waterContent">
+          {{ deptBudgetList.contractGoodsInfo.goodsName }}
+        </ws-form-item>
+        <ws-form-item label="水分（%）<=" span="1" prop="intendedShipId">
+          {{ deptBudgetList.contractGoodsInfo.waterContent }}
+        </ws-form-item>
+        <ws-form-item label="品级" span="1" prop="grade">
+          {{ deptBudgetList.contractGoodsInfo.grade }}
+        </ws-form-item>
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
+          {{ deptBudgetList.contractGoodsInfo.impurity }}
+        </ws-form-item>
+        <ws-form-item label="容重（克/升）<=" span="1" prop="bulkDensity">
+          {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
+        </ws-form-item>
+        <ws-form-item
+          label="霉变粒（%）<="
+          span="1"
+          prop="mildewGrain"
+          class="result"
+        >
+          {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
+        </ws-form-item>
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
+          {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
+        </ws-form-item>
+        <ws-form-item
+          label="不完善粒（%）<="
+          span="1"
+          prop="imperfectGrain"
+          class="result"
+        >
+          {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
+        </ws-form-item>
+      </ws-info-table>
+      <div class="remark">
+        <h3>流程信息</h3>
+      </div>
+      <ws-info-table>
+        <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
+          {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
+        </ws-form-item>
+        <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
+          {{ deptBudgetList.contractProcessInfo.goodsName }}
+        </ws-form-item>
+        <ws-form-item label="费用支出（元）" span="1" prop="waterContent"
+          >{{ deptBudgetList.contractProcessInfo.waterContent }}
+        </ws-form-item>
+        <ws-form-item label="未开发票（元）" span="1" prop="impurity"
+          >{{ deptBudgetList.contractProcessInfo.impurity }}
+        </ws-form-item>
+        <ws-form-item label="未回款（元）" span="1" prop="mildewGrain"
+          >{{ deptBudgetList.contractProcessInfo.mildewGrain }}
+        </ws-form-item>
+        <ws-form-item
+          label="已完成发运量（吨）"
+          span="1"
+          prop="imperfectGrain"
+          class="result"
+          >{{ deptBudgetList.contractProcessInfo.imperfectGrain }}
+        </ws-form-item>
+        <ws-form-item label="双章原件回收情况" span="1" prop="grade"
+          >{{ deptBudgetList.contractProcessInfo.grade }}
+        </ws-form-item>
+      </ws-info-table>
+      <div class="remark">
+        <h3>备注信息</h3>
+      </div>
+      {{ deptBudgetList.contractProcessInfo.remarks }}
+      <img :src="deptBudgetList.contractProcessInfo.addressUrl" alt="" />
       <!-- </base-card> -->
-
     </ws-form>
-    <div style='text-align:right;padding:10px;'>
+    <div style="text-align: right; padding: 10px">
       <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="returnsales()"
-          >关闭</el-button
-        >
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="returnsales()"
+        >关闭</el-button
+      >
     </div>
   </div>
-
 </template>
 
 <script>
 import { getVesselOne } from '@/model/procurement/basic'
-import{getList}from'@/model/contarct/index'
+import { getList } from '@/model/contarct/index'
 import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
@@ -313,7 +213,7 @@ export default {
       mainReportAdd: {},
     }
   },
-  created() {
+  activated() {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();