commit

2021-08-09 19:31:17 +08:00
parent 78237aef4e
commit b4c5441f99
4 changed files with 30 additions and 10 deletions
@@ -409,6 +409,7 @@ export default {
      // 查询相关参数
      searching: false,
      commentText:'',
+      fileType:  'FBGBJBD',
      standardSearch: {
        standType: "",
        standName: ""
@@ -847,6 +848,7 @@ export default {
      this.$http.post("SarStandItems/sar-stand-items/findStand", {
        page: this.page,
        size: this.pageSize,
+        fileType: this.fileType,
        ...this.standardSearch
      }, {
        _this: this
@@ -396,6 +396,7 @@ export default {
      drawerTitle: "", //drawer标题
      // 查询相关参数
      searching: false,
+      fileType:  'FBGBJBD',
      standardSearch: {
        standType: "",
        standName: ""
@@ -822,6 +823,7 @@ export default {
      this.$http.post("SarStandItems/sar-stand-items/findStand", {
        page: this.page,
        size: this.pageSize,
+        fileType: this.fileType,
        ...this.standardSearch
      }, {
        _this: this
@@ -369,6 +369,16 @@ export default {
        this.listForm.breakdownList = [];
        for (let i = 0; i < item.pepdtos.length; i++) {
          for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
+            if(item.pepdtos[i].xCXSSRQ === null){
+              this.listForm.breakdownList.xCXSSRQ =  ""
+            } else {
+              this.listForm.breakdownList.xCXSSRQ =  item.pepdtos[i].xCXSSRQ
+            }
+            if(item.pepdtos[i].zCCSSRQ  === null){
+              this.listForm.breakdownList.zCCSSRQ =  ""
+            } else {
+              this.listForm.breakdownList.zCCSSRQ =  item.pepdtos[i].zCCSSRQ
+            }
            this.listForm.breakdownList.push({
              itemsName: item.pepdtos[i].breakdownList[j].itemsName,
              itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
@@ -386,8 +396,6 @@ export default {
              qualityEngineerName: item.pepdtos[i].qualityEngineerName,
              standNumber: item.pepdtos[i].standNumber,
              standName: item.pepdtos[i].standName,
-              xCXSSRQ: item.pepdtos[i].xCXSSRQ,
-              zCCSSRQ: item.pepdtos[i].zCCSSRQ
            });
          }
        }
@@ -68,8 +68,10 @@
            label="标准号"
          >
            <template slot-scope="scope">
-              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
+                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                {{ scope.row.standNumber }}</a>
            </template>
          </el-table-column>
          <el-table-column
@@ -484,6 +486,7 @@ export default {
      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
        _this: this
      }, res => {
+        console.log(res.data.records);
        this.listForm.dataList = res.data.records;
        this.dataList = res.data.records;
        this.listForm.dataList.forEach(item => {
@@ -517,7 +520,12 @@ export default {
        {
          _this: this
        }, res => {
-          this.listForm.breakdownList = res.data;
+          if (!res.data.length) {
+            this.dataList = []
+            this.$message.warning("请选择带有分解单的标准");
+          } else {
+            this.listForm.breakdownList = res.data;
+          }
        });
    },
    //标准的多选框改变
@@ -595,15 +603,15 @@ export default {
      });
    },
    // 点击查看
-    handlePreview (item) {
+    handlePreview(item) {
      let routeUrl = this.$router.resolve({
-        name: 'OtherStandardDetails',
+        name: "OtherStandardDetails",
        params: {
          id: item.standId,
-          pageType: 'INLAND_STAND'
+          pageType: "INLAND_STAND"
        }
-      })
-      window.open(routeUrl.href, '_blank')
+      });
+      window.open(routeUrl.href, "_blank");
    },
    choiceZRR(type, title, id) {
      this.nodeList = [];