提交代码

src/views/manager/contractinfo/detail.vue

@@ -30,7 +30,7 @@
                     prop="contractType"
                   >
                     <el-select
-                      :disabled="cid"
+                      :disabled="contractForm.id"
                       v-model="contractForm.contractType"
                       placeholder="请选择"
                       class="w-100p"
@@ -279,7 +279,7 @@
                   :span="12"
                   v-show="contractForm.contractType!=1"
                 >
-                  <div class="head-font">施工方合同段权限配置</div>
+                  <div class="head-font">合同段权限配置</div>
                   <el-checkbox-group
                     v-model="idList"
                     class="martop15"
@@ -402,7 +402,7 @@
           </div>
         </el-tab-pane>
         <el-tab-pane
-          v-if="$route.query.contractType==1||$route.query.contractType===undefined"
+          v-if="contractForm.contractType == 1"
           label="分配WBS"
           name="2"
         >
@@ -1011,14 +1011,13 @@ export default {
         this.btnLoad = false;
         return;
       }
-
       this.$message({
         type: "success",
         message: "保存成功!"
       });
       this.typeChang[this.activeType] = false;
       let num = Number(this.activeType);
-      if (this.$route.query.contractType == 1 || this.$route.query.contractType === undefined) {
+      if (this.contractForm.contractType == 1) {
         if (type == 'n') {
           num++;
         } else if (type == 'p') {
@@ -1057,7 +1056,7 @@ export default {
               } else {
                 this.$message({
                   type: "error",
-                  message: "请先选择施工方合同段权限配置"
+                  message: "请先选择合同段权限配置"
                 })
                 this.btnLoad = false
               }

src/views/manager/projectinfo/detail.vue

@@ -461,6 +461,7 @@ export default {
         projectAlias: [
           { required: true, message: '请输入项目别名', trigger: 'blur' },
         ],
+        planStartTime: [{ required: true, message: '请选择计划开工日期', trigger: 'blur' },],
         planEndTime: [
           { validator: checkDate, trigger: 'blur' }
         ],

src/views/manager/projectinfo/tree.vue

@@ -265,15 +265,11 @@
                 >删除</el-button>
                 <el-button
                   size="mini"
-                  <<<<<<<
-                  HEAD
                   type="primary"
-                  v-throttle='3000'=======type="danger"
-                  v-throttle='2000'
-                >>>>>>> 780bb177cb050efdf95c9a8a7ba8cbe94cd787fb
+                  v-throttle='3000'
                   v-show="scope.row.status==0"
                   @click="hideMD(scope.row)"
-                  >已隐藏</el-button>
+                >已隐藏</el-button>
                 <el-button
                   size="mini"
                   type="primary"

vue.config.js

@@ -28,9 +28,9 @@ module.exports = {
                 //本地服务接口地址
                 // target: 'http://localhost',
                 // target: 'http://192.168.4.6',
-                // target: 'http://47.110.251.215:8090',
+                target: 'http://47.110.251.215:8090',
                 // target: 'http://192.168.4.12',
-                target: 'http://192.168.4.44',
+                // target: 'http://192.168.4.44',
                 //远程演示服务地址,可用于直接启动项目
                 //target: 'https://saber.bladex.vip/api',
                 ws: true,