commit

src/components/roleTree/index.vue

@@ -62,6 +62,7 @@
             </el-tree>
             <div id="roleFormButton" class="demo-drawer-footer">
                 <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleTreeDrawerCancel">取消</el-button>
             </div>
             <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>

src/pages/details/otherStandardDetails/index.vue

@@ -3079,7 +3079,6 @@ export default {
         justify-content: space-between;
         height: 50px;
         border-bottom: 1px solid #E5E5E5;
-
         .modular-header-title {
           font-size: 18px;
           font-weight: bold;

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -85,6 +85,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
             </div>
             <el-collapse accordion>
@@ -243,6 +245,7 @@
         name: "bzdyStep1-1",
         data() {
             return {
+                foldFormFlag: false,
                 fileMadel2: false,
                 nodeList: [],
                 nodeList2: [],
@@ -314,6 +317,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getData () {
                 queryTaskFirst({
                     bpnId: this.$route.query.bpnId

src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue

@@ -21,7 +21,7 @@
           <ProcessTitle>
             <template slot="title">基础信息</template>
           </ProcessTitle>
-          <div class="prc-content-border">
+          <div class="prc-content-border" v-if="foldFormFlag === false">
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
               </el-col>
             </el-row>
           </div>
+          <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+          <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
         </el-form>
         <ProcessTitle>
           <template slot="title">调研信息</template>
@@ -199,6 +201,7 @@ export default {
   name: "bzdyStep1-9",
   data() {
     return {
+      foldFormFlag: false,
       histortData: [],
       commentText: '',
       tableData: [],
@@ -230,6 +233,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     getHistoryData () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,

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

@@ -21,7 +21,7 @@
           <ProcessTitle>
             <template slot="title">基础信息</template>
           </ProcessTitle>
-          <div class="prc-content-border">
+          <div class="prc-content-border" v-if="foldFormFlag === false">
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -85,6 +85,8 @@
               </el-col>
             </el-row>
           </div>
+          <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+          <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
         </el-form>
       </div>
       <el-collapse accordion>
@@ -244,6 +246,7 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      foldFormFlag: false,
       fileMadel2: false,
       commentText: '',
       nodeList: [],
@@ -316,6 +319,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     checkedRole2 (data) {
       var idList = ''
       var nameList = ''

src/pages/processCenter/pages/creatProcess/bzdy/step2.vue

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -71,6 +71,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
             </div>
             <el-collapse accordion>
@@ -174,6 +176,7 @@
         name: "bzdyStep2",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
@@ -209,6 +212,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

src/pages/processCenter/pages/creatProcess/bzdy/step3.vue

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -60,6 +60,17 @@
                                         - -
                                     </div>
                                 </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+                    <ProcessTitle>
+                        <template slot="title">调研回执</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="12">
                                 <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
@@ -80,6 +91,13 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
+                                <el-form-item label="回执说明" prop="title" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.dyhz"
+                                            placeholder="请输入回执说明"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -199,6 +217,7 @@
         name: "bzdyStep3",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
@@ -207,6 +226,7 @@
                 isSubmit: false,
                 saveLoading: false,
                 form: {
+                    dyhz: '',
                     title: '', // 调研标题
                     date: '', // 完成时间
                     modelList: [],
@@ -232,6 +252,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
@@ -304,6 +327,7 @@
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
+                        this.json.dyhz = this.form.dyhz
                         this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
@@ -341,6 +365,7 @@
                         this.form.responUserListName = data.form.responUserListName
                         this.form.fileName = data.form.fileName || data.fileName || ''
                         this.form.fileId = data.form.fileId || data.fileId || ''
+                        this.form.dyhz = data.form.dyhz || data.dyhz || ''
                     }).catch(e => {
                     })
                 })

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -71,6 +71,33 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+                    <ProcessTitle>
+                        <template slot="title">调研回执</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="12">
+                                <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.file" class="fileClass" @click="updateFile(form.file)">
+                                        {{ form.fileName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="调研回执" prop="dyhz" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.dyhz"
+                                            placeholder="请输入调研回执"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
                 </el-form>
             </div>
             <el-collapse accordion>
@@ -171,6 +198,7 @@
         name: "bzdyStep4",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
@@ -179,6 +207,7 @@
                 isSubmit: false,
                 saveLoading: false,
                 form: {
+                    dyhz: '',
                     title: '', // 调研标题
                     date: '', // 完成时间
                     modelList: [],
@@ -205,6 +234,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
@@ -264,6 +296,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.dyhz = data.dyhz || data.form.dyhz
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

src/pages/processCenter/pages/creatProcess/bzdy/step5.vue

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -63,6 +63,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -81,6 +83,7 @@
                         <el-table-column
                                 type="index"
                                 width="55"
+                                label="序号"
                                 align="center">
                         </el-table-column>
                         <el-table-column
@@ -89,7 +92,7 @@
                                 align="center">
                         </el-table-column>
                         <el-table-column
-                                label="文件"
+                                label="回执文件"
                                 align="center">
                             <template slot-scope="scope">
                                 <div @click="updateFile(scope.row.fileId)" class="fileClass">
@@ -214,6 +217,7 @@
         name: "bzdyStep5",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -244,6 +248,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

src/pages/processCenter/pages/creatProcess/bzdy/step6.vue

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -74,6 +76,7 @@
                             ref="selection"
                     >
                         <el-table-column
+                                label="序号"
                                 type="index"
                                 width="55"
                                 align="center">
@@ -210,6 +213,7 @@
         name: "bzdyStep6",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +245,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

src/pages/processCenter/pages/creatProcess/bzdy/step7.vue

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -75,6 +77,7 @@
                     >
                         <el-table-column
                                 type="index"
+                                label="序号"
                                 width="55"
                                 align="center">
                         </el-table-column>
@@ -210,6 +213,7 @@
         name: "bzdyStep7",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +245,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

src/pages/processCenter/pages/creatProcess/bzdy/step8.vue

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -76,6 +78,7 @@
                         <el-table-column
                                 type="index"
                                 width="55"
+                                label="序号"
                                 align="center">
                         </el-table-column>
                         <el-table-column
@@ -210,6 +213,7 @@
         name: "bzdyStep8",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +245,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

src/pages/processCenter/pages/creatProcess/bzdy/step9.vue

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -76,6 +78,7 @@
                         <el-table-column
                                 type="index"
                                 width="55"
+                                label="序号"
                                 align="center">
                         </el-table-column>
                         <el-table-column
@@ -210,6 +213,7 @@
         name: "bzdyStep9",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +245,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

src/pages/processCenter/pages/creatProcess/bzjd/step2.vue

@@ -454,8 +454,13 @@
                         console.log(data);
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+                        if (data.form) {
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         let arr

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -589,15 +589,23 @@
                                 num6++
                             }
                         }
-                        if (num1 > 0) {
+                        if (this.form.itemsNum1) {
-                            this.$message.warning('请输入核心技术要求')
+                            if (num1 > 0) {
-                        } else if (num2 > 0) {
+                                this.$message.warning('请输入核心技术要求')
-                            if (this.sarType === 'INLAND') {
+                                return
-                                this.$message.warning('请输入国内标准的差异点')
-                            } else {
-                                this.$message.warning('请输入基于上一版本差异')
                             }
-                        } else if (num3 > 0) {
+                        } else {
+                            if (num2 > 0) {
+                                if (this.sarType === 'INLAND') {
+                                    this.$message.warning('请输入国内标准的差异点')
+                                    return
+                                } else {
+                                    this.$message.warning('请输入基于上一版本差异')
+                                    return
+                                }
+                            }
+                        }
+                        if (num3 > 0) {
                             this.$message.warning('请输入符合性要求')
                         } else if (num4 > 0) {
                             this.$message.warning('请输入新车型实施日期')
@@ -634,11 +642,15 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        console.log(data);
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+                        if (data.form) {
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         let itemList

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

@@ -438,8 +438,13 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+                        if (data.form) {
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList

src/pages/processCenter/pages/creatProcess/bzjd/step5.vue

@@ -438,8 +438,13 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+                        if (data.form) {
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList

src/pages/processCenter/pages/creatProcess/bzjd/step6.vue

@@ -437,8 +437,13 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+                        if (data.form) {
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList