瀏覽代碼

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

# Conflicts:
#	src/views/warehouse/component/router/index.js
zhongtianhaoyuan 4 年之前
父節點
當前提交
955bc9fe59

+ 6 - 26
src/views/contractManagement/purchaseContract.vue

@@ -92,6 +92,7 @@
       class="wenzi"
       :data="contractList.records"
       style="width: 100%; margin-top: 10px"
+      height="780"
     >
       <el-table-column type="index" label="序号">
         <template scope="scope">
@@ -526,7 +527,7 @@ export default {
       console.log(row)
       this.$router.push({
         name: 'purchaseContractExamine',
-        query: { id: row.id, status: row.status },
+        query: { id: row.id, status: row.status, con },
       })
     },
     handleAdd() {
@@ -551,8 +552,10 @@ export default {
         })
     },
     find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+      if (this.value2.length > 0) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+      }
       this.currentPage = 1
       this.getList()
     },
@@ -906,28 +909,5 @@ export default {
     cursor: text;
     padding: 0 !important;
   }
-  .el-message-box{
-    width: 440px;
-    height: 160px;
-    background: #FFFFFF;
-    box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
-    border-radius: 4px;
-  }
- /deep/.el-message-box__message p{
-    width: 351px;
-    height: 20px;
-    font-size: 14px;
-    font-family: PingFangSC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #191919;
-    line-height: 20px;
-  }
-.el-message-box__title{
-  width: 440px;
-  height: 160px;
-  background: #FFFFFF;
-  box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
-  border-radius: 4px;
-}
 }
 </style>

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

@@ -4,7 +4,7 @@
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left">查看合同详情</h2>
+        <h2 class="bg-left title">查看合同详情</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button

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

@@ -1,3 +1,4 @@
+
 <!--销售合同-->
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
@@ -92,13 +93,14 @@
       class="wenzi"
       :data="contractList.records"
       style="width: 100%; margin-top: 10px"
+      height="780"
     >
-      <!-- <el-table-column type="index" label="序号">
+      <el-table-column type="index" label="序号">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column prop="contractNo" label="合同编号" width="80">
       </el-table-column>
       <el-table-column prop="goodsName" label="货名" width="80">
@@ -186,7 +188,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column prop="mildewGrain" label="已付款(元)">
+      <el-table-column prop="mildewGrain" label="未回款(元)">
       </el-table-column>
       <el-table-column prop="addressUrl" label="附件">
         <template slot-scope="scope">
