浏览代码

前端gjy

18513069273 4 年之前
父节点
当前提交
a08bf756fa

文件差异内容过多而无法显示
+ 559 - 426
src/views/contractManagement/purchaseContractAdd.vue


+ 75 - 26
src/views/contractManagement/purchaseContractEdit.vue

@@ -12,7 +12,7 @@
           type="primary"
           type="primary"
           size="small"
           size="small"
           @click="returnsales()"
           @click="returnsales()"
-          ><img width='6' height='10' style='vertical-align: bottom;' src="../../../public/img/lujing.png" alt=""> 返回</el-button
+          ><img width='6' height='10' style='vertical-align: bottom;margin-right:3px;' src="../../../public/img/lujing.png" alt=""> 返回</el-button
         >
         >
       </el-col>
       </el-col>
     </el-row>
     </el-row>
@@ -24,6 +24,10 @@
     >
     >
       <div class="remark">
       <div class="remark">
       <h3>基本信息</h3>
       <h3>基本信息</h3>
+      <p style='color:#8890B1;'>
+        &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“*”
+        标记的条目提交后不可修改。
+      </p>
       </div>
       </div>
         <ws-info-table>
         <ws-info-table>
           <ws-form-item class='readonly'
           <ws-form-item class='readonly'
@@ -35,12 +39,14 @@
           </ws-form-item>
           </ws-form-item>
           <ws-form-item
           <ws-form-item
             label="运输方式"
             label="运输方式"
+            
             span="1"
             span="1"
             prop="shippingType"
             prop="shippingType"
           >
           >
           <ws-input
           <ws-input
               v-model="deptBudgetList.shippingType"
               v-model="deptBudgetList.shippingType"
               maxlength="100"
               maxlength="100"
+              placeholder="请输入运输方式"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
@@ -55,10 +61,12 @@
             label="结算方式"
             label="结算方式"
             span="1"
             span="1"
             prop="settlementMethod"
             prop="settlementMethod"
+            
           >
           >
           <ws-input
           <ws-input
               v-model="deptBudgetList.settlementMethod"
               v-model="deptBudgetList.settlementMethod"
               maxlength="100"
               maxlength="100"
+              placeholder="请输入结算方式"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
@@ -72,10 +80,12 @@
             label="货源地"
             label="货源地"
             span="1"
             span="1"
             prop="sourceGoods"
             prop="sourceGoods"
+            
           >
           >
           <ws-input
           <ws-input
               v-model="deptBudgetList.sourceGoods"
               v-model="deptBudgetList.sourceGoods"
               maxlength="100"
               maxlength="100"
+              placeholder="请输入货源地"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
@@ -98,6 +108,7 @@
               v-model="deptBudgetList.placeDelivery"
               v-model="deptBudgetList.placeDelivery"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
+              placeholder="请输入交货地"
             />
             />
           </ws-form-item>
           </ws-form-item>
            <ws-form-item
            <ws-form-item
@@ -108,6 +119,7 @@
               v-model="deptBudgetList.sellerPhone"
               v-model="deptBudgetList.sellerPhone"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
+              placeholder="请输入卖方电话"
             />
             />
           </ws-form-item>
           </ws-form-item>
           <ws-form-item
           <ws-form-item
@@ -136,6 +148,7 @@
               v-model="deptBudgetList.weight"
               v-model="deptBudgetList.weight"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
+              placeholder="请输入重量(吨)"
             />
             />
           </ws-form-item>
           </ws-form-item>
           <ws-form-item
           <ws-form-item
@@ -184,6 +197,7 @@
               v-model="deptBudgetList.overShort"
               v-model="deptBudgetList.overShort"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
+              placeholder="请输入溢短装比例(%)"
             />
             />
           </ws-form-item>
           </ws-form-item>
           <ws-form-item
           <ws-form-item
@@ -195,7 +209,7 @@
           v-model="deptBudgetList.deliveryDateStart"
           v-model="deptBudgetList.deliveryDateStart"
           type="date"
           type="date"
           default-value="1980-01-01"
           default-value="1980-01-01"
-          placeholder="交货日期(起)"
+          placeholder="请选择交货日期(起)"
           format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
         />
         />
@@ -206,6 +220,7 @@
             prop="unitContractPrice"
             prop="unitContractPrice"
             >
             >
             <span v-if='deptBudgetList.unitContractPrice!="null"'>{{deptBudgetList.unitContractPrice}}</span>
             <span v-if='deptBudgetList.unitContractPrice!="null"'>{{deptBudgetList.unitContractPrice}}</span>
+            
           </ws-form-item>
           </ws-form-item>
           <ws-form-item
           <ws-form-item
             label="交货日期(止)"
             label="交货日期(止)"
@@ -216,7 +231,7 @@
           v-model="deptBudgetList.deliveryDateEnd"
           v-model="deptBudgetList.deliveryDateEnd"
           type="date"
           type="date"
           default-value="1980-01-01"
           default-value="1980-01-01"
-          placeholder="交货日期(止)"
+          placeholder="请选择交货日期(止)"
           format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
         />
         />
@@ -228,6 +243,7 @@
             <ws-input
             <ws-input
             v-model="deptBudgetList.totalContractPrice"
             v-model="deptBudgetList.totalContractPrice"
             maxlength="100"
             maxlength="100"
+            placeholder="请输入合同单价"
             size="small"
             size="small"
           />
           />
           </ws-form-item>
           </ws-form-item>
@@ -240,7 +256,7 @@
           v-model="deptBudgetList.deliveryDateEnd"
           v-model="deptBudgetList.deliveryDateEnd"
           type="date"
           type="date"
           default-value="1980-01-01"
           default-value="1980-01-01"
-          placeholder="签订日期"
+          placeholder="请选择合同签订日期"
           format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
         />
         />
@@ -267,6 +283,7 @@
           >
           >
           <ws-input
           <ws-input
               v-model="deptBudgetList.contractGoodsInfo.waterContent"
               v-model="deptBudgetList.contractGoodsInfo.waterContent"
+              placeholder="请输入水分占比"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -297,6 +314,7 @@
           >
           >
            <ws-input
            <ws-input
               v-model="deptBudgetList.contractGoodsInfo.impurity"
               v-model="deptBudgetList.contractGoodsInfo.impurity"
+              placeholder="请输入杂质占比(%)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -308,6 +326,7 @@
           >
           >
           <ws-input
           <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
+              placeholder="请输入容重"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -320,6 +339,7 @@
           >
           >
           <ws-input
           <ws-input
               v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
               v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
+              placeholder="请输入霉变粒占比(%)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -331,6 +351,7 @@
           >
           >
           <ws-input
           <ws-input
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
+              placeholder="请输入输入热损伤占比(%)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -343,6 +364,7 @@
           >
           >
           <ws-input
           <ws-input
               v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
               v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
+              placeholder="请输入不完整粒占比(%)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -359,6 +381,7 @@
           >
           >
           <ws-input
           <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
               v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+              placeholder="请输入合同收入(元)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -367,9 +390,11 @@
             label="已开发票(元)"
             label="已开发票(元)"
             span="1"
             span="1"
             prop="goodsName"
             prop="goodsName"
-          >
+          >
           <ws-input
           <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsName"
               v-model="deptBudgetList.contractProcessInfo.goodsName"
+              placeholder="请输入已开发票(元)"
+              
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -381,6 +406,7 @@
           >
           >
           <ws-input
           <ws-input
               v-model="deptBudgetList.contractProcessInfo.waterContent"
               v-model="deptBudgetList.contractProcessInfo.waterContent"
+              placeholder="请输入费用支出(元)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -391,6 +417,7 @@
             prop="impurity"
             prop="impurity"
           ><ws-input
           ><ws-input
               v-model="deptBudgetList.contractProcessInfo.impurity"
               v-model="deptBudgetList.contractProcessInfo.impurity"
