前端孟祥旭

src/views/contractManagement/purchaseContractAdd.vue

@@ -16,7 +16,7 @@
         >
       </el-col>
     </el-row>
-
+   
     <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"

src/views/contractManagement/salesContract.vue

@@ -320,6 +320,13 @@ export default {
       endDate: null,
       // 提交类型
       submitType: true,
+      contractForm: {},
+      categoryIndex: 0,
+      rulesVendor: {},
+      deptBudgetTotal: 0,
+      size: 10,
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      handleCurrentChange:{},
       deptCircularPage: {},
       date: {
         year: dayjs().format('YYYY'),
@@ -526,10 +533,10 @@ export default {
       this.appendixIdss = row.receiveAttachmentPath
     },
     handleExamine(row) {
-      console.log(row)
+    
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id, status: row.status },
+        query: { id: row.id },
       })
     },
     handleAdd() {
@@ -538,9 +545,10 @@ export default {
     handleEdit(row) {
       this.$router.push({
         name: 'salesContractEdit',
-        query: { id: row.id },
+        params: { id: row.id },
       })
     },
+
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -585,6 +593,13 @@ export default {
     // deletecontract(){},
     //删除 
     
+
+    approve() {},
+    listQuery() {},
+    total() {},
+    clearfiltQuery() {},
+    selectCrtDuty() {},
+
     handleDelete(row) {
       var handleDelete = ' ' 
       if (row.handleDelete == '待执行' || row.handleDelete == '已完成') {
@@ -592,10 +607,9 @@ export default {
       } else if (row.handleDelete == '执行中') {
         handleDelete = '已完成'
       }
-      this.$confirm(`合同删除后不可恢复，是否继续删除？`, '删除该合同?', {
-  
-        confirmButtonText: '确定',
+      this.$confirm(`合同删除后不可恢复，是否继续删除？`, '提示', {
         cancelButtonText: '取消',
+        confirmButtonText: '确定',
         type: 'warning',
       })
         .then(() => {

src/views/contractManagement/salesContractAdd.vue

@@ -636,9 +636,6 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-    
-
-
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
       this.dialogViewSpareMoney = false
@@ -831,17 +828,7 @@ export default {
         });
         return
       }
-      //时间
-        if(this.deptBudgetList.deliveryDateStart>this.deptBudgetList.deliveryDateEnd){
-           this.$message({
-          message:'时间输入有误！',
-          type:'warning'
-        });
-        // if(){
-        //   alert('提交失败，请检查网络')
-        // }
-        return
-        }
+
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = this.compId
@@ -1146,7 +1133,63 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
-/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label{
-  width: 130px;
+//*号
+.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/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label{
+//   width: 130px;
+// }
+// /deep/.el-date-editor.el-input{
+//   width: 232px;
+// }
+// /deep/.el-input--small .el-input__inner {
+//     height: 32px;
+//     line-height: 32px;
+//     width: 232px;
+// }
+// /deep/.el-form-item__content .el-select {
+//     width: 232px;
+// }
+// /deep/.el-input--small{
+//   width: 232px;
+// }
+/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/.el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+    width: 232px;
 }
 </style>

src/views/contractManagement/salesContractEdit.vue

@@ -967,5 +967,10 @@ font-weight: 400;
 color: #AFB5CB;
 line-height: 14px;
 
+}
+/deep/.el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+    width: 232px;
 }
 </style>

src/views/contractManagement/salesContractExamine.vue

@@ -20,7 +20,12 @@
         >
       </el-col>
     </el-row>
-
+     <div class="state">
+      <h2>销售合同</h2>
+      <p>【编号：{{deptBudgetList.contractNo}}】</p>
+      <span class="icon">&nbsp;&nbsp;{{ deptBudgetList.status }}</span>
+    </div>
+     <div class="center">
     <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
@@ -235,23 +240,24 @@
             {{ deptBudgetList.contractProcessInfo.imperfectGrain }}
           </div>
         </ws-form-item>
-        <ws-form-item label="双章原件回收情况" span="1" prop="grade">
+        <!-- <ws-form-item label="双章原件回收情况" span="1" prop="grade">
           <div class="unchanged">
             {{ deptBudgetList.contractProcessInfo.grade }}
           </div>
 
           >{{ deptBudgetList.contractProcessInfo.imperfectGrain }}
-        </ws-form-item>
-        <ws-form-item label="双章原件回收情况" span="1" prop="grade"
-          >{{ deptBudgetList.contractProcessInfo.grade }}
-
+        </ws-form-item> -->
+        <ws-form-item label="双章原件回收情况" span="1" prop="grade" >
+           <div class="unchanged">
+          {{deptBudgetList.contractProcessInfo.grade}}
+           </div>
         </ws-form-item>
       </ws-info-table>
       <div class="remark">
         <h3>备注信息</h3>
       </div>
 
-        <div class="unchanged">
+        <div class="unchanged beizhu">
       {{ deptBudgetList.remarks }}
         </div> 
 
@@ -268,6 +274,7 @@
         >关闭</el-button
       >
     </div>
+    </div>
   </div>
 </template>
 
@@ -548,8 +555,41 @@ export default {
 .container {
   overflow: scroll;
   height: 93vh;
+  
+}
+.state{
+  width: 900px;
+  margin: 0 auto;
+}
+.state h2,.state p{
+   display: inline-block;
+}
+.state p{
+   display: inline-block;
+   margin-left: 10px;
+   width: 170px;
+height: 20px;
+font-size: 14px;
+font-family: PingFangSC-Regular, PingFang SC;
+font-weight: 400;
+color: #000000;
+line-height: 20px;
 }
-//*号
+.icon{
+  display: inline-block;
+  width: 60px;
+height: 24px;
+background: #ECFEFF;
+border-radius: 12px;
+border: 1px solid #50CAD4;
+position: relative;
+font-family: PingFangSC-Regular, PingFang SC;
+font-size: 14px;
+color: #50CAD4;
+line-height: 24px;
+}
+
+ //*号
 .unchangeable{
 position: absolute;
  width: 9px;
@@ -574,18 +614,31 @@ right: 14px;
 /deep/el-date-editor--date{
   width: 200px;
 }
+.beizhu{
+   position: absolute;
+
+  margin: 0 auto;
+ 
+}
 .unchanged{
   position: absolute;
   left: 37px;
-  width: 102px;
+  width: 900px;
 height: 14px;
 font-size: 14px;
 font-family: PingFangSC-Regular, PingFang SC;
 font-weight: 400;
 color: #AFB5CB;
 line-height: 14px;
+
+
 }
 /deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label{
   width: 130px;
 }
+/deep/.el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+    width: 232px;
+}
 </style>

vue.config.js

@@ -142,16 +142,9 @@ module.exports = {
 
         // target: 'https://product-server.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.110:8090/',
-
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址