@@ -326,7 +328,6 @@ export default {
       deptBudgetTotal: 0,
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
-      handleCurrentChange:{},
       deptCircularPage: {},
       date: {
         year: dayjs().format('YYYY'),
@@ -345,6 +346,7 @@ export default {
       taskTypeList: [
         { value: '未完成', type: 1 },
         { value: '已完成', type: 2 },
+        { value: '未回款', type: 3 },
         { value: '全部合同', type: '' },
       ],
       pickerOptions: {
@@ -479,7 +481,6 @@ export default {
       // this.onChangeFlag = true
     },
     editClick(row) {
-      
       var status = ''
       if (row.status == '待执行' || row.status == '已完成') {
         status = '执行中'
@@ -489,9 +490,8 @@ export default {
       //cancelButtonClass: "btn-custom-cancel"
       this.$confirm(`是否将状态改为${status}`, {
         confirmButtonText: '确定',
-        cancelButtonText:'取消',
+        cancelButtonText: '取消',
         type: 'warning',
-      
       })
         .then(() => {
           editstatus({ id: row.id })
@@ -533,7 +533,6 @@ export default {
       this.appendixIdss = row.receiveAttachmentPath
     },
     handleExamine(row) {
-    
       this.$router.push({
         name: 'salesContractExamine',
         query: { id: row.id },
@@ -562,8 +561,10 @@ export default {
         })
     },
     find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+      if (this.value2.length > 0) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+      }
       this.currentPage = 1
       this.getList()
     },
@@ -591,8 +592,7 @@ export default {
       })
     },
     // deletecontract(){},
-    //删除 
-    
+    //删除
 
     approve() {},
     listQuery() {},
@@ -601,7 +601,7 @@ export default {
     selectCrtDuty() {},
 
     handleDelete(row) {
-      var handleDelete = ' ' 
+      var handleDelete = ' '
       if (row.handleDelete == '待执行' || row.handleDelete == '已完成') {
         handleDelete = '执行中'
       } else if (row.handleDelete == '执行中') {
@@ -925,14 +925,14 @@ export default {
     cursor: text;
     padding: 0 !important;
   }
-  .el-message-box{
+  .el-message-box {
     width: 440px;
     height: 160px;
-    background: #FFFFFF;
+    background: #ffffff;
     box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
     border-radius: 4px;
   }
- /deep/.el-message-box__message p{
+  /deep/.el-message-box__message p {
     width: 351px;
     height: 20px;
     font-size: 14px;
@@ -941,12 +941,12 @@ export default {
     color: #191919;
     line-height: 20px;
   }
-.el-message-box__title{
-  width: 440px;
-  height: 160px;
-  background: #FFFFFF;
-  box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
-  border-radius: 4px;
-}
+  .el-message-box__title {
+    width: 440px;
+    height: 160px;
+    background: #ffffff;
+    box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
+    border-radius: 4px;
+  }
 }
-</style>
+</style>

+ 40 - 4
src/views/contractManagement/salesContractAdd.vue

@@ -2,7 +2,7 @@
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left">创建销售合同</h2>
+        <h2 class="bg-left title">创建销售合同</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button
@@ -207,7 +207,13 @@
               </el-option>
               <!-- 新增按钮 -->
               <el-option value="" label="">
-                <div style="text-align: center">
+                <div
+                  style="
+                    text-align: right;
+                    border-top: 1px solid #dcdfe6;
+                    padding: 5px;
+                  "
+                >
                   <ws-button type="primary" @click.stop="addClick">{{
                     $t('button.add')
                   }}</ws-button>
@@ -1234,6 +1240,29 @@ export default {
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   padding: 0 25px;
 }
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid #cdd2dc;
+  border-bottom: 1px solid #cdd2dc;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
 .readonly {
   position: relative;
 }
@@ -1246,9 +1275,16 @@ export default {
   top: 21%;
   font-size: 20px;
 }
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid #cdd2dc;
+  background: #fafbfc;
+}
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 140px;
   text-align: center;
+  background: #f0f2f6;
+  // border: 1px solid #cdd2dc;
 }
 .button-container {
   display: flex;
@@ -1312,7 +1348,7 @@ export default {
   text-align: right;
 }
 .bg-bottom {
-  margin: 20px 0px;
+  margin: 16px 0px;
 }
 .wenzi {
   width: 900px;
@@ -1446,7 +1482,7 @@ export default {
   }
 }
 .winseaview-view {
-  padding: 10px 0 20px;
+  padding: 0 0 20px;
 }
 .container {
   overflow: scroll;

+ 48 - 3
src/views/contractManagement/salesContractEdit.vue

@@ -2,7 +2,7 @@
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left">修改合同信息</h2>
+        <h2 class="bg-left title">修改合同信息</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button
@@ -1132,9 +1132,54 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid #cdd2dc;
+  border-bottom: 1px solid #cdd2dc;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid #cdd2dc;
+  background: #fafbfc;
+}
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 140px;
   text-align: center;
+  background: #f0f2f6;
+  // border: 1px solid #cdd2dc;
 }
 .button-container {
   display: flex;
@@ -1198,7 +1243,7 @@ export default {
   text-align: right;
 }
 .bg-bottom {
-  margin: 20px 0px;
+  margin: 6px 0px;
 }
 .wenzi {
   width: 900px;
@@ -1284,7 +1329,7 @@ export default {
   }
 }
 .winseaview-view {
-  padding: 10px 0 20px;
+  padding: 0 0 20px;
 }
 .container {
   overflow: scroll;

+ 352 - 307
src/views/contractManagement/salesContractExamine.vue

@@ -6,9 +6,7 @@
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left">
-          查看合同详情<span>状态:{{ status }}</span>
-        </h2>
+        <h2 class="bg-left title">查看合同详情</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button
@@ -20,260 +18,261 @@
         >
       </el-col>
     </el-row>
-     <div class="state">
+    <div class="state">
       <h2>销售合同</h2>
-      <p>【编号:{{deptBudgetList.contractNo}}】</p>
+      <p>【编号:{{ deptBudgetList.contractNo }}】</p>
       <span class="icon">&nbsp;&nbsp;{{ deptBudgetList.status }}</span>
     </div>
-     <div class="center">
-    <ws-form
-      ref="deptBudgetList"
-      :rules="mainReportAdd"
-      :model="deptBudgetList"
-    >
-      <div class="remark">
-        <h3>基本信息</h3>
-      </div>
-      <ws-info-table>
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
-          <div class="unchanged">
-            {{ deptBudgetList.contractNo }}
-          </div>
-          <span class="unchangeable">*</span>
-        </ws-form-item>
-        <ws-form-item label="运输方式" span="1" prop="shippingType">
-          <div class="unchanged">
-            {{ deptBudgetList.shippingType }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="买方" span="1" prop="buyer">
-          <div class="unchanged">
-            {{ deptBudgetList.buyer }}
-          </div>
-          <span class="unchangeable">*</span>
-        </ws-form-item>
-        <ws-form-item label="结算方式" span="1" prop="settlementMethod">
-          <div class="unchanged">
-            {{ deptBudgetList.settlementMethod }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="卖方" span="1" prop="seller">
-          <div class="unchanged">
-            {{ deptBudgetList.seller }}
-          </div>
-          <span class="unchangeable">*</span>
-        </ws-form-item>
-        <ws-form-item label="货源地" span="1" prop="sourceGoods">
-          <div class="unchanged">
-            {{ deptBudgetList.sourceGoods }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="买方电话" span="1" prop="buyerPhone">
-          <div class="unchanged">
-            {{ deptBudgetList.buyerPhone }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="交货地" span="1" prop="placeDelivery">
-          <div class="unchanged">
-            {{ deptBudgetList.placeDelivery }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
-          <div class="unchanged">
-            {{ deptBudgetList.sellerPhone }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="包装方式" span="1" prop="packingMethod">
-          <div class="unchanged">
-            {{ deptBudgetList.packingMethod }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="重量(吨)" span="1" prop="weight">
-          <div class="unchanged">
-            {{ deptBudgetList.weight }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-          <div class="unchanged">
-            {{ deptBudgetList.acceptanceMethod }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="溢短装(%)" span="1" prop="overShort">
-          <div class="unchanged">
-            {{ deptBudgetList.overShort }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="交货日期(起)" span="1" prop="deliveryDateStart">
-          <div class="unchanged">
-            {{ deptBudgetList.deliveryDateStart }}
-          </div>
-        </ws-form-item>
-        <ws-form-item
-          label="合同单价(元/吨)"
-          span="1"
-          prop="unitContractPrice"
-        >
-          <div class="unchanged">
-            {{ deptBudgetList.unitContractPrice }}
-          </div>
-          <span class="unchangeable">*</span>
-        </ws-form-item>
-        <ws-form-item label="交货日期(止)" span="1" prop="deliveryDateEnd">
-          <div class="unchanged">
-            {{ deptBudgetList.deliveryDateEnd }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="合同总价(元)" span="1" prop="totalContractPrice">
-          <div class="unchanged">
-            {{ deptBudgetList.totalContractPrice }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="签订日期" span="1" prop="signingDate">
-          <div class="unchanged">
-            {{ deptBudgetList.signingDate }}
-          </div>
-        </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">
-
-          <div class="unchanged">
-            {{ deptBudgetList.contractGoodsInfo.goodsName }}
-          </div>
-          <span class="unchangeable">*</span>
-        </ws-form-item>
-        <ws-form-item label="水分(%)<=" span="1" prop="intendedShipId">
-          <div class="unchanged">
-            {{ deptBudgetList.contractGoodsInfo.waterContent }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="品级" span="1" prop="grade">
-          <div class="unchanged">
-            {{ deptBudgetList.contractGoodsInfo.grade }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="杂质(%)<=" span="1" prop="impurity">
-          <div class="unchanged">
-            {{ deptBudgetList.contractGoodsInfo.impurity }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="容重(克/升)<=" span="1" prop="bulkDensity">
-          <div class="unchanged">
-            {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
-          </div>
-        </ws-form-item>
-        <ws-form-item
-          label="霉变粒(%)<="
-          span="1"
-          prop="mildewGrain"
-          class="result"
-        >
-
-          <div class="unchanged">
-            {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
-          <div class="unchanged">
-            {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
-          </div>
-
-        </ws-form-item>
-        <ws-form-item
-          label="不完善粒(%)<="
-          span="1"
-          prop="imperfectGrain"
-          class="result"
-        >
-
-          <div class="unchanged">
-            {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
-          </div>
-
-        </ws-form-item>
-      </ws-info-table>
-      <div class="remark">
-        <h3>流程信息</h3>
-      </div>
-      <ws-info-table>
-        <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
+    <div class="center">
+      <ws-form
+        ref="deptBudgetList"
+        :rules="mainReportAdd"
+        :model="deptBudgetList"
+      >
+        <div class="remark">
+          <h3>基本信息</h3>
+        </div>
+        <ws-info-table>
+          <ws-form-item label="合同编号" span="1" prop="contractNo">
+            <div class="unchanged">
+              {{ deptBudgetList.contractNo }}
+            </div>
+            <span class="unchangeable">*</span>
+          </ws-form-item>
+          <ws-form-item label="运输方式" span="1" prop="shippingType">
+            <div class="unchanged">
+              {{ deptBudgetList.shippingType }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="买方" span="1" prop="buyer">
+            <div class="unchanged">
+              {{ deptBudgetList.buyer }}
+            </div>
+            <span class="unchangeable">*</span>
+          </ws-form-item>
+          <ws-form-item label="结算方式" span="1" prop="settlementMethod">
+            <div class="unchanged">
+              {{ deptBudgetList.settlementMethod }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="卖方" span="1" prop="seller">
+            <div class="unchanged">
+              {{ deptBudgetList.seller }}
+            </div>
+            <span class="unchangeable">*</span>
+          </ws-form-item>
+          <ws-form-item label="货源地" span="1" prop="sourceGoods">
+            <div class="unchanged">
+              {{ deptBudgetList.sourceGoods }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="买方电话" span="1" prop="buyerPhone">
+            <div class="unchanged">
+              {{ deptBudgetList.buyerPhone }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="交货地" span="1" prop="placeDelivery">
+            <div class="unchanged">
+              {{ deptBudgetList.placeDelivery }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
+            <div class="unchanged">
+              {{ deptBudgetList.sellerPhone }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="包装方式" span="1" prop="packingMethod">
+            <div class="unchanged">
+              {{ deptBudgetList.packingMethod }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="重量(吨)" span="1" prop="weight">
+            <div class="unchanged">
+              {{ deptBudgetList.weight }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
+            <div class="unchanged">
+              {{ deptBudgetList.acceptanceMethod }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="溢短装(%)" span="1" prop="overShort">
+            <div class="unchanged">
+              {{ deptBudgetList.overShort }}
+            </div>
+          </ws-form-item>
+          <ws-form-item
+            label="交货日期(起)"
+            span="1"
+            prop="deliveryDateStart"
+          >
+            <div class="unchanged">
+              {{ deptBudgetList.deliveryDateStart }}
+            </div>
+          </ws-form-item>
+          <ws-form-item
+            label="合同单价(元/吨)"
+            span="1"
+            prop="unitContractPrice"
+          >
+            <div class="unchanged">
+              {{ deptBudgetList.unitContractPrice }}
+            </div>
+            <span class="unchangeable">*</span>
+          </ws-form-item>
+          <ws-form-item label="交货日期(止)" span="1" prop="deliveryDateEnd">
+            <div class="unchanged">
+              {{ deptBudgetList.deliveryDateEnd }}
+            </div>
+          </ws-form-item>
+          <ws-form-item
+            label="合同总价(元)"
+            span="1"
+            prop="totalContractPrice"
+          >
+            <div class="unchanged">
+              {{ deptBudgetList.totalContractPrice }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="签订日期" span="1" prop="signingDate">
+            <div class="unchanged">
+              {{ deptBudgetList.signingDate }}
+            </div>
+          </ws-form-item>
+        </ws-info-table>
 
-          <div class="unchanged">
-            {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="已开发票(元)" span="1" prop="goodsName">
-          <div class="unchanged">
-            {{ deptBudgetList.contractProcessInfo.goodsName }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="费用支出(元)" span="1" prop="waterContent">
-          <div class="unchanged">
-            {{ deptBudgetList.contractProcessInfo.waterContent }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="未开发票(元)" span="1" prop="impurity">
-          <div class="unchanged">
-            {{ deptBudgetList.contractProcessInfo.impurity }}
-          </div>
-        </ws-form-item>
-        <ws-form-item label="未回款(元)" span="1" prop="mildewGrain">
-          <div class="unchanged">
-            {{ deptBudgetList.contractProcessInfo.mildewGrain }}
-          </div>
+        <!-- </base-card> -->
 
-        </ws-form-item>
-        <ws-form-item
-          label="已完成发运量(吨)"
-          span="1"
-          prop="imperfectGrain"
-          class="result"
-        >
-          <div class="unchanged">
-            {{ deptBudgetList.contractProcessInfo.imperfectGrain }}
-          </div>
-        </ws-form-item>
-        <!-- <ws-form-item label="双章原件回收情况" span="1" prop="grade">
+        <!--面试信息-->
+        <div class="remark">
+          <h3>货物信息</h3>
+        </div>
+        <ws-info-table>
+          <ws-form-item label="货名" span="1" prop="waterContent">
+            <div class="unchanged">
+              {{ deptBudgetList.contractGoodsInfo.goodsName }}
+            </div>
+            <span class="unchangeable">*</span>
+          </ws-form-item>
+          <ws-form-item label="水分(%)<=" span="1" prop="intendedShipId">
+            <div class="unchanged">
+              {{ deptBudgetList.contractGoodsInfo.waterContent }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="品级" span="1" prop="grade">
+            <div class="unchanged">
+              {{ deptBudgetList.contractGoodsInfo.grade }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="杂质(%)<=" span="1" prop="impurity">
+            <div class="unchanged">
+              {{ deptBudgetList.contractGoodsInfo.impurity }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="容重(克/升)<=" span="1" prop="bulkDensity">
+            <div class="unchanged">
+              {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
+            </div>
+          </ws-form-item>
+          <ws-form-item
+            label="霉变粒(%)<="
+            span="1"
+            prop="mildewGrain"
+            class="result"
+          >
+            <div class="unchanged">
+              {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
+            <div class="unchanged">
+              {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
+            </div>
+          </ws-form-item>
+          <ws-form-item
+            label="不完善粒(%)<="
+            span="1"
+            prop="imperfectGrain"
+            class="result"
+          >
+            <div class="unchanged">
+              {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
+            </div>
+          </ws-form-item>
+        </ws-info-table>
+        <div class="remark">
+          <h3>流程信息</h3>
+        </div>
+        <ws-info-table>
+          <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
+            <div class="unchanged">
+              {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="已开发票(元)" span="1" prop="goodsName">
+            <div class="unchanged">
+              {{ deptBudgetList.contractProcessInfo.goodsName }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="费用支出(元)" span="1" prop="waterContent">
+            <div class="unchanged">
+              {{ deptBudgetList.contractProcessInfo.waterContent }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="未开发票(元)" span="1" prop="impurity">
+            <div class="unchanged">
+              {{ deptBudgetList.contractProcessInfo.impurity }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="未回款(元)" span="1" prop="mildewGrain">
+            <div class="unchanged">
+              {{ deptBudgetList.contractProcessInfo.mildewGrain }}
+            </div>
+          </ws-form-item>
+          <ws-form-item
+            label="已完成发运量(吨)"
+            span="1"
+            prop="imperfectGrain"
+            class="result"
+          >
+            <div class="unchanged">
+              {{ deptBudgetList.contractProcessInfo.imperfectGrain }}
+            </div>
+          </ws-form-item>
+          <!-- <ws-form-item label="双章原件回收情况" span="1" prop="grade">
           <div class="unchanged">
             {{ deptBudgetList.contractProcessInfo.grade }}
           </div>
 
           >{{ deptBudgetList.contractProcessInfo.imperfectGrain }}
         </ws-form-item> -->
-        <ws-form-item label="双章原件回收情况" span="1" prop="grade" >
-           <div class="unchanged">
-          {{deptBudgetList.contractProcessInfo.grade}}
-           </div>
-        </ws-form-item>
-      </ws-info-table>
-      <div class="remark">
-        <h3>备注信息</h3>
-      </div>
+          <ws-form-item label="双章原件回收情况" span="1" prop="grade">
+            <div class="unchanged">
+              {{ deptBudgetList.contractProcessInfo.grade }}
+            </div>
+          </ws-form-item>
+        </ws-info-table>
+        <div class="remark">
+          <h3>备注信息</h3>
+        </div>
 
         <div class="unchanged beizhu">
-      {{ deptBudgetList.remarks }}
-        </div> 
+          {{ deptBudgetList.remarks }}
+        </div>
 
-      <img :src="deptBudgetList.addressUrl" alt="" />
+        <img :src="deptBudgetList.addressUrl" alt="" />
 
-      <!-- </base-card> -->
-    </ws-form>
-    <div style="text-align: right; padding: 10px">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="returnsales()"
-        >关闭</el-button
-      >
-    </div>
+        <!-- </base-card> -->
+      </ws-form>
+      <div style="text-align: right; padding: 10px">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          >关闭</el-button
+        >
+      </div>
     </div>
   </div>
 </template>
@@ -330,7 +329,6 @@ export default {
     this.status = this.$route.query.status
     this.loaddata()
     this.showType = this.isShow
-    this.getList()
     this.examineList()
   },
   methods: {
@@ -402,6 +400,55 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid #cdd2dc;
+  border-bottom: 1px solid #cdd2dc;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid #cdd2dc;
+  background: #fafbfc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 140px;
+  text-align: center;
+  background: #f0f2f6;
+  // border: 1px solid #cdd2dc;
+}
 .button-container {
   display: flex;
   flex-wrap: nowrap;
@@ -464,7 +511,7 @@ export default {
   text-align: right;
 }
 .bg-bottom {
-  margin: 20px 0px;
+  margin: 6px 0px;
 }
 .wenzi {
   width: 900px;
@@ -555,90 +602,88 @@ export default {
 .container {
   overflow: scroll;
   height: 93vh;
-  
 }
-.state{
+.state {
   width: 900px;
   margin: 0 auto;
 }
-.state h2,.state p{
-   display: inline-block;
-}
-.state p{
-   display: inline-block;
-   margin-left: 10px;
-   width: 170px;
-height: 20px;
-font-size: 14px;
-font-family: PingFangSC-Regular, PingFang SC;
-font-weight: 400;
-color: #000000;
-line-height: 20px;
-}
-.icon{
+.state h2,
+.state p {
+  display: inline-block;
+}
+.state p {
+  display: inline-block;
+  margin-left: 10px;
+  width: 170px;
+  height: 20px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #000000;
+  line-height: 20px;
+}
+.icon {
   display: inline-block;
   width: 60px;
-height: 24px;
-background: #ECFEFF;
-border-radius: 12px;
-border: 1px solid #50CAD4;
-position: relative;
-font-family: PingFangSC-Regular, PingFang SC;
-font-size: 14px;
-color: #50CAD4;
-line-height: 24px;
+  height: 24px;
+  background: #ecfeff;
+  border-radius: 12px;
+  border: 1px solid #50cad4;
+  position: relative;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 14px;
+  color: #50cad4;
+  line-height: 24px;
 }
 
- //*号
-.unchangeable{
-position: absolute;
- width: 9px;
-height: 22px;
-font-size: 16px;
-font-family: PingFangSC-Medium, PingFang SC;
-font-weight: 500;
-color: #FF2727;
-line-height: 22px;
-display: inline-block;
-right: 14px;
-}
-/deep/.el-input ,/deep/.el-date-editor{
-    font-size: 13px;
-    width: 232px;
-    left: 21px;
-}
-/deep/.el-textarea{
+//*号
+.unchangeable {
+  position: absolute;
+  width: 9px;
+  height: 22px;
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #ff2727;
+  line-height: 22px;
+  display: inline-block;
+  right: 14px;
+}
+/deep/.el-input,
+/deep/.el-date-editor {
+  font-size: 13px;
+  width: 232px;
+  left: 21px;
+}
+/deep/.el-textarea {
   width: 900px;
   margin: 0px;
 }
-/deep/el-date-editor--date{
+/deep/el-date-editor--date {
   width: 200px;
 }
-.beizhu{
-   position: absolute;
+.beizhu {
+  position: absolute;
 
   margin: 0 auto;
- 
 }
-.unchanged{
+.unchanged {
   position: absolute;
   left: 37px;
   width: 900px;
-height: 14px;
-font-size: 14px;
-font-family: PingFangSC-Regular, PingFang SC;
-font-weight: 400;
-color: #AFB5CB;
-line-height: 14px;
-
-
-}
-/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label{
+  height: 14px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #afb5cb;
+  line-height: 14px;
+}
+/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
   width: 130px;
 }
 /deep/.el-input--small .el-input__inner {
-    height: 32px;
-    line-height: 32px;
-    width: 232px;
+  height: 32px;
+  line-height: 32px;
+  width: 232px;
 }
 </style>

+ 1 - 1
src/views/dataManageMent/components/routers/dataManagement.js

@@ -14,7 +14,7 @@ const dataManagement = {
   children: [
     {
       path: 'list',
-      component: () => import(/* webpackChunkName: "dataManageMentList" */ '@/views/dataManageMent/list'),
+      component: () => import(/* webpackChunkName: "dataManageMentList" */ '@/views/dataManageMent/warehouseManagementlist'),
       name: 'dataManageMentList',
       meta: {
         title: 'dataManageMentView',

+ 0 - 0
src/views/dataManageMent/list.vue → src/views/dataManageMent/warehouseManagementlist.vue


+ 45 - 13
src/views/warehouse/component/router/index.js

@@ -1,25 +1,58 @@
+// import Layout from '@/layout/index';
+
+// const contractManagementRouter = {
+//   path: '/warehouseManagement',
+//   component: Layout,
+//   redirect: '/warehouseManagement',
+//   name: 'warehouseManagement',
+//   alwaysShow: true, // will always show the root menu
+//   meta: {
+//     title: 'warehouseManagement',
+//     module: 'warehouseManagement',
+//     icon: 'cg'
+//   },
+//   children: [
+//     {
+//       path: 'warehouseManagementlist',
+//       component: () =>
+//         import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/list'),
+//       name: 'warehouseManagementlist',
+//       meta: {
+//         title: 'warehouseManagementlist',
+//         shortcutEntrance: 'warehouseManagementlist',
+//         module: 'warehouseManagement.salesContract.warehouseManagementlist',
+//         permissicon: [],
+//         keepAlive: true
+//         // module: 'procurement.sparepart.applDetail'
+//       },
+//       hidden: true
+//     },
+//   ],
+// };
+// export default contractManagementRouter;
 import Layout from '@/layout/index';
-const warehouseManagementRouter = {
+
+const warehouseRouter = {
   path: '/warehouse',
   component: Layout,
-  redirect:  { name: 'warehouseManagementList' },
-  name: 'warehouseManagementList',
+  redirect: '/warehouse',
+  name: 'warehouse',
   alwaysShow: true, // will always show the root menu
   meta: {
-    title: 'warehouseManagementList',
-    module: 'warehouseManagement',
+    title: 'warehouse',
+    module: 'warehouse',
     icon: 'cg'
   },
   children: [
     {
-      path: 'warehouseManagementList',
+      path: 'warehouseManagementlist',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementList'),
-      name: 'warehouseManagementList',
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementlist'),
+      name: 'warehouseManagementlist',
       meta: {
-        title: 'warehouseManagementList',
-        shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouseManagementList',
+        title: 'warehouseManagementlist',
+        shortcutEntrance: 'warehouse',
+        module: 'warehouse.warehouseManagementlist',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -28,5 +61,4 @@ const warehouseManagementRouter = {
     },
   ],
 };
-export default warehouseManagementRouter;
-   
+export default warehouseRouter;

+ 903 - 0
src/views/warehouse/warehouseManagementlist.vue

@@ -0,0 +1,903 @@
+<!--仓库管理-->
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="20">
+      <template slot="left">
+        <ws-button
+          type="primary"
+          @click="handleLook()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >查看</ws-button
+        >
+        <ws-button
+          type="primary"
+          @click="handleAdd()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >添加</ws-button
+        >
+        <ws-button
+          type="primary"
+          @click="handleEdit()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >编辑</ws-button
+        >
+        <ws-button
+          type="primary"
+          @click="handleDelete()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >删除</ws-button
+        >
+      </template>
+      <template slot="right">
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="请输入仓库名"
+          clearable
+          maxlength="500"
+          type="input"
+          class="findValue"
+        ></ws-input>
+        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+        <ws-button
+          class="find"
+          type="primary"
+          @click="find()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          ><img
+            width="16"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt=""
+        /></ws-button>
+      </template>
+    </BaseHeaderLayout>
+    <el-table
+      class="wenzi"
+      :data="contractList.records"
+      style="width: 100%; margin-top: 10px"
+    >
+      <!-- <el-table-column type="index" label="序号">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column> -->
+      <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="grade" label="品级">
+        <template slot-scope="scope">
+          <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+            scope.row.grade
+          }}</span>
+          <span v-if="scope.row.grade == '二等品'" class="second-class">{{
+            scope.row.grade
+          }}</span>
+          <span v-if="scope.row.grade == '三等品'" class="third-class">{{
+            scope.row.grade
+          }}</span>
+          <span v-if="scope.row.grade == '等外'" class="substandard">{{
+            scope.row.grade
+          }}</span>
+        </template>
+      </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="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="已完成(吨)">
+        <template slot-scope="scope">
+          <span style="color: #5473e8; font-weight: 600">{{
+            scope.row.imperfectGrain
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="状态">
+        <template slot-scope="scope">
+          <el-popover
+            placement="left"
+            :width="285"
+            trigger="click"
+            visible-arrow="false"
+            @show="history(scope.row)"
+          >
+            <template>
+              <span slot="reference">
+                <span
+                  v-if="scope.row.status == '待执行'"
+                  class="executory"
+                ></span>
+                <span
+                  v-if="scope.row.status == '执行中'"
+                  class="inExecution"
+                ></span>
+                <span v-if="scope.row.status == '已完成'" class="done"></span
+                >{{ scope.row.status }}
+              </span>
+            </template>
+            <div>
+              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
+              <div v-for="(item, index) in historyList" class="flex">
+                <div class="vertical-text vertical-text-left">
+                  {{ item.updateDate }}
+                </div>
+                <div>
+                  <div class="vertical-circle"></div>
+                  <div
+                    v-if="index != historyList.length - 1"
+                    class="vertical-line"
+                  ></div>
+                </div>
+                <div class="vertical-text">
+                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+                </div>
+              </div>
+            </div>
+          </el-popover>
+          <img
+            width="17"
+            height="18"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png"
+            @click="editClick(scope.row)"
+            alt=""
+          />
+          <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
+        </template>
+      </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="addressUrl" label="附件">
+        <template slot-scope="scope">
+          <img
+            width="18"
+            height="20"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png"
+            @click="fujian(scope.row)"
+            alt=""
+          />
+          <span v-if="scope.row.addressUrlArray.length > 0">{{
+            scope.row.addressUrlArray.length
+          }}</span>
+          <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
+        </template>
+      </el-table-column>
+      <el-table-column prop="address" label="操作" width="200">
+        <template slot-scope="scope">
+          <img
+            width="16"
+            height="16"
+            style="vertical-align: text-top; margin: 0 6px"
+            src="../../../public/img/chakan.png"
+            @click="handleExamine(scope.row)"
+            alt=""
+          />
+          <img
+            width="17"
+            height="16"
+            style="vertical-align: text-top; margin: 0 6px"
+            src="../../../public/img/bianji.png"
+            @click="handleEdit(scope.row)"
+            alt=""
+          />
+          <img
+            width="16"
+            height="17"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: -1px;
+              margin: 0 6px;
+            "
+            src="../../../public/img/shanchu.png"
+            @click="handleDelete(scope.row)"
+            alt=""
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
+    <!-- 附件弹框 -->
+    <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose"
+    >
+      <p>查看附件</p>
+      <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"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+      />
+    </WinseaContentModal>
+  </div>
+</template>
+<script>
+import {
+  getList,
+  export1,
+  editstatus,
+  billoperatehis,
+  deletecontract,
+} from '@/model/contarct/index'
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import { dayjs, fmoney, EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      size: 10,
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      appendixIdsAdd: '',
+      searchType: 1,
+      searchTypeText: '未完成',
+      searchKeyWord: '',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      // 提交类型
+      submitType: true,
+      contractForm: {},
+      categoryIndex: 0,
+      rulesVendor: {},
+      deptBudgetTotal: 0,
+      size: 10,
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      handleCurrentChange:{},
+      deptCircularPage: {},
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      contractList: [],
+      deptBudgetList: {},
+      historyList: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+      taskTypeList: [
+        { value: '未完成', type: 1 },
+        { value: '已完成', type: 2 },
+        { value: '全部合同', type: '' },
+      ],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: '本周',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              var thisDay = start.getDay()
+              var thisDate = start.getDate()
+              if (thisDay != 0) {
+                start.setDate(thisDate - thisDay)
+              }
+              picker.$emit('pick', [start, end])
+            },
+          },
+          {
+            text: '本月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setDate(1)
+              picker.$emit('pick', [start, end])
+            },
+          },
+          {
+            text: '本季度',
+            onClick(picker) {
+              var oDate = new Date()
+
+              var thisYear = oDate.getFullYear()
+              var thisMonth = oDate.getMonth() + 1
+
+              var n = Math.ceil(thisMonth / 3) // 季度
+
+              var Month = n * 3 - 1
+
+              var start = new Date(thisYear, Month - 2, 1)
+              var end = new Date()
+
+              picker.$emit('pick', [start, end])
+            },
+          },
+        ],
+      },
+      value1: '',
+      value2: '',
+    }
+  },
+  activated() {
+    //cg.viewBudget
+    //cg.viewSpareMoney
+    // this.getVesselData();
+    this.getList()
+    this.showType = this.isShow
+  },
+  methods: {
+    handleLook(){
+
+    },
+    handleAdd(){
+
+    },
+    handleEdit(){
+
+    },
+    handleDelete(){
+
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加,必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    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) => {
+          for (var i = 0; i < response.records.length; i++) {
+            if (response.records[i].addressUrl != null) {
+              response.records[i].addressUrlArray = response.records[
+                i
+              ].addressUrl.split(',')
+            } else {
+              response.records[i].addressUrlArray = []
+            }
+          }
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+          this.contractList = response
+        })
+    },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+
+      // this.deptBudgetList.
+      // this.formData.append('files', files)
+      // this.feedbackObj.uploadNameAttachment = data.appendixName
+      // this.feedbackObj.pathUploadAttachment = data.appendixPath
+      // // this.newAppendixs = files
+      // this.onChangeFlag = true
+    },
+    editClick(row) {
+      
+      var status = ''
+      if (row.status == '待执行' || row.status == '已完成') {
+        status = '执行中'
+      } else if (row.status == '执行中') {
+        status = '已完成'
+      }
+      //cancelButtonClass: "btn-custom-cancel"
+      this.$confirm(`是否将状态改为${status}`, {
+        confirmButtonText: '确定',
+        cancelButtonText:'取消',
+        type: 'warning',
+      
+      })
+        .then(() => {
+          editstatus({ 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
+        })
+    },
+    selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
+    fujian(row) {
+      if (
+        row.receiveAttachmentPath === null ||
+        row.receiveAttachmentPath === ''
+      ) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss = row.receiveAttachmentPath
+    },
+    handleExamine(row) {
+    
+      this.$router.push({
+        name: 'salesContractExamine',
+        query: { id: row.id },
+      })
+    },
+
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    history(row) {
+      console.log(row)
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
+    find() {
+      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+      this.currentPage = 1
+      this.getList()
+    },
+    async exportlist() {
+      const { data } = await export1(
+        {
+          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,
+        },
+        {},
+        { responseType: 'blob' }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_采购合同`,
+        type: 'xls',
+      })
+    },
+    // deletecontract(){},
+    //删除 
+    
+
+    approve() {},
+    listQuery() {},
+    total() {},
+    clearfiltQuery() {},
+    selectCrtDuty() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+.flex {
+  display: flex;
+}
+.el-range-editor.el-input__inner {
+  margin-left: 10px;
+}
+/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+  width: 30px;
+  margin-left: -10px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-button--default {
+  border: 1px solid #5473e8;
+  color: #5473e8;
+}
+.warning {
+  width: 100%;
+  height: 2px;
+  background: red;
+}
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
+}
+.top-grade {
+  background: linear-gradient(90deg, #5678e9, #7993f6);
+  color: #fff;
+  padding: 3px;
+  border-radius: 2px;
+}
+.second-class {
+  background: linear-gradient(90deg, #50cdd9, #82e2ea);
+  color: #fff;
+  padding: 3px;
+  border-radius: 2px;
+}
+.third-class {
+  background: linear-gradient(90deg, #ffa735, #ffbf70);
+  color: #fff;
+  padding: 3px;
+  border-radius: 2px;
+}
+.substandard {
+  background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+  color: #fff;
+  padding: 3px;
+  border-radius: 2px;
+}
+.wrap {
+  width: 400px;
+  position: absolute;
+  top: 131px;
+  left: 794px;
+  transform-origin: right center;
+  z-index: 2005;
+}
+.vertical-line {
+  height: 100px;
+  border-left: 2px solid #e9ecf7;
+  margin-left: 4px;
+  padding: 0 3px;
+  // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
+  // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
+  // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
+}
+.el-pagination {
+  padding: 10px 15px;
+  margin-bottom: 0;
+  text-align: center;
+}
+/deep/.el-pager li.active {
+  color: #5878e8;
+  cursor: default;
+}
+/deep/.el-pager li:hover {
+  color: #5878e8;
+  cursor: default;
+}
+.vertical-circle {
+  width: 10px;
+  height: 10px;
+  border: 2px solid #5878e8;
+  background-color: #ffffff;
+  -webkit-border-radius: 100px;
+}
+.vertical-circle:first-child {
+  color: red;
+}
+.vertical-text {
+  margin: 0 10px;
+  color: #8890b1;
+  font-size: 12px;
+  margin-top: -4px;
+}
+/deep/.el-table .el-table__header .cell,
+/deep/.el-table .el-table__body .cell {
+  text-align: center;
+}
+.typeselect {
+  width: 500px;
+}
+.padding-xs {
+  padding: 15px;
+  text-align: right;
+}
+.clearfix:after {
+  content: '';
+  display: block;
+  clear: both;
+}
+.el-table {
+  font-size: 16px;
+}
+.taskType {
+  width: 100%;
+  background-color: #fff;
+  margin-top: 2px;
+  margin-bottom: 10px;
+  list-style: none;
+  // padding-bottom: 20px;
+  li {
+    float: left;
+    border: 1px solid #6ea0f3;
+    border-radius: 5px;
+    max-width: 190px;
+    padding: 0 5px;
+    text-align: center;
+    margin: 10px 20px;
+    cursor: pointer;
+    font-size: 14px;
+    p {
+      margin: 8px 0px;
+      span {
+        color: #e74c3c;
+      }
+    }
+  }
+  li:hover {
+    background-color: #e4eeff;
+    color: #1d6ced;
+  }
+}
+.el-date-editor--date {
+  margin: 0 10px;
+}
+.findValue {
+  margin: 0 10px;
+}
+/deep/.findValue .el-input__inner {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+  .el-message-box{
+    width: 440px;
+    height: 160px;
+    background: #FFFFFF;
+    box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
+    border-radius: 4px;
+  }
+ /deep/.el-message-box__message p{
+    width: 351px;
+    height: 20px;
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #191919;
+    line-height: 20px;
+  }
+.el-message-box__title{
+  width: 440px;
+  height: 160px;
+  background: #FFFFFF;
+  box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
+  border-radius: 4px;
+}
+}
+</style>