+              placeholder="请输入未开发票(元)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -401,6 +428,7 @@
             prop="mildewGrain"
             prop="mildewGrain"
           ><ws-input
           ><ws-input
               v-model="deptBudgetList.contractProcessInfo.mildewGrain"
               v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+              placeholder="请输入已完成发货量(吨)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -681,6 +709,13 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+.el-form {
+  padding: 0 15%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid #cdd2dc;
+  border-bottom: 1px solid #cdd2dc;
+}
 .readonly {
 .readonly {
   position: relative;
   position: relative;
 }
 }
@@ -690,7 +725,7 @@ export default {
   position: absolute;
   position: absolute;
   right: 8px;
   right: 8px;
   z-index: 10;
   z-index: 10;
-  top: 26%;
+  top: 21%;
   font-size: 20px;
   font-size: 20px;
 }
 }
 .title {
 .title {
@@ -712,17 +747,17 @@ export default {
 .el-col {
 .el-col {
   background: #f6f7fc;
   background: #f6f7fc;
 }
 }
+/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 {
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 140px;
   width: 140px;
   text-align: center;
   text-align: center;
+  background: #f0f2f6;
+  // border: 1px solid #cdd2dc;
 }
 }
-.el-form {
-  padding: 0 20%;
-}
-.el-form-item {
-  width: 50%;
-}
-
 .button-container {
 .button-container {
   display: flex;
   display: flex;
   flex-wrap: nowrap;
   flex-wrap: nowrap;
@@ -773,20 +808,12 @@ export default {
 .collapse-bottom {
 .collapse-bottom {
   margin-bottom: 20px;
   margin-bottom: 20px;
 }
 }
-
-.input-main .textarea .el-textarea__inner {
-  width: 100%;
-  z-index: 1;
-}
-.collapse-bottom {
-  margin-bottom: 20px;
-}
 .input-main .textarea .el-textarea__inner {
 .input-main .textarea .el-textarea__inner {
   width: 100%;
   width: 100%;
   z-index: 1;
   z-index: 1;
 }
 }
 .bg-left {
 .bg-left {
-  padding-left: 10px;
+  padding-left: 30px;
 }
 }
 .bg-right {
 .bg-right {
   padding-right: 10px;
   padding-right: 10px;
@@ -795,13 +822,31 @@ export default {
 .bg-bottom {
 .bg-bottom {
   margin: 15px 0px;
   margin: 15px 0px;
 }
 }
-.remark h3 {
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+.wenzi h3 {
   display: inline-block;
   display: inline-block;
-  margin-right: 20px;
+  left: 10px;
 }
 }
-.remark p {
+.wenzi p {
   display: inline-block;
   display: inline-block;
 }
 }
+.center {
+  width: 900px;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
 /*.crt-main .textarea /deep/ .el-form-item__label {*/
 /*.crt-main .textarea /deep/ .el-form-item__label {*/
 /*  height: 82px;*/
 /*  height: 82px;*/
 /*}*/
 /*}*/
@@ -841,6 +886,7 @@ export default {
     }
     }
   }
   }
 }
 }
+
 // 控制select为只读的时候显示样式
 // 控制select为只读的时候显示样式
 /deep/.ws-class-table-col {
 /deep/.ws-class-table-col {
   height: auto;
   height: auto;
@@ -864,10 +910,13 @@ export default {
   }
   }
 }
 }
 .winseaview-view {
 .winseaview-view {
-  padding: 10px 0 20px;
+  padding: 0 0 20px;
 }
 }
 .container {
 .container {
   overflow: scroll;
   overflow: scroll;
   height: 93vh;
   height: 93vh;
 }
 }
+/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
+  width: 130px;
+}
 </style>
 </style>

+ 189 - 107
src/views/contractManagement/purchaseContractExamine.vue

@@ -4,9 +4,7 @@
   <div class="container">
   <div class="container">
     <el-row>
     <el-row>
       <el-col :span="12">
       <el-col :span="12">
-        <h2 class="bg-left">
-          查看合同详情<span>状态:{{ status }}</span>
-        </h2>
+        <h2 class="bg-left">查看合同详情</h2>
       </el-col>
       </el-col>
       <el-col :span="12" class="bg-right">
       <el-col :span="12" class="bg-right">
         <el-button
         <el-button
@@ -14,16 +12,27 @@
           type="primary"
           type="primary"
           size="small"
           size="small"
           @click="returnsales()"
           @click="returnsales()"
-          >返回</el-button
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
         >
         >
       </el-col>
       </el-col>
     </el-row>
     </el-row>
 
 
-    <ws-form
-      ref="deptBudgetList"
-      :rules="mainReportAdd"
-      :model="deptBudgetList"
-    >
+    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList"
+      ><div style="margin-top: 20px; font-size: 24px">
+        采购合同<span style="font-size: 16px"
+          >【编号:{{ deptBudgetList.contractNo }}】</span
+        ><span v-if="status == '待执行'" class="status-orange">{{
+          status
+        }}</span>
+        <span v-if="status == '执行中'" class="status-bule">{{ status }}</span>
+        <span v-if="status == '已完成'" class="status-green">{{ status }}</span>
+      </div>
       <div class="remark">
       <div class="remark">
         <h3>基本信息</h3>
         <h3>基本信息</h3>
       </div>
       </div>
@@ -87,83 +96,81 @@
           {{ deptBudgetList.signingDate }}
           {{ deptBudgetList.signingDate }}
         </ws-form-item>
         </ws-form-item>
       </ws-info-table>
       </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.remarks }}
-        <img :src="deptBudgetList.addressUrl" alt="" />
-      </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.remarks }}
+      <img :src="deptBudgetList.addressUrl" alt="" />
     </ws-form>
     </ws-form>
     <div style="text-align: right; padding: 10px">
     <div style="text-align: right; padding: 10px">
       <el-button
       <el-button
@@ -298,17 +305,78 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 140px;
-  text-align: center;
+.status-orange,
+.status-bule,
+.status-green {
+  border: 1px solid;
+  border-radius: 30px;
+  padding: 3px 10px;
+  font-size: 16px;
+}
+.status-orange {
+  border-color: #ff9f24;
+  color: #ff9f24;
+  background: #ffedd5;
+}
+.status-bule {
+  border-color: #5473e8;
+  color: #5473e8;
+  background: #f0f3fe;
+}
+.status-green {
+  border-color: #50cad4;
+  color: #50cad4;
+  background: #ecfeff;
 }
 }
 .el-form {
 .el-form {
-  padding: 0 20%;
+  padding: 0 15%;
 }
 }
-.el-form-item {
-  width: 50%;
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid #cdd2dc;
+  border-bottom: 1px solid #cdd2dc;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.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;
+}
+/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 {
 .button-container {
   display: flex;
   display: flex;
   flex-wrap: nowrap;
   flex-wrap: nowrap;
@@ -359,35 +427,45 @@ export default {
 .collapse-bottom {
 .collapse-bottom {
   margin-bottom: 20px;
   margin-bottom: 20px;
 }
 }
-
-.input-main .textarea .el-textarea__inner {
-  width: 100%;
-  z-index: 1;
-}
-.collapse-bottom {
-  margin-bottom: 20px;
-}
 .input-main .textarea .el-textarea__inner {
 .input-main .textarea .el-textarea__inner {
   width: 100%;
   width: 100%;
   z-index: 1;
   z-index: 1;
 }
 }
 .bg-left {
 .bg-left {
-  padding-left: 10px;
+  padding-left: 30px;
 }
 }
 .bg-right {
 .bg-right {
   padding-right: 10px;
   padding-right: 10px;
   text-align: right;
   text-align: right;
 }
 }
 .bg-bottom {
 .bg-bottom {
-  margin: 20px 0px;
+  margin: 15px 0px;
+}
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
 }
 }
-.remark h3 {
+.wenzi h3 {
   display: inline-block;
   display: inline-block;
-  margin-right: 20px;
+  left: 10px;
 }
 }
-.remark p {
+.wenzi p {
   display: inline-block;
   display: inline-block;
 }
 }
+.center {
+  width: 900px;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
 /*.crt-main .textarea /deep/ .el-form-item__label {*/
 /*.crt-main .textarea /deep/ .el-form-item__label {*/
 /*  height: 82px;*/
 /*  height: 82px;*/
 /*}*/
 /*}*/
@@ -427,6 +505,7 @@ export default {
     }
     }
   }
   }
 }
 }
