wente
2023-11-17 d3435db0a892ba9b7ecd10b6a0f522b0798bf978
项目表
4个文件已修改
40 ■■■■■ 已修改文件
web/src/views/modules/project/Project.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/project/SoftwareTestOrder.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/pages/view.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/project/Project.vue
@@ -15,10 +15,10 @@
            <zt-dict v-model="dataForm.criticalLevel" placeholder="关键等级" dict="critical_level" clearable></zt-dict>
          </el-form-item>
          <el-form-item>
            <zt-dict v-model="dataForm.testLevel" placeholder="测试级别" dict="test_level" clearable></zt-dict>
<!--          <el-form-item>-->
<!--            <zt-dict v-model="dataForm.testLevel" placeholder="测试级别" dict="test_level" clearable></zt-dict>-->
          </el-form-item>
<!--          </el-form-item>-->
          <el-form-item >
            <zt-dict v-model="dataForm.softwareType" placeholder="软件类型" dict="software_type" clearable></zt-dict>
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -106,11 +106,7 @@
                              @cell-click="handleCellClick"
                              stripe>
                      <el-table-column prop="no"  align="center"  width="80" label="序号"/>
                      <el-table-column min-width="300" label="名称">
                        <template slot-scope="scope">
                          <span>{{ (dataForm.project.softwareName||'') + scope.row.name }}</span>
                        </template>
                      </el-table-column>
                      <el-table-column prop="name" min-width="300" label="名称"/>
                      <el-table-column align="center" prop="identify" width="180" label="标识/版本">
                        <template slot-scope="scope">
                          <span v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
@@ -230,15 +226,10 @@
              <div class="" style="width: 100%;">
                <div class="el-flex " style="height: 40px">
                  <div style="width: 70%">
                    <span>{{ dataForm.write }}</span>
                    <span>{{ dataForm.softwareTestOrder.write }}</span>
                  </div>
                  <div class="el-flex">
                    <div style="width: 60px;text-align: center">{{ dataForm.year }}</div>
                    年
                    <div style="width: 40px;text-align: center">{{ dataForm.month }}</div>
                    月
                    <div style="width: 40px;text-align: center">{{ dataForm.day }}</div>
                    日
                    {{ dataForm.softwareTestOrder.deliveryDate | filterTime('YYYY年MM月DD日') }}
                  </div>
                </div>
              </div>
web/src/views/modules/project/SoftwareTestOrder.vue
@@ -48,9 +48,8 @@
                       @refreshDataList="table.query"
                       @setProjectInfo="openAddWin">
        </ProjectSelect>
        <ViewAccessory ref="ViewAccessory" :pageMarkerfun="SoftwareTestOrder"></ViewAccessory>
      </zt-table-wraper>
      <View ref="view22" :pageMarkerfun="SoftwareTestOrder">
      </View>
    </div>
  </el-card>
</template>
@@ -58,11 +57,12 @@
<script>
import AddOrUpdate from './SoftwareTestOrder-AddOrUpdate'
import ProjectSelect from "./Project-select.vue"
import View from '@/views/pages/view.vue'
import ViewAccessory from '../../pages/view'
export default {
  data() {
    return {
      SoftwareTestOrder:'SoftwareTestOrder',
      dataForm: {
        testBasis: '',
        testType: '',
@@ -74,7 +74,7 @@
  components: {
    AddOrUpdate,
    ProjectSelect,
    View
    ViewAccessory
  },
  methods: {
    add() {
@@ -85,8 +85,12 @@
      this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
    },
    preview(row){
      console.log(row,'preview(row)');
      this.$refs.view22.setAccessoryFormatSingle(row)
      // let _this = this
      console.log(row,'preview(row)')
      console.log(this.$refs.ViewAccessory)
        this.$refs.ViewAccessory.setAccessory(row)
    }
  }
}
web/src/views/pages/view.vue
@@ -26,6 +26,7 @@
<script>
  import {setAccessoryFormatSingle} from '@/commonJS/commonFile'
  export default {
    name:'ViewAccessory',
    props: {
      pageMarkerfun: {
        default: ''
@@ -58,7 +59,7 @@
      })
    },
    methods: {
      setAccessoryFormatSingle(row) {
      setAccessory(row) {
        console.log(row, 'setAccessoryFormatSingle(row)');
        return setAccessoryFormatSingle(row, this.pageMarkerfun, this)
      },