零部件DVP变更 增加是否开展和不开展原因

src/views/componentsDVP/dvpPlan/edit.vue

@@ -1101,6 +1101,13 @@ export default {
     applyChange(record) {
       // 行数据 赋值
       let rowData = [
+        // 是否开展实验
+        {
+          changeContent: this.$t("base.info.whether-to-develop-experimental-projects"),
+          currentDesc: this.isOrNotMap[record.isCarryOut] || "-",
+          changeDesc: undefined,
+          changeReason: undefined
+        },
         // 试验类型
         {
           changeContent: this.$t("plan.dvp.test-type"),
@@ -1198,6 +1205,13 @@ export default {
           currentDesc: record.sampleNumber,
           changeDesc: undefined,
           changeReason: undefined
+        },
+        // 不展开实验原因
+        {
+          changeContent: this.$t("base.info.reason-for-not-conducting-the-experiment"),
+          currentDesc: "-",
+          changeDesc: undefined,
+          changeReason: undefined
         }
 
       ];

src/views/componentsDVP/dvpPlan/editModal/applyForChange.vue

@@ -23,34 +23,41 @@
         >
           <!-- 零部件DVP 变更后描述-->
           <template slot='changeDesc' slot-scope='text, record, index'>
+            <!-- 是否开展试验 -->
+            <a-select v-if="index === 0" v-model="record.changeDesc" style="width: 100%" @change="handleCarryOut" allowClear :placeholder="$t('base.info.please-enter-whether-to-develop-experimental-projects')">
+              <a-select-option :value="1">{{ $t('global-btn.yes') }}</a-select-option>
+              <a-select-option :value="0">{{ $t('global-btn.no') }}</a-select-option>
+            </a-select>
             <!--试验类型-->
-            <a-select v-if="index === 0" v-model="record.changeDesc" :disabled="dataSource && dataSource !== '0'" :options="testTypeList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('plan.dvp.please_select-test-type')" style="width: 100%"></a-select>
+            <a-select v-else-if="index === 1" v-model="record.changeDesc" :disabled="dataSource && dataSource !== '0'" :options="testTypeList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('plan.dvp.please_select-test-type')" style="width: 100%"></a-select>
             <!--试验来源-->
-            <a-select v-else-if="index === 1" v-model="record.changeDesc" :disabled="dataSource && dataSource !== '0'" :options="testSourceList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('global-btn.please-select') + $t('plan.dvp.test-source')" style="width: 100%"></a-select>
+            <a-select v-else-if="index === 2" v-model="record.changeDesc" :disabled="dataSource && dataSource !== '0'" :options="testSourceList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('global-btn.please-select') + $t('plan.dvp.test-source')" style="width: 100%"></a-select>
             <!--试验项目-->
-            <a-input v-else-if="index === 2" v-model.trim="record.changeDesc" :disabled="dataSource && dataSource !== '0'" :maxLength='100' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-project')"/>
+            <a-input v-else-if="index === 3" v-model.trim="record.changeDesc" :disabled="dataSource && dataSource !== '0'" :maxLength='100' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-project')"/>
             <!--开发目标要求-->
-            <a-input v-else-if="index === 3" v-model.trim="record.changeDesc" :disabled="dataSource && dataSource !== '0'" :maxLength='100' allowClear :placeholder="$t('global-btn.please-enter') + $t('base.info.development-objective-requirements')"/>
+            <a-input v-else-if="index === 4" v-model.trim="record.changeDesc" :disabled="dataSource && dataSource !== '0'" :maxLength='100' allowClear :placeholder="$t('global-btn.please-enter') + $t('base.info.development-objective-requirements')"/>
             <!--试验标准-->
-            <a-input v-else-if="index === 4" v-model.trim="record.changeDesc" :disabled="dataSource && dataSource !== '0'" :maxLength='500' allowClear :placeholder="$t('global-btn.please-enter') + $t('base.info.Test-standards')"/>
+            <a-input v-else-if="index === 5" v-model.trim="record.changeDesc" :disabled="dataSource && dataSource !== '0'" :maxLength='500' allowClear :placeholder="$t('global-btn.please-enter') + $t('base.info.Test-standards')"/>
             <!--等效实验报告编号-->
-            <a-select v-else-if="index === 5" v-model="record.changeDesc" :options="equivalentList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('global-btn.please-select') + $t('plan.dvp.equivalent-experiment-report-number')" style="width: 100%"></a-select>
+            <a-select v-else-if="index === 6" v-model="record.changeDesc" :options="equivalentList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('global-btn.please-select') + $t('plan.dvp.equivalent-experiment-report-number')" style="width: 100%"></a-select>
             <!--测试地点-->
-            <a-input v-else-if="index === 6" v-model.trim="record.changeDesc" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-site')"/>
+            <a-input v-else-if="index === 7" v-model.trim="record.changeDesc" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-site')"/>
             <!--测试负责人 -->
-            <a-select v-if="index === 7" v-model="record.changeDesc" :options="testOwnerList"  allowClear style="width: 100%" :placeholder="$t('global-btn.please-select') + $t('plan.dvp.test-user')" ></a-select>
+            <a-select v-if="index === 8" v-model="record.changeDesc" :options="testOwnerList"  allowClear style="width: 100%" :placeholder="$t('global-btn.please-select') + $t('plan.dvp.test-user')" ></a-select>
             <!--计划开始时间 -->
-            <a-date-picker v-else-if="index === 8" :disabled-date="disabledStartDate" @change='handleStartTime' v-model="record.changeDesc" :placeholder="$t('plan.dvp.please_select-scheduled-start-time')" style="width: 100%" valueFormat="YYYY/MM/DD"/>
+            <a-date-picker v-else-if="index === 9" :disabled-date="disabledStartDate" @change='handleStartTime' v-model="record.changeDesc" :placeholder="$t('plan.dvp.please_select-scheduled-start-time')" style="width: 100%" valueFormat="YYYY/MM/DD"/>
             <!--计划结束时间 -->
-            <a-date-picker v-else-if="index === 9" :disabled-date="disabledEndDate" @change='handleEndTime' v-model="record.changeDesc" :placeholder="$t('plan.dvp.please_select-scheduled-end-time')" style="width: 100%" valueFormat="YYYY/MM/DD"/>
+            <a-date-picker v-else-if="index === 10" :disabled-date="disabledEndDate" @change='handleEndTime' v-model="record.changeDesc" :placeholder="$t('plan.dvp.please_select-scheduled-end-time')" style="width: 100%" valueFormat="YYYY/MM/DD"/>
             <!--测试阶段-->
-            <a-input v-else-if="index === 10" v-model.trim="record.changeDesc" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-step')"/>
+            <a-input v-else-if="index === 11" v-model.trim="record.changeDesc" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-step')"/>
             <!--测试次数-->
-            <a-input-number v-else-if="index === 11" v-model.number="record.changeDesc" :defaultValue="0" :min="1" :max="999" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-count')" style="width: 100%"></a-input-number>
+            <a-input-number v-else-if="index === 12" v-model.number="record.changeDesc" :defaultValue="0" :min="1" :max="999" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-count')" style="width: 100%"></a-input-number>
             <!--样件类型-->
-            <a-input v-else-if="index === 12" v-model.trim="record.changeDesc" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.sample-type')"/>
+            <a-input v-else-if="index === 13" v-model.trim="record.changeDesc" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.sample-type')"/>
             <!--样本数量-->
-            <a-input-number v-else-if="index === 13" v-model.number="record.changeDesc" :defaultValue="0" :min="1" :max="999" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.number-of-samples')" style="width: 100%"></a-input-number>
+            <a-input-number v-else-if="index === 14" v-model.number="record.changeDesc" :defaultValue="0" :min="1" :max="999" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.number-of-samples')" style="width: 100%"></a-input-number>
+            <!-- 不开展试验原因 -->
+            <a-textarea v-else-if="index === 15" autoSize v-model.trim="record.changeDesc" :disabled="causeShowFlag" :maxLength="500" :placeholder="$t('base.info.please-enter-change-reason')"></a-textarea>
           </template>
 
           <!-- 变更原因 -->
@@ -494,34 +501,38 @@ export default {
       let data = {
         dvpId: _that.$store.getters.dvpId,
         testId: _that.testId,
-        testType: _that.tableData[0].changeDesc,
-        testTypeCause: _that.tableData[0].changeReason,
-        testSource: _that.tableData[1].changeDesc,
-        testSourceCause: _that.tableData[1].changeReason,
-        equivalentId: _that.tableData[5].changeDesc,
-        equivalentIdCause: _that.tableData[5].changeReason,
-        testProject: _that.tableData[2].changeDesc,
-        testProjectCause: _that.tableData[2].changeReason,
-        targetRequire: _that.tableData[3].changeDesc,
-        targetRequireCause: _that.tableData[3].changeReason,
-        testStandard: _that.tableData[4].changeDesc,
-        testStandardCause: _that.tableData[4].changeReason,
-        testSite: _that.tableData[6].changeDesc,
-        testSiteCause: _that.tableData[6].changeReason,
-        testUserId: _that.tableData[7].changeDesc,
-        testUserIdCause: _that.tableData[7].changeReason,
-        testStep: _that.tableData[10].changeDesc,
-        testStepCause: _that.tableData[10].changeReason,
-        testFrequency: _that.tableData[11].changeDesc,
-        testFrequencyCause: _that.tableData[11].changeReason,
-        sampleNumber: _that.tableData[13].changeDesc,
-        sampleNumberCause: _that.tableData[13].changeReason,
-        sampleType: _that.tableData[12].changeDesc,
-        sampleTypeCause: _that.tableData[12].changeReason,
-        planStartTime: _that.tableData[8].changeDesc,
-        planStartTimeCause: _that.tableData[8].changeReason,
-        planEndTime: _that.tableData[9].changeDesc,
-        planEndTimeCause: _that.tableData[9].changeReason
+        isCarryOut: _that.tableData[0].changeDesc,
+        isCarryOutCause: _that.tableData[0].changeReason,
+        testType: _that.tableData[1].changeDesc,
+        testTypeCause: _that.tableData[1].changeReason,
+        testSource: _that.tableData[2].changeDesc,
+        testSourceCause: _that.tableData[2].changeReason,
+        equivalentId: _that.tableData[6].changeDesc,
+        equivalentIdCause: _that.tableData[6].changeReason,
+        testProject: _that.tableData[3].changeDesc,
+        testProjectCause: _that.tableData[3].changeReason,
+        targetRequire: _that.tableData[4].changeDesc,
+        targetRequireCause: _that.tableData[4].changeReason,
+        testStandard: _that.tableData[5].changeDesc,
+        testStandardCause: _that.tableData[5].changeReason,
+        testSite: _that.tableData[7].changeDesc,
+        testSiteCause: _that.tableData[7].changeReason,
+        testUserId: _that.tableData[8].changeDesc,
+        testUserIdCause: _that.tableData[8].changeReason,
+        testStep: _that.tableData[11].changeDesc,
+        testStepCause: _that.tableData[11].changeReason,
+        testFrequency: _that.tableData[12].changeDesc,
+        testFrequencyCause: _that.tableData[12].changeReason,
+        sampleNumber: _that.tableData[14].changeDesc,
+        sampleNumberCause: _that.tableData[14].changeReason,
+        sampleType: _that.tableData[13].changeDesc,
+        sampleTypeCause: _that.tableData[13].changeReason,
+        planStartTime: _that.tableData[9].changeDesc,
+        planStartTimeCause: _that.tableData[9].changeReason,
+        planEndTime: _that.tableData[10].changeDesc,
+        planEndTimeCause: _that.tableData[10].changeReason,
+        notCarryOutCause: _that.tableData[15].changeDesc,
+        notCarryOutCauseChange: _that.tableData[15].changeReason
       };
       // 打开审批弹框
       _that.submitApprovalTitle = _that.$t('global-btn.apply-for-changes') + _that.$t("global-btn.submit-approval");