+
 // 控制select为只读的时候显示样式
 // 控制select为只读的时候显示样式
 /deep/.ws-class-table-col {
 /deep/.ws-class-table-col {
   height: auto;
   height: auto;
@@ -450,10 +529,13 @@ export default {
   }
   }
 }
 }
 .winseaview-view {
 .winseaview-view {
-  padding: 10px 0 20px;
+  padding: 0 0 20px;
 }
 }
 .container {
 .container {
   overflow: scroll;
   overflow: scroll;
   height: 93vh;
   height: 93vh;
 }
 }
+/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
+  width: 130px;
+}
 </style>
 </style>

+ 43 - 15
src/views/contractManagement/salesContract.vue

@@ -14,8 +14,7 @@
           >添加</ws-button
           >添加</ws-button
         >
         >
         <ws-button
         <ws-button
-          :disable="checkBtn"
-          @click="enquiry(3)"
+          @click="exportlist()"
           v-hasPermission="
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
           "
@@ -201,7 +200,7 @@ import {
 import { downloadFile } from '@/utils/batchDown'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import {dayjs, EventBus } from 'base-core-lib'
 export default {
 export default {
   name: 'viewSpareMoney',
   name: 'viewSpareMoney',
   components: {
   components: {
@@ -230,8 +229,11 @@ export default {
       // 年
       // 年
       year: '',
       year: '',
       // 提交类型
       // 提交类型
-
-      contractType: 1,
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      
       currentPage: 1,
       currentPage: 1,
       pageSize: 10,
       pageSize: 10,
       searchType: 1,
       searchType: 1,
@@ -241,12 +243,6 @@ export default {
       appendixIdsAdd: '',
       appendixIdsAdd: '',
 
 
       contractType: 1,
       contractType: 1,
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchKeyWord: '',
-      startDate: null,
-      endDate: null,
       historyList: {},
       historyList: {},
       submitType: true,
       submitType: true,
       contractForm: {},
       contractForm: {},
@@ -255,6 +251,12 @@ export default {
       deptBudgetTotal: 0,
       deptBudgetTotal: 0,
       size: 10,
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
       compId: sessionStorage.getItem('ws-pf_compId'),
+      deptBudgetTotal:{},
+      handleSizeChange:{},
+      handleCurrentChange:{},
+      compId:{},
+      size:{},
+ 
       deptCircularPage: {},
       deptCircularPage: {},
       accessoryTFs: false,
       accessoryTFs: false,
       pickerBeginDateBefore: {
       pickerBeginDateBefore: {
@@ -296,6 +298,8 @@ export default {
     this.getList()
     this.getList()
     this.showType = this.isShow
     this.showType = this.isShow
   },
   },
+
+
   methods: {
   methods: {
     handleClose() {
     handleClose() {
       this.accessoryTFs = false
       this.accessoryTFs = false
@@ -371,10 +375,7 @@ export default {
           this.contractList = response
           this.contractList = response
         })
         })
     },
     },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-    },
+
 
 
     // this.deptBudgetList.
     // this.deptBudgetList.
     // this.formData.append('files', files)
     // this.formData.append('files', files)
@@ -392,6 +393,30 @@ export default {
     find() {
     find() {
       this.currentPage = 1
       this.currentPage = 1
       this.getList()
       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',
+      })
     },
     },
     editClick(row) {
     editClick(row) {
       var status = ''
       var status = ''
@@ -690,6 +715,9 @@ export default {
     cursor: text;
     cursor: text;
     padding: 0 !important;
     padding: 0 !important;
   }
   }
+  /deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label{
+  width: 130px;
+}
 }
 }
 /deep/.el-table .el-table__header .cell,
 /deep/.el-table .el-table__header .cell,
 /deep/.el-table .el-table__body .cell {
 /deep/.el-table .el-table__body .cell {

+ 490 - 49
src/views/contractManagement/salesContractAdd.vue

@@ -23,67 +23,72 @@
       </p>
       </p>
     </div>
     </div>
     <div class="center">
     <div class="center">
-      <ws-form
-        ref="deptBudgetList"
-        :rules="ruleDeptBudget"
-        :model="deptBudgetList"
-      >
+      <ws-form ref="deptBudgetList" :model="deptBudgetList">
         <!--基本信息-->
         <!--基本信息-->
 
 
         <ws-info-table>
         <ws-info-table>
           <!--合同编号-->
           <!--合同编号-->
-          <ws-form-item label="合同编号" span="1" prop="contractNo">
+          <ws-form-item
+            label="合同编号"
+            span="1"
+            prop="contractNo"
+            class="readonly"
+          >
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractNo"
               v-model="deptBudgetList.contractNo"
-              maxlength="100"
+              placeholder="请输入合同编号"
+              maxlength="20"
               size="small"
               size="small"
+              :rules="ruleDeptBudget"
             />
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
           </ws-form-item>
 
 
           <!--运输方式-->
           <!--运输方式-->
-          <ws-form-item label="运输方式" span="1" prop="contractNo">
+          <ws-form-item label="运输方式" span="1" prop="shippingType">
             <ws-input
             <ws-input
               v-model="deptBudgetList.shippingType"
               v-model="deptBudgetList.shippingType"
-              maxlength="100"
+              placeholder="请输入运输方式"
+              maxlength="20"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--买方-->
           <!--买方-->
-          <ws-form-item label="买方" span="1" prop="contractNo">
+          <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
             <ws-input
             <ws-input
               v-model="deptBudgetList.buyer"
               v-model="deptBudgetList.buyer"
+              placeholder="请输入买方名称"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
           </ws-form-item>
 
 
           <!--结算方式-->
           <!--结算方式-->
-          <ws-form-item label="结算方式" span="1" prop="contractNo">
+          <ws-form-item label="结算方式" span="1" prop="settlementMethod">
             <ws-input
             <ws-input
               v-model="deptBudgetList.settlementMethod"
               v-model="deptBudgetList.settlementMethod"
-              maxlength="100"
+              placeholder="请输入结算方式"
+              maxlength="120"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--卖方-->
           <!--卖方-->
-          <ws-form-item label="卖方" span="1" prop="contractNo">
+          <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
             <ws-input
             <ws-input
               v-model="deptBudgetList.seller"
               v-model="deptBudgetList.seller"
+              placeholder="请输入卖方名称"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
           </ws-form-item>
 
 
           <!--货源地-->
           <!--货源地-->
-          <ws-form-item label="货源地" span="1" prop="contractNo">
+          <ws-form-item label="货源地" span="1" prop="sourceGoods">
             <ws-input
             <ws-input
               v-model="deptBudgetList.sourceGoods"
               v-model="deptBudgetList.sourceGoods"
-              maxlength="100"
+              placeholder="请输入货源地"
+              maxlength="20"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
@@ -91,25 +96,27 @@
           <!--买方电话-->
           <!--买方电话-->
           <ws-form-item label="买方电话" span="1" prop="contractNo">
           <ws-form-item label="买方电话" span="1" prop="contractNo">
             <ws-input
             <ws-input
-              v-model="deptBudgetList.buyerPhone"
+              v-model.number="deptBudgetList.buyerPhone"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--交货地-->
           <!--交货地-->
-          <ws-form-item label="交货地" span="1" prop="contractNo">
+          <ws-form-item label="交货地" span="1" prop="placeDelivery">
             <ws-input
             <ws-input
               v-model="deptBudgetList.placeDelivery"
               v-model="deptBudgetList.placeDelivery"
-              maxlength="100"
+              placeholder="请输入交货地"
+              maxlength="20"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--卖方电话-->
           <!--卖方电话-->
-          <ws-form-item label="卖方电话" span="1" prop="contractNo">
+          <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
             <ws-input
             <ws-input
               v-model="deptBudgetList.sellerPhone"
               v-model="deptBudgetList.sellerPhone"
+              placeholder="请输入卖方电话"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -133,9 +140,10 @@
           </ws-form-item>
           </ws-form-item>
 
 
           <!--重量(吨)-->
           <!--重量(吨)-->
-          <ws-form-item label="重量(吨)" span="1" prop="contractNo">
+          <ws-form-item label="重量(吨)" span="1" prop="weight">
             <ws-input
             <ws-input
               v-model="deptBudgetList.weight"
               v-model="deptBudgetList.weight"
+              placeholder="请输入重量(吨)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -209,9 +217,10 @@
           </ws-form-item>
           </ws-form-item>
 
 
           <!--溢短装(%)-->
           <!--溢短装(%)-->
-          <ws-form-item label="溢短装(%)" span="1" prop="contractNo">
+          <ws-form-item label="溢短装(%)" span="1" prop="overShort">
             <ws-input
             <ws-input
               v-model="deptBudgetList.overShort"
               v-model="deptBudgetList.overShort"
+              placeholder="请输入溢短装比例(%)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -234,13 +243,18 @@
           </ws-form-item>
           </ws-form-item>
 
 
           <!--合同单价(元/吨)-->
           <!--合同单价(元/吨)-->
-          <ws-form-item label="合同单价(元/吨)" span="1" prop="contractNo">
+          <ws-form-item
+            class="readonly"
+            label="合同单价(元/吨)"
+            span="1"
+            prop="unitContractPrice"
+          >
             <ws-input
             <ws-input
               v-model="deptBudgetList.unitContractPrice"
               v-model="deptBudgetList.unitContractPrice"
+              placeholder="请输入合同单价"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
-            <span class="unchangeable">*</span>
           </ws-form-item>
           </ws-form-item>
 
 
           <!--交货日期(止)-->
           <!--交货日期(止)-->
@@ -257,9 +271,10 @@
           </ws-form-item>
           </ws-form-item>
 
 
           <!--合同总价-->
           <!--合同总价-->
-          <ws-form-item label="合同总价" span="1" prop="contractNo">
+          <ws-form-item label="合同总价" span="1" prop="totalContractPrice">
             <ws-input
             <ws-input
               v-model="deptBudgetList.totalContractPrice"
               v-model="deptBudgetList.totalContractPrice"
+              placeholder="请输入合同总价"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -293,7 +308,7 @@
 
 
         <ws-info-table>
         <ws-info-table>
           <!--货名-->
           <!--货名-->
-          <ws-form-item label="货名" span="1" prop="goodsName">
+          <ws-form-item label="货名" span="1" prop="goodsName" class="readonly">
             <ws-select
             <ws-select
               v-model="deptBudgetList.contractGoodsInfo.goodsName"
               v-model="deptBudgetList.contractGoodsInfo.goodsName"
               placeholder=""
               placeholder=""
@@ -307,20 +322,20 @@
                 :value="item.constValue"
                 :value="item.constValue"
               />
               />
             </ws-select>
             </ws-select>
-            <span class="unchangeable">*</span>
           </ws-form-item>
           </ws-form-item>
 
 
           <!--水分(%)<=-->
           <!--水分(%)<=-->
-          <ws-form-item label="水分(%)" span="1" prop="contractNo">
+          <ws-form-item label="水分(%)" span="1" prop="waterContent">
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.waterContent"
               v-model="deptBudgetList.contractGoodsInfo.waterContent"
+              placeholder="请输入水分占比"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--品级-->
           <!--品级-->
-          <ws-form-item label="品级" span="1" prop="grade">
+          <ws-form-item label="品级" span="1" prop="grade" class="readonly">
             <ws-select
             <ws-select
               v-model="deptBudgetList.contractGoodsInfo.grade"
               v-model="deptBudgetList.contractGoodsInfo.grade"
               placeholder=""
               placeholder=""
@@ -337,45 +352,50 @@
           </ws-form-item>
           </ws-form-item>
 
 
           <!--杂质(%)<=-->
           <!--杂质(%)<=-->
-          <ws-form-item label="杂质(%)" span="1" prop="contractNo">
+          <ws-form-item label="杂质(%)" span="1" prop="impurity">
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.impurity"
               v-model="deptBudgetList.contractGoodsInfo.impurity"
-              maxlength="100"
+              placeholder="请输入杂质占比(%)"
+              maxlength="40"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--容量(克/升)>=-->
           <!--容量(克/升)>=-->
-          <ws-form-item label="容量(克/升)" span="1" prop="contractNo">
+          <ws-form-item label="容量(克/升)" span="1" prop="bulkDensity">
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
-              maxlength="100"
+              placeholder="请输入容重"
+              maxlength="40"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--霉变粒(%)<=-->
           <!--霉变粒(%)<=-->
-          <ws-form-item label="霉变粒(%)" span="1" prop="contractNo">
+          <ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
               v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
-              maxlength="100"
+              placeholder="请输入霉变粒占比(%)"
+              maxlength="40"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--热损伤(%)<=-->
           <!--热损伤(%)<=-->
-          <ws-form-item label="热损伤(%)" span="1" prop="contractNo">
+          <ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
-              maxlength="100"
+              placeholder="请输入输入热损伤占比(%)"
+              maxlength="40"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
           <!--不完整粒(%)<=-->
           <!--不完整粒(%)<=-->
-          <ws-form-item label="不完整粒(%)" span="1" prop="contractNo">
+          <ws-form-item label="不完整粒(%)" span="1" prop="imperfectGrain">
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
               v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-              maxlength="100"
+              placeholder="请输入不完整粒占比(%)"
+              maxlength="40"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
@@ -396,54 +416,64 @@
 
 
         <ws-info-table>
         <ws-info-table>
           <!--合同收入(元)-->
           <!--合同收入(元)-->
-          <ws-form-item label="合同收入(元)" span="1" prop="contractNo">
+          <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
               v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+              placeholder="请输入合同收入(元)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--已开发票(元)-->
           <!--已开发票(元)-->
-          <ws-form-item label="已开发票(元)" span="1" prop="contractNo">
+          <ws-form-item label="已开发票(元)" span="1" prop="goodsName">
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsName"
               v-model="deptBudgetList.contractProcessInfo.goodsName"
+              placeholder="请输入已开发票(元)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--费用支出(元)-->
           <!--费用支出(元)-->
-          <ws-form-item label="费用支出(元)" span="1" prop="contractNo">
+          <ws-form-item label="费用支出(元)" span="1" prop="waterContent">
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.waterContent"
               v-model="deptBudgetList.contractProcessInfo.waterContent"
+              placeholder="请输入费用支出(元)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--未开发票(元)-->
           <!--未开发票(元)-->
-          <ws-form-item label="未开发票(元)" span="1" prop="contractNo">
+          <ws-form-item label="未开发票(元)" span="1" prop="impurity">
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.impurity"
               v-model="deptBudgetList.contractProcessInfo.impurity"
+              placeholder="请输入未开发票(元)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--未回款(元)-->
           <!--未回款(元)-->
-          <ws-form-item label="未回款(元)" span="1" prop="contractNo">
+          <ws-form-item label="未回款(元)" span="1" prop="mildewGrain">
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.mildewGrain"
               v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+              placeholder="请输入未回款(元)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
           </ws-form-item>
           </ws-form-item>
 
 
           <!--已完成发货量(吨)-->
           <!--已完成发货量(吨)-->
-          <ws-form-item label="已完成发货量(吨)" span="1" prop="contractNo">
+          <ws-form-item
+            label="已完成发运量(吨)"
+            span="1"
+            prop="imperfectGrain"
+          >
             <ws-input
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
               v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
+              placeholder="请输入已完成发运量(吨)"
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -500,7 +530,11 @@
       </ws-form>
       </ws-form>
     </div>
     </div>
     <div style="text-align: right; padding: 10px" class="center">
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
         >提交</el-button
         >提交</el-button
       >
       >
     </div>
     </div>
@@ -583,7 +617,17 @@ export default {
       // selectCrtDuty: {},
       // selectCrtDuty: {},
       // dutyList: {},
       // dutyList: {},
       // sexList: {},
       // sexList: {},
-      ruleDeptBudget: {},
+      ruleDeptBudget: {
+        contractNo: [
+          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          {
+            min: 6,
+            max: 20,
+            message: '长度在 6 到 20 个字符',
+            trigger: 'blur',
+          },
+        ],
+      },
       selectIntendedShip: {},
       selectIntendedShip: {},
       interviewTypeList: {},
       interviewTypeList: {},
     }
     }
@@ -592,6 +636,12 @@ export default {
     //cg.viewBudget
     //cg.viewBudget
     //cg.viewSpareMoney
     //cg.viewSpareMoney
     // this.getVesselData();
     // this.getVesselData();
+    this.deptBudgetList.packingMethod = '袋装'
+    this.deptBudgetList.packingMethodKey = 2
+    this.deptBudgetList.contractGoodsInfo.goodsName = '玉米'
+    this.deptBudgetList.contractGoodsInfo.goodsNameKey = 1
+    this.deptBudgetList.contractProcessInfo.grade = '未回收'
+    this.deptBudgetList.contractProcessInfo.gradeKey = 1
     this.loaddata()
     this.loaddata()
     this.showType = this.isShow
     this.showType = this.isShow
   },
   },
@@ -669,7 +719,377 @@ export default {
           }
           }
         })
         })
     },
     },
