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

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

@@ -163,41 +163,51 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
-<!--            <div class="left">-->
-<!--              <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" style="margin-left:10px">-->
-<!--                <el-form-item label="标准号" class="search-item search-item-last">-->
-<!--                  <el-input-->
-<!--                    v-model="sarSarAccessEOSearch.standName"-->
-<!--                    placeholder="请输入标准号"-->
-<!--                  ></el-input>-->
-<!--                </el-form-item>-->
-<!--                <el-form-item label="标准名称" class="search-item search-item-last">-->
-<!--                  <el-input-->
-<!--                    v-model="sarSarAccessEOSearch.standNumber"-->
-<!--                    placeholder="请输入标准名称"-->
-<!--                  ></el-input>-->
-<!--                </el-form-item>-->
-<!--                <el-form-item class="search-item btn-box">-->
-<!--                  <el-button-->
-<!--                    :loading="searching"-->
-<!--                    type="primary"-->
-<!--                    class="common-button-primary"-->
-<!--                    size="small"-->
-<!--                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"-->
-<!--                    @click="getStandData">-->
-<!--                    查询-->
-<!--                  </el-button>-->
-<!--                </el-form-item>-->
-<!--                <el-form-item class="search-item btn-box">-->
-<!--                  <el-button-->
-<!--                    class="common-button-default"-->
-<!--                    size="small"-->
-<!--                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"-->
-<!--                    @click="clearSearch">清空-->
-<!--                  </el-button>-->
-<!--                </el-form-item>-->
-<!--              </el-form>-->
-<!--            </div>-->
+            <div class="left">
+              <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="类型" class="search-item search-item-last">
+                  <el-select
+                    @change="typeChange"
+                    v-model="standardSearch.standType"
+                    placeholder="请选择"
+                    filterable
+                  >
+                    <el-option
+                      v-for="item in standardTypeOptions"
+                      :value="item.value"
+                      :key="item.value"
+                      :label="item.label"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="standardSearch.standName"
+                    placeholder="请输入标准号或标准名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="getStandData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="sarAccessListDatas"
               tooltip-effect="dark"
