Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -838,7 +838,11 @@
                     bpnId: this.$route.query.bpnId
                 }).then(res => {
                     let mes = JSON.parse(res.mes)
-                    mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                    if (mes.form.date) {
+                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                    } else {
+                        mes.form.date = ''
+                    }
                     this.form = mes.form
                     this.roleForm = mes.roleForm
                     this.commentText1 = mes.commentText1 || ''

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -160,6 +160,19 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <!--<el-form-item label="归档位置">
+                  <el-input
+                    style="display: none"
+                    v-model="form.treeListId"
+                    placeholder="请"
+                    readonly
+                  ></el-input>
+                  <el-input
+                    v-model="form.treeListName"
+                    placeholder="请输入标准英文名称"
+                    readonly
+                  ></el-input>
+                </el-form-item>-->
               </el-col>
             </el-row>
           </div>
@@ -1622,10 +1635,10 @@ export default {
           {required: true, message: '请输入标准中文名称', trigger: 'blur'},
           {min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'}
         ],
-        standEnName: [
+        /*standEnName: [
           {required: false, message: '请输入标准英文名称', trigger: 'blur'},
           {min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur'}
-        ],
+        ],*/
         standNature: [
           {required: true, message: '请选择标准性质', trigger: 'change'}
         ],
@@ -2575,7 +2588,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceLawsNumForm.quoteIdList = ''
       }
-      this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
+      this.replaceLawsNumForm.standType = 'FOREIGN' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -1520,10 +1520,10 @@ export default {
           { required: true, message: '请输入标准名称', trigger: 'blur' },
           { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
         ],
-        standEnName: [
+       /* standEnName: [
           { required: false, message: '请输入标准英文名称', trigger: 'blur' },
           { min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' }
-        ],
+        ],*/
         /*standNature: [
           { required: true, message: '请选择标准性质', trigger: 'change' }
         ],*/
@@ -1998,7 +1998,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceLawsNumForm.quoteIdList = ''
       }
-      this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
+      this.replaceLawsNumForm.standType = 'FOREIGN' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue

@@ -659,7 +659,11 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes)
-        mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
+        if (mes.form.endTime) {
+          mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
+        } else {
+          mes.form.endTime = ''
+        }
         this.form = mes.form
         this.roleForm = mes.roleForm
         this.commentText1 = mes.commentText1 || ''

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -107,15 +107,6 @@
               <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-                  prop="overTime"
-                  label="完成日期"
-                  align="center"
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-            </template>
-          </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="80">
             <template slot-scope="scope">
               <el-button size="mini" type="primary" @click="dealWith(scope.row)">办理</el-button>