landydb 1 week ago
parent
commit
1659c60954

+ 1 - 1
src/components/work-flow/home.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flow_region">
-    <div class="flow_left" v-if="!disabled">
+    <div class="flow_left" v-if="sourceType == '1'">
       <div class="flow_left_item">
         <el-scrollbar style="height: 100%">
           <div class="nodes-wrap">

+ 13 - 14
src/components/work-flow/node-edit-normal.vue

@@ -164,9 +164,9 @@ export default {
         { value: '17', name: '其他' }
       ],
       rules: {
-        attachList: [
-          { required: true, message: '请上传附件', trigger: 'change' }
-        ],
+        // attachList: [
+        //   { required: true, message: '请上传附件', trigger: 'change' }
+        // ],
         preTaskTime: [
           { required: true, message: '请输入所需工时', trigger: 'blur' }
         ],
@@ -232,17 +232,16 @@ export default {
       this.form.operatorId = this.node.operatorId.split(',')
     }
 
-    // 附件
-    // if (this.node.attachList) {
-    //   this.fileList = []
-    //   this.node.attachList.forEach((item) => {
-    //     this.fileList.push({
-    //       name: item.fileName,
-    //       url: item.url,
-    //       id: item.url
-    //     })
-    //   })
-    // }
+    console.log(this.form.isProgramme)
+
+    if(this.form.isProgramme == undefined || this.form.isProgramme == null){
+      this.form.isProgramme = 2
+    }
+
+    console.log(this.form.isProgramme)
+
+    console.log(1111)
+   
     this.getOperatorList()
   },
   methods: {

+ 2 - 2
src/components/work-flow/node-item.vue

@@ -25,9 +25,9 @@
         <div class="nodeName">{{ node.nodeName }}</div>
       </el-col>
     </el-row>
-    <!-- <el-row>
+    <el-row>
       <div class="node-operator">{{ node.operatorName }}</div>
-    </el-row> -->
+    </el-row>
     <!--连线用--//触发连线的区域-->
     <div class="node-anchor anchor-top" v-show="mouseEnter"></div>
     <div class="node-anchor anchor-right" v-show="mouseEnter"></div>

+ 1 - 1
src/views/modules/tech/ctafts-add-or-detail-v2.vue

@@ -78,7 +78,7 @@
           @saveWorkFlow="saveWorkFlow"
           :isEdit="isEdit"
           @dataChange="workFlowDataChange"
-          :sourceType="1"
+          sourceType="1"
         ></work-flow>
       </el-row>
     </el-form>

+ 2 - 9
src/views/modules/tech/file-manage-add-or-update.vue

@@ -46,6 +46,7 @@
             :accept="'*'"
             :file-obj-list="fileList"
             @uploadSuccess="uploadSuccess"
+            :displayStar="false"
           />
         </el-col>
       </el-row>
@@ -56,6 +57,7 @@
             :accept="'*'"
             :file-obj-list="fileList1"
             @uploadSuccess="uploadSuccess1"
+            :displayStar="false"
           />
         </el-col>
       </el-row>
@@ -152,15 +154,6 @@ export default {
     dataFormSubmit () {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          if (this.fileList.length === 0) {
-            this.$message.error('请上传技术协议')
-            return
-          }
-          if (this.fileList1.length === 0) {
-            this.$message.error('请上传技术文件')
-            return
-          }
-
           let data = {
             technicalDocumentsId: this.dataForm.technicalDocumentsId,
             orderId: this.dataForm.orderId,