+
     submit() {
     submit() {
+      console.log(
+        new Date(this.deptBudgetList.deliveryDateStart).getTime(),
+        new Date(this.deptBudgetList.deliveryDateEnd).getTime()
+      )
+      if (!this.deptBudgetList.contractNo) {
+        this.$message({
+          message: '请输入合同编号',
+          type: 'warning',
+        })
+        return
+      }
+      console.log(this.deptBudgetList.contractNo.length)
+      if (
+        this.deptBudgetList.contractNo.length < 6 ||
+        this.deptBudgetList.contractNo.length > 20
+      ) {
+        this.$message({
+          message: '合同编号长度不符合要求,请输入6到20个字符之内!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.shippingType) {
+        this.$message({
+          message: '请输入运输方式!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.shippingType.length < 1 ||
+        this.deptBudgetList.shippingType.length > 20
+      ) {
+        this.$message({
+          message: '运输方式长度不符合要求,请输入1到20个字符之内!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.buyer) {
+        this.$message({
+          message: '请输入买方名称!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.buyer.length < 4 ||
+        this.deptBudgetList.buyer.length > 30
+      ) {
+        this.$message({
+          message: '买方名称长度不符合要求,请输入4到30个字符之内!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.seller) {
+        this.$message({
+          message: '请输入卖方名称!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.seller.length < 4 ||
+        this.deptBudgetList.seller.length > 30
+      ) {
+        this.$message({
+          message: '卖方名称长度不符合要求,请输入4到30个字符之内!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.buyerPhone) {
+        this.$message({
+          message: '请输入买方电话!',
+          type: 'warning',
+        })
+        return
+      }
+      if (isNaN(this.deptBudgetList.buyerPhone)) {
+        this.$message({
+          message: '输入买方电话有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.buyerPhone.length < 7 ||
+        this.deptBudgetList.buyerPhone.length > 20
+      ) {
+        this.$message({
+          message: '买方电话长度不符合要求,请输入7到20个字符之内!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.sellerPhone) {
+        this.$message({
+          message: '请输入卖方电话!',
+          type: 'warning',
+        })
+        return
+      }
+      if (isNaN(this.deptBudgetList.sellerPhone)) {
+        this.$message({
+          message: '输入卖方电话有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.buyerPhone.length < 7 ||
+        this.deptBudgetList.buyerPhone.length > 20
+      ) {
+        this.$message({
+          message: '卖方电话长度不符合要求,请输入7到20个字符之内!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.settlementMethod) {
+        this.$message({
+          message: '请输入结算方式!',
+          type: 'warning',
+        })
+        return
+      }
+
+      if (!this.deptBudgetList.sourceGoods) {
+        this.$message({
+          message: '请输入货源地!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.placeDelivery) {
+        this.$message({
+          message: '请输入交货地!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.weight) {
+        this.$message({
+          message: '请输入重量!',
+          type: 'warning',
+        })
+        return
+      }
+
+      if (
+        isNaN(this.deptBudgetList.weight) ||
+        /\.\d{3}$/.test(this.deptBudgetList.weight) == false ||
+        this.deptBudgetList.weight < 0 ||
+        this.deptBudgetList.weight > 200000
+      ) {
+        this.$message({
+          message: '输入重量有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        !this.deptBudgetList.overShort &&
+        isNaN(this.deptBudgetList.overShort)
+      ) {
+        this.$message({
+          message: '溢短装输入有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        !this.deptBudgetList.unitContractPrice &&
+        isNaN(this.deptBudgetList.unitContractPrice)
+      ) {
+        this.$message({
+          message: '合同单价输入有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        !this.deptBudgetList.totalContractPrice &&
+        isNaN(this.deptBudgetList.totalContractPrice)
+      ) {
+        this.$message({
+          message: '合同总价输入有误!',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.deliveryDateStart) {
+        this.$message({
+          message: '请选择交货日期(起)',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.deliveryDateEnd) {
+        this.$message({
+          message: '请选择交货日期(止)',
+          type: 'warning',
+        })
+        return
+      }
+      //时间
+      if (
+        new Date(this.deptBudgetList.deliveryDateStart).getTime() >
+        new Date(this.deptBudgetList.deliveryDateEnd).getTime()
+      ) {
+        this.$message({
+          message: '交货日期(止)选择错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.signingDate) {
+        this.$message({
+          message: '请选择签订日期',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.contractGoodsInfo.goodsName) {
+        this.$message({
+          message: '请选择货名',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
+        this.$message({
+          message: '请选择水分',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.contractGoodsInfo.grade) {
+        this.$message({
+          message: '请选择品级',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        !this.deptBudgetList.contractGoodsInfo.impurity ||
+        /\.\d{2}$/.test(this.deptBudgetList.contractGoodsInfo.impurity)
+      ) {
+        this.$message({
+          message: '杂质输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        !this.deptBudgetList.contractGoodsInfo.bulkDensity ||
+        /\.\d{2}$/.test(this.deptBudgetList.contractGoodsInfo.bulkDensity)
+      ) {
+        this.$message({
+          message: '容重输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
+        /\.\d{2}$/.test(this.deptBudgetList.contractGoodsInfo.mildewGrain)
+      ) {
+        this.$message({
+          message: '霉变粒输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
+        /\.\d{2}$/.test(this.deptBudgetList.contractGoodsInfo.jiaorenli)
+      ) {
+        this.$message({
+          message: '热损伤输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
+        /\.\d{2}$/.test(this.deptBudgetList.contractGoodsInfo.imperfectGrain)
+      ) {
+        this.$message({
+          message: '不完整粒输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (!this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) |
+          (this.deptBudgetList.contractProcessInfo.goodsNameKey < 0) ||
+        /\.\d{2}$/.test(this.deptBudgetList.contractProcessInfo.goodsNameKey) ==
+          false
+      ) {
+        this.$message({
+          message: '合同收入金额输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (!this.deptBudgetList.contractProcessInfo.waterContent > 10000000) |
+          (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||
+        /\.\d{2}$/.test(this.deptBudgetList.contractProcessInfo.waterContent) ==
+          false
+      ) {
+        this.$message({
+          message: '费用金额输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (!this.deptBudgetList.contractProcessInfo.mildewGrain > 1000000000) |
+          (this.deptBudgetList.contractProcessInfo.mildewGrain < 0) ||
+        /\.\d{2}$/.test(this.deptBudgetList.contractProcessInfo.mildewGrain) ==
+          false
+      ) {
+        this.$message({
+          message: '未回款金额输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (!this.deptBudgetList.contractProcessInfo.goodsName > 1000000000) |
+          (this.deptBudgetList.contractProcessInfo.goodsName < 0) ||
+        /\.\d{2}$/.test(this.deptBudgetList.contractProcessInfo.goodsName) ==
+          false
+      ) {
+        this.$message({
+          message: '已开发票金额输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (!this.deptBudgetList.contractProcessInfo.impurity > 1000000000) |
+          (this.deptBudgetList.contractProcessInfo.impurity < 0) ||
+        /\.\d{2}$/.test(this.deptBudgetList.contractProcessInfo.impurity) ==
+          false
+      ) {
+        this.$message({
+          message: '未开发票金额输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (!this.deptBudgetList.contractProcessInfo.imperfectGrain > 200000) |
+          (this.deptBudgetList.contractProcessInfo.imperfectGrain < 0) ||
+        /\.\d{3}$/.test(
+          this.deptBudgetList.contractProcessInfo.imperfectGrain
+        ) == false
+      ) {
+        this.$message({
+          message: '已完成发运量输入错误',
+          type: 'warning',
+        })
+        return
+      }
       this.$refs.deptBudgetList.validate((valid) => {
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
         if (valid) {
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.compId = this.compId
@@ -686,6 +1106,9 @@ export default {
         }
         }
       })
       })
     },
     },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
     saveClick(item, index) {
     saveClick(item, index) {
       console.log(item)
       console.log(item)
 
 
@@ -808,6 +1231,21 @@ export default {
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+}
+.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__label {
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 140px;
   width: 140px;
   text-align: center;
   text-align: center;
@@ -970,4 +1408,7 @@ export default {
   overflow: scroll;
   overflow: scroll;
   height: 93vh;
   height: 93vh;
 }
 }
+/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
+  width: 130px;
+}
 </style>
 </style>

+ 83 - 14
src/views/contractManagement/salesContractEdit.vue

@@ -32,18 +32,19 @@
         <ws-info-table>
         <ws-info-table>
           <!--合同编号-->
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <!-- <ws-input
-              v-model="deptBudgetList.contractNo"
-              maxlength="100"
-              size="small"
-            /> -->
-            {{ deptBudgetList.contractNo }}
+
+            
+           <div class="unchanged">
+           {{deptBudgetList.contractNo}} 
+           </div>
+               <span class='unchangeable'>*</span>
           </ws-form-item>
           </ws-form-item>
 
 
           <!--运输方式-->
           <!--运输方式-->
           <ws-form-item label="运输方式" span="1" prop="contractNo">
           <ws-form-item label="运输方式" span="1" prop="contractNo">
             <ws-input
             <ws-input
               v-model="deptBudgetList.shippingType"
               v-model="deptBudgetList.shippingType"
+              placeholder='请输入运输方式'
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -51,13 +52,17 @@
 
 
           <!--买方-->
           <!--买方-->
           <ws-form-item label="买方" span="1" prop="contractNo">
           <ws-form-item label="买方" span="1" prop="contractNo">
-            {{ deptBudgetList.buyer }}
+            <div class="unchanged">
+            {{deptBudgetList.buyer}}
+            </div>
+             <span class="unchangeable">*</span>
           </ws-form-item>
           </ws-form-item>
 
 
           <!--结算方式-->
           <!--结算方式-->
           <ws-form-item label="结算方式" span="1" prop="contractNo">
           <ws-form-item label="结算方式" span="1" prop="contractNo">
             <ws-input
             <ws-input
               v-model="deptBudgetList.settlementMethod"
               v-model="deptBudgetList.settlementMethod"
+               placeholder='请输入结算方式'
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -65,13 +70,19 @@
 
 
           <!--卖方-->
           <!--卖方-->
           <ws-form-item label="卖方" span="1" prop="contractNo">
           <ws-form-item label="卖方" span="1" prop="contractNo">
-            {{ deptBudgetList.seller }}
+
+           <div  class="unchanged">
+            {{deptBudgetList.seller}}
+            </div>
+           <span class="unchangeable">*</span>
+
           </ws-form-item>
           </ws-form-item>
 
 
           <!--货源地-->
           <!--货源地-->
           <ws-form-item label="货源地" span="1" prop="contractNo">
           <ws-form-item label="货源地" span="1" prop="contractNo">
             <ws-input
             <ws-input
               v-model="deptBudgetList.sourceGoods"
               v-model="deptBudgetList.sourceGoods"
+               placeholder='请输入货源地'
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -80,6 +91,7 @@
           <ws-form-item label="买方电话" span="1" prop="contractNo">
           <ws-form-item label="买方电话" span="1" prop="contractNo">
             <ws-input
             <ws-input
               v-model="deptBudgetList.buyerPhone"
               v-model="deptBudgetList.buyerPhone"
+               placeholder='请输入买方电话'
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -89,6 +101,7 @@
           <ws-form-item label="交货地" span="1" prop="contractNo">
           <ws-form-item label="交货地" span="1" prop="contractNo">
             <ws-input
             <ws-input
               v-model="deptBudgetList.placeDelivery"
               v-model="deptBudgetList.placeDelivery"
+               placeholder='请输入交货地'
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -98,6 +111,7 @@
           <ws-form-item label="卖方电话" span="1" prop="contractNo">
           <ws-form-item label="卖方电话" span="1" prop="contractNo">
             <ws-input
             <ws-input
               v-model="deptBudgetList.sellerPhone"
               v-model="deptBudgetList.sellerPhone"
+               placeholder='请输入卖房电话'
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -123,6 +137,7 @@
           <ws-form-item label="重量(吨)" span="1" prop="contractNo">
           <ws-form-item label="重量(吨)" span="1" prop="contractNo">
             <ws-input
             <ws-input
               v-model="deptBudgetList.weight"
               v-model="deptBudgetList.weight"
+               placeholder='请输入重量(吨)'
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -199,6 +214,7 @@
           <ws-form-item label="溢短装(%)" span="1" prop="contractNo">
           <ws-form-item label="溢短装(%)" span="1" prop="contractNo">
             <ws-input
             <ws-input
               v-model="deptBudgetList.overShort"
               v-model="deptBudgetList.overShort"
+               placeholder='请输入溢短装(%)'
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -222,12 +238,11 @@
 
 
           <!--合同单价(元/吨)-->
           <!--合同单价(元/吨)-->
           <ws-form-item label="合同单价(元/吨)" span="1" prop="contractNo">
           <ws-form-item label="合同单价(元/吨)" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.unitContractPrice"
-              maxlength="100"
-              size="small"
-            />
+          <div class="unchanged">
+            {{deptBudgetList.unitContractPrice}}
+            </div>
             <span class="unchangeable">*</span>
             <span class="unchangeable">*</span>
+
           </ws-form-item>
           </ws-form-item>
 
 
           <!--交货日期(止)-->
           <!--交货日期(止)-->
@@ -247,6 +262,7 @@
           <ws-form-item label="合同总价" span="1" prop="contractNo">
           <ws-form-item label="合同总价" span="1" prop="contractNo">
             <ws-input
             <ws-input
               v-model="deptBudgetList.totalContractPrice"
               v-model="deptBudgetList.totalContractPrice"
+                placeholder='请输入合同总价'
               maxlength="100"
               maxlength="100"
               size="small"
               size="small"
             />
             />
@@ -292,13 +308,17 @@
                   :value="item.constValue"
                   :value="item.constValue"
                 />
                 />
               </ws-select> -->
               </ws-select> -->
-              {{ deptBudgetList.contractGoodsInfo.goodsName }}
+               <div  class="unchanged">
+              {{deptBudgetList.contractGoodsInfo.goodsName}}
+              </div>
+              <span class='unchangeable'>*</span>
             </ws-form-item>
             </ws-form-item>
 
 
             <!--水分(%)<=-->
             <!--水分(%)<=-->
             <ws-form-item label="水分(%)" span="1" prop="contractNo">
             <ws-form-item label="水分(%)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.waterContent"
                 v-model="deptBudgetList.contractGoodsInfo.waterContent"
+                 placeholder='请输入水分(%)'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -325,6 +345,7 @@
             <ws-form-item label="杂质(%)" span="1" prop="contractNo">
             <ws-form-item label="杂质(%)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.impurity"
                 v-model="deptBudgetList.contractGoodsInfo.impurity"
+                 placeholder='请输入杂质(%)'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -334,6 +355,7 @@
             <ws-form-item label="容量(克/升)" span="1" prop="contractNo">
             <ws-form-item label="容量(克/升)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
                 v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
+                   placeholder='请输入容量(克/升)'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -343,6 +365,7 @@
             <ws-form-item label="霉变粒(%)" span="1" prop="contractNo">
             <ws-form-item label="霉变粒(%)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
                 v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
+                 placeholder='请输入霉变粒(%)'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -352,6 +375,7 @@
             <ws-form-item label="热损伤(%)" span="1" prop="contractNo">
             <ws-form-item label="热损伤(%)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
                 v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
+                  placeholder='请输入热损伤(%)'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -360,6 +384,7 @@
             <ws-form-item label="不完整粒(%)" span="1" prop="contractNo">
             <ws-form-item label="不完整粒(%)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
                 v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
+                 placeholder='请输入不完整粒(%)'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -383,6 +408,7 @@
             <ws-form-item label="合同收入(元)" span="1" prop="contractNo">
             <ws-form-item label="合同收入(元)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
                 v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+                  placeholder='请输入合同收入(元)'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -392,6 +418,7 @@
             <ws-form-item label="已开发票(元)" span="1" prop="contractNo">
             <ws-form-item label="已开发票(元)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.goodsName"
                 v-model="deptBudgetList.contractProcessInfo.goodsName"
+                   placeholder='请输入已开发票(元))'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -401,6 +428,7 @@
             <ws-form-item label="费用支出(元)" span="1" prop="contractNo">
             <ws-form-item label="费用支出(元)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.waterContent"
                 v-model="deptBudgetList.contractProcessInfo.waterContent"
+                placeholder='请输入费用支出(元)'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -410,6 +438,7 @@
             <ws-form-item label="未开发票(元)" span="1" prop="contractNo">
             <ws-form-item label="未开发票(元)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.impurity"
                 v-model="deptBudgetList.contractProcessInfo.impurity"
+                   placeholder='请输入未开发票(元)'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -418,6 +447,7 @@
             <ws-form-item label="未回款(元)" span="1" prop="contractNo">
             <ws-form-item label="未回款(元)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.mildewGrain"
                 v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+                 placeholder='请输入未回款(元)'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -427,6 +457,7 @@
             <ws-form-item label="已完成发货量(吨)" span="1" prop="contractNo">
             <ws-form-item label="已完成发货量(吨)" span="1" prop="contractNo">
               <ws-input
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
                 v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
+                 placeholder='请输入已完成发货量(吨)'
                 maxlength="100"
                 maxlength="100"
                 size="small"
                 size="small"
               />
               />
@@ -899,4 +930,42 @@ export default {
   overflow: scroll;
   overflow: scroll;
   height: 93vh;
   height: 93vh;
 }
 }
+
+//*号
+.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{
+  width: 200px;
+}
+.unchanged{
+  position: absolute;
+  left: 37px;
+  width: 102px;
+height: 14px;
+font-size: 14px;
+font-family: PingFangSC-Regular, PingFang SC;
+font-weight: 400;
+color: #AFB5CB;
+line-height: 14px;
+
+}
 </style>
 </style>

+ 194 - 70
src/views/contractManagement/salesContractExamine.vue

@@ -31,62 +31,102 @@
       </div>
       </div>
       <ws-info-table>
       <ws-info-table>
         <ws-form-item label="合同编号" span="1" prop="contractNo">
         <ws-form-item label="合同编号" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
+          <div class="unchanged">
+            {{ deptBudgetList.contractNo }}
+          </div>
+          <span class="unchangeable">*</span>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="运输方式" span="1" prop="shippingType">
         <ws-form-item label="运输方式" span="1" prop="shippingType">
-          {{ deptBudgetList.shippingType }}
+          <div class="unchanged">
+            {{ deptBudgetList.shippingType }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="买方" span="1" prop="buyer">
         <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 }}
+          <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>
         <ws-form-item label="交货地" span="1" prop="placeDelivery">
         <ws-form-item label="交货地" span="1" prop="placeDelivery">
-          {{ deptBudgetList.placeDelivery }}
+          <div class="unchanged">
+            {{ deptBudgetList.placeDelivery }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
         <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
-          {{ deptBudgetList.sellerPhone }}
+          <div class="unchanged">
+            {{ deptBudgetList.sellerPhone }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="包装方式" span="1" prop="packingMethod">
         <ws-form-item label="包装方式" span="1" prop="packingMethod">
-          {{ deptBudgetList.packingMethod }}
+          <div class="unchanged">
+            {{ deptBudgetList.packingMethod }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="重量(吨)" span="1" prop="weight">
         <ws-form-item label="重量(吨)" span="1" prop="weight">
-          {{ deptBudgetList.weight }}
+          <div class="unchanged">
+            {{ deptBudgetList.weight }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
         <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-          {{ deptBudgetList.acceptanceMethod }}
+          <div class="unchanged">
+            {{ deptBudgetList.acceptanceMethod }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="溢短装(%)" span="1" prop="overShort">
         <ws-form-item label="溢短装(%)" span="1" prop="overShort">
-          {{ deptBudgetList.overShort }}
+          <div class="unchanged">
+            {{ deptBudgetList.overShort }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="交货日期(起)" span="1" prop="deliveryDateStart">
         <ws-form-item label="交货日期(起)" span="1" prop="deliveryDateStart">
-          {{ deptBudgetList.deliveryDateStart }}
+          <div class="unchanged">
+            {{ deptBudgetList.deliveryDateStart }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item
         <ws-form-item
           label="合同单价(元/吨)"
           label="合同单价(元/吨)"
           span="1"
           span="1"
           prop="unitContractPrice"
           prop="unitContractPrice"
         >
         >
-          {{ deptBudgetList.unitContractPrice }}
+          <div class="unchanged">
+            {{ deptBudgetList.unitContractPrice }}
+          </div>
+          <span class="unchangeable">*</span>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="交货日期(止)" span="1" prop="deliveryDateEnd">
         <ws-form-item label="交货日期(止)" span="1" prop="deliveryDateEnd">
-          {{ deptBudgetList.deliveryDateEnd }}
+          <div class="unchanged">
+            {{ deptBudgetList.deliveryDateEnd }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="合同总价(元)" span="1" prop="totalContractPrice">
         <ws-form-item label="合同总价(元)" span="1" prop="totalContractPrice">
-          {{ deptBudgetList.totalContractPrice }}
+          <div class="unchanged">
+            {{ deptBudgetList.totalContractPrice }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="签订日期" span="1" prop="signingDate">
         <ws-form-item label="签订日期" span="1" prop="signingDate">
-          {{ deptBudgetList.signingDate }}
+          <div class="unchanged">
+            {{ deptBudgetList.signingDate }}
+          </div>
         </ws-form-item>
         </ws-form-item>
       </ws-info-table>
       </ws-info-table>
 
 
@@ -98,19 +138,31 @@
       </div>
       </div>
       <ws-info-table>
       <ws-info-table>
         <ws-form-item label="货名" span="1" prop="waterContent">
         <ws-form-item label="货名" span="1" prop="waterContent">
-          {{ deptBudgetList.contractGoodsInfo.goodsName }}
+
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.goodsName }}
+          </div>
+          <span class="unchangeable">*</span>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="水分(%)<=" span="1" prop="intendedShipId">
         <ws-form-item label="水分(%)<=" span="1" prop="intendedShipId">
-          {{ deptBudgetList.contractGoodsInfo.waterContent }}
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.waterContent }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="品级" span="1" prop="grade">
         <ws-form-item label="品级" span="1" prop="grade">
-          {{ deptBudgetList.contractGoodsInfo.grade }}
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.grade }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="杂质(%)<=" span="1" prop="impurity">
         <ws-form-item label="杂质(%)<=" span="1" prop="impurity">
-          {{ deptBudgetList.contractGoodsInfo.impurity }}
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.impurity }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="容重(克/升)<=" span="1" prop="bulkDensity">
         <ws-form-item label="容重(克/升)<=" span="1" prop="bulkDensity">
-          {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item
         <ws-form-item
           label="霉变粒(%)<="
           label="霉变粒(%)<="
@@ -118,10 +170,16 @@
           prop="mildewGrain"
           prop="mildewGrain"
           class="result"
           class="result"
         >
         >
-          {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
+
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
         <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
-          {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
+          </div>
+
         </ws-form-item>
         </ws-form-item>
         <ws-form-item
         <ws-form-item
           label="不完善粒(%)<="
           label="不完善粒(%)<="
@@ -129,7 +187,11 @@
           prop="imperfectGrain"
           prop="imperfectGrain"
           class="result"
           class="result"
         >
         >
-          {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
+
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
+          </div>
+
         </ws-form-item>
         </ws-form-item>
       </ws-info-table>
       </ws-info-table>
       <div class="remark">
       <div class="remark">
@@ -137,35 +199,62 @@
       </div>
       </div>
       <ws-info-table>
       <ws-info-table>
         <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
         <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
-          {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
+
+          <div class="unchanged">
+            {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
+          </div>
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="已开发票(元)" span="1" prop="goodsName">
         <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 }}
+          <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>
         <ws-form-item
         <ws-form-item
           label="已完成发运量(吨)"
           label="已完成发运量(吨)"
           span="1"
           span="1"
           prop="imperfectGrain"
           prop="imperfectGrain"
           class="result"
           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 }}
           >{{ deptBudgetList.contractProcessInfo.imperfectGrain }}
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="双章原件回收情况" span="1" prop="grade"
         <ws-form-item label="双章原件回收情况" span="1" prop="grade"
           >{{ deptBudgetList.contractProcessInfo.grade }}
           >{{ deptBudgetList.contractProcessInfo.grade }}
+
         </ws-form-item>
         </ws-form-item>
       </ws-info-table>
       </ws-info-table>
       <div class="remark">
       <div class="remark">
         <h3>备注信息</h3>
         <h3>备注信息</h3>
       </div>
       </div>
+
+        <div class="unchanged">
       {{ deptBudgetList.remarks }}
       {{ deptBudgetList.remarks }}
+        </div> 
+
       <img :src="deptBudgetList.addressUrl" alt="" />
       <img :src="deptBudgetList.addressUrl" alt="" />
 
 
       <!-- </base-card> -->
       <!-- </base-card> -->
@@ -306,17 +395,6 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 140px;
-  text-align: center;
-}
-.el-form {
-  padding: 0 20%;
-}
-.el-form-item {
-  width: 50%;
-}
-
 .button-container {
 .button-container {
   display: flex;
   display: flex;
   flex-wrap: nowrap;
   flex-wrap: nowrap;
@@ -350,7 +428,7 @@ export default {
 }
 }
 .box-app {
 .box-app {
   display: inline-block;
   display: inline-block;
-  float: left;
+
   margin-left: 30px;
   margin-left: 30px;
   line-height: 50px;
   line-height: 50px;
 }
 }
@@ -367,35 +445,41 @@ export default {
 .collapse-bottom {
 .collapse-bottom {
   margin-bottom: 20px;
   margin-bottom: 20px;
 }
 }
-
-.input-main .textarea .el-textarea__inner {
-  width: 100%;
-  z-index: 1;
-}
-.collapse-bottom {
-  margin-bottom: 20px;
-}
 .input-main .textarea .el-textarea__inner {
 .input-main .textarea .el-textarea__inner {
   width: 100%;
   width: 100%;
   z-index: 1;
   z-index: 1;
 }
 }
 .bg-left {
 .bg-left {
-  padding-left: 10px;
+  padding-left: 30px;
 }
 }
 .bg-right {
 .bg-right {
-  padding-right: 10px;
+  padding: 10px;
   text-align: right;
   text-align: right;
 }
 }
 .bg-bottom {
 .bg-bottom {
   margin: 20px 0px;
   margin: 20px 0px;
 }
 }
-.remark h3 {
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+.wenzi h3 {
   display: inline-block;
   display: inline-block;
-  margin-right: 20px;
+  left: 30px;
 }
 }
-.remark p {
+.wenzi p {
   display: inline-block;
   display: inline-block;
 }
 }
+.center {
+  width: 900px;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
 /*.crt-main .textarea /deep/ .el-form-item__label {*/
 /*.crt-main .textarea /deep/ .el-form-item__label {*/
 /*  height: 82px;*/
 /*  height: 82px;*/
 /*}*/
 /*}*/
@@ -435,6 +519,7 @@ export default {
     }
     }
   }
   }
 }
 }
+
 // 控制select为只读的时候显示样式
 // 控制select为只读的时候显示样式
 /deep/.ws-class-table-col {
 /deep/.ws-class-table-col {
   height: auto;
   height: auto;
@@ -464,4 +549,43 @@ export default {
   overflow: scroll;
   overflow: scroll;
   height: 93vh;
   height: 93vh;
 }
 }
+//*号
+.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{
+  width: 200px;
+}
+.unchanged{
+  position: absolute;
+  left: 37px;
+  width: 102px;
+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;
+}
 </style>
 </style>

+ 7 - 0
vue.config.js

@@ -144,7 +144,14 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         target: 'http://localhost:8090/',
         target: 'http://localhost:8090/',
         // target: 'http://192.168.1.124:8090/',
         // target: 'http://192.168.1.124:8090/',
+
+        target: 'http://192.168.1.124:8090/',
+
+
+
+
         // target: 'http://192.168.1.110:8090/',
         // target: 'http://192.168.1.110:8090/',
+
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://192.168.24.5:8098',//目标地址

部分文件因为文件数量过多而无法显示