@@ -381,12 +391,22 @@ export default {
       drawerTitle: "", //drawer标题
       // 查询相关参数
       searching: false,
-      sarSarAccessEOSearch: {
+      standardSearch: {
+        standType:'',
         standName:'',
-        standNumber:'',
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent
       },
+      standardTypeOptions: [
+        {
+          value: 'INLAND',
+          label: '国内标准法规',
+          item:'INLAND',
+        },
+        {
+          value: 'FOREIGN',
+          label: '海外标准法规',
+          item:'FOREIGN',
+        },
+      ],
       nodeList: [],
       defaultProps: {
         children: "children",
@@ -453,7 +473,8 @@ export default {
           id: "",
           itemsName: "",
           itemsNum: "",
-          responsibleUnit: "",
+          responsibleUnit: "",  //责任部门
+          responsibleEngineer: "", //责任工程师
           standId: "",
           svpps: ""
         }],
@@ -521,6 +542,9 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    typeChange(type) {
+      this.standardSearch.standType = type
+    },
     choiceShow() {
       this.ListModel = true;
     },
@@ -543,7 +567,6 @@ export default {
     },
     // 点击批量删除事件
     deleteList() {
-      console.log(this.selectList.length);
        if(this.selectList.length < 1){
          this.$message.warning('请选择一条数据进行删除')
        }else {
@@ -610,8 +633,8 @@ export default {
       json.prcCreateUser = this.$store.getters.userInfo.userId;
       json.prcCreateUserName = this.$store.getters.userInfo.account;
       json.standId = this.listForm.standId;
-      json.XCXSSRQ =  this.sarAccessListDatas[0].attrInfoMap.XCXSSRQ
-      json.ZCCSSRQ =  this.sarAccessListDatas[0].attrInfoMap.ZCCSSRQ
+      json.XCXSSRQ =  this.sarAccessListDatas[0].xcxssrqgj
+      json.ZCCSSRQ =  this.sarAccessListDatas[0].zccssrqgj
       this.$refs['listForm'].validate((valid) => {
         if (valid) {
           this.$refs['roleForm'].validate((valid) => {
@@ -660,7 +683,7 @@ export default {
         }, {
           _this: this
         }, res => {
-          console.log(res.data);
+          console.log(res)
           this.listForm.breakdownList = res.data;
           this.ListModel = false;
         }, e => {
@@ -733,22 +756,24 @@ export default {
       });
     },
     //获取标准数据
-    getStandData() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+    getStandData(){
+      this.$http.post('SarStandItems/sar-stand-items/findStand',{
         page: this.page,
-        pageSize: this.pageSize,
-      }, {
-        _this: this
+        size: this.pageSize,
+        ...this.standardSearch,
+      },{
+        _this: this,
       }, res => {
-        this.sarAccessListDatas = res.data.list;
-        this.total = res.data.count;
+        this.sarAccessListDatas = res.records;
+        this.total = res.total
       }, e => {
-      });
+
+      })
     },
     clearSearch() {
-      this.sarSarAccessEOSearch = {
+      this.standardSearch = {
         standName: "",
-        standNumber: ""
+        standType:"",
       };
       this.getStandData();
     },

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

@@ -241,7 +241,8 @@ export default {
           id: "",
           itemsName: "",
           itemsNum: "",
-          responsibleUnit: "",
+          responsibleUnit: "",  //责任部门
+          responsibleEngineer: "", //责任工程师
           standId: "",
           svpps: ""
         }],
@@ -316,6 +317,7 @@ export default {
      */
     getFormFieldList (item) {
       this.$nextTick(() => {
+        console.log(item.dataList)
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
@@ -323,6 +325,7 @@ export default {
         this.listForm.dataList = item.dataList
         this.dataList = item.dataList
         this.dataList.distributePerson = item.dataList[0].distributePerson
+        this.listForm.breakdownList = item.breakdownList
       })
     },
 
@@ -342,6 +345,7 @@ export default {
       this.listForm.standId = this.listForm.standId;
       this.listForm.passFlag = '1';
       this.listForm.signFlag = "";
+      this.listForm.breakdownList = this.listForm.breakdownList
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,

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

@@ -101,11 +101,17 @@
             prop="xCXSSRQ"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             fixed="right"
@@ -382,6 +388,8 @@ export default {
           this.listForm.breakdownList.push({
             itemsName: item.pepdtos[i].breakdownList[j].itemsName,
             itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
+            responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
+            responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
             productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
             projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
             projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
@@ -398,6 +406,7 @@ export default {
             zCCSSRQ:  item.pepdtos[i].zCCSSRQ,
           });
         }
+        console.log(item.pepdtos);
       }
     },
     saveUserInfo() {
@@ -440,7 +449,6 @@ export default {
       this.listForm.zrUserId = this.$store.getters.userInfo.userId;
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
-      this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
       const json = JSON.stringify(this.listForm.breakdownList);
       this.$http.post("lawss/activiti/completeTask", {

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"
@@ -494,6 +500,10 @@ export default {
         this.listForm.standNumber = item.step3DTOS[0].standNumber
         this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
         this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
+        this.listForm.itemsName = item.step3DTOS[0].itemsName
+        this.listForm.itemNum = item.step3DTOS[0].itemNum
+        this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit
+        this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer
       })
     },
 
@@ -504,12 +514,8 @@ export default {
     //提交事件
     handleSubmit() {
       this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
-      this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"
@@ -426,13 +432,19 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item.dataList);
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
         this.dataList = item.dataList
+        this.listForm.standName = item.standName
+        this.listForm.standNumber = item.standNumber
+        this.listForm.qualityEngineer = item.qualityEngineer
+        this.listForm.certifiedEngineer = item.certifiedEngineer
+        this.listForm.responsibleUnit = item.responsibleUnit
+        this.listForm.responsibleEngineer = item.responsibleEngineer
       })
     },
 
@@ -446,7 +458,6 @@ export default {
     handleSubmit() {
       this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
       this.listForm.commentText = this.commentText;
-      this.listForm.standId = this.listForm.standId;
       this.listForm.fenFlag = "1";
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"