--no commit message

@@ -20,7 +20,8 @@
           此环节为流程最后环节，转出后流程将结束
         </el-form-item>
       </el-form>
-      <div class="invalid-reson">审批意见：</div>
+      <div v-if="this.formData.showidea">
+       <div class="invalid-reson">审批意见：</div>
       <el-input
         class="opinion"
         v-model="shyj"
@@ -28,6 +29,8 @@
         type="textarea"
         :rows="4"
       ></el-input>
+      </div>
+
       <!-- <el-button class="opinion_btn" @click="commonOpinion">常用意见</el-button> -->
       <el-button style="float: right" @click="cancelBack">取消转出</el-button>
       <el-button type="primary" @click="submitForm" style="float: right"

@@ -387,7 +387,6 @@ export default {
           dname: "历史",
         },
       ],
-      tdxz: null,
       isShow: false,
       disabled: true,
       czrOptions: [],
@@ -462,11 +461,11 @@ export default {
             this.ssqlxxshow = false;
           }
            this.$endLoading();
-          if (this.ruleForm.tdytqxList.length > 0) {
-            this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
-          } else {
-            this.tdxz = null;
-          }
+          // if (this.ruleForm.tdytqxList.length > 0) {
+          //   this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
+          // } else {
+          //   this.tdxz = null;
+          // }
           this.isShow = true;
         }
       });

@@ -19,7 +19,7 @@ import {
 } from "@/api/workFlow.js";
 import { mapGetters } from 'vuex'
 export default {
-  data () {
+  data() {
     return {
       //是否开启材料分屏
       splitScreen: false,
@@ -35,10 +35,12 @@ export default {
       batchButtonName: '',
       // 受理申请信息
       slsq: {},
-      ableOperation: true
+      ableOperation: true,
+      showidea: false
+
     }
   },
-  mounted () {
+  mounted() {
     this.flowInitParam();
   },
   methods: {
@@ -47,7 +49,7 @@ export default {
      * @description: 加载流程初始参数
      * @author: renchao
      */
-    flowInitParam () {
+    flowInitParam() {
       var formdata = new FormData();
 
       formdata.append("bsmSlsq", this.bsmSlsq);
@@ -58,6 +60,10 @@ export default {
       stepExpandInfo(formdata).then((res) => {
         if (res.code === 200) {
           this.leftButtonList = res.result.button;
+          if (res.result.properties.length) {
+            this.showidea = res.result.properties[0].value
+          }
+
           this.rightButtonList = res.result.operation;
           let arr = this.rightButtonList.filter((item) => {
             return item.name == "删除"
@@ -79,7 +85,7 @@ export default {
      * @param {*} item
      * @author: renchao
      */
-    operation (item) {
+    operation(item) {
       //按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书 B7:证书领取 B8:楼盘表 B9:登簿
       //操作按钮 登簿：record  转件：transfer  退回：back  退出：signout
       let that = this;
@@ -107,21 +113,21 @@ export default {
           })
           break;
         case "B2": //材料分屏按钮
-        this.splitScreen = this.splitScreen ? false : true;
-        this.$store.dispatch("app/settScreen", this.splitScreen);
-        if (this.splitScreen) {
+          this.splitScreen = this.splitScreen ? false : true;
+          this.$store.dispatch("app/settScreen", this.splitScreen);
+          if (this.splitScreen) {
 
-          //如果当前选项卡为材料信息内容，递减到上一个选项卡内容
-          if (this.tabName == this.clxxTab.value) {
-            this.tabName = this.tabList[this.clxxIndex - 1].value;
-            this.getFromRouter(this.tabList[this.clxxIndex - 1].value);
+            //如果当前选项卡为材料信息内容，递减到上一个选项卡内容
+            if (this.tabName == this.clxxTab.value) {
+              this.tabName = this.tabList[this.clxxIndex - 1].value;
+              this.getFromRouter(this.tabList[this.clxxIndex - 1].value);
+            }
+            //删除材料信息选项卡数据
+            this.tabList.splice(this.clxxIndex, 1);
+          } else {
+            //新增材料信息选项卡数据
+            this.tabList.splice(this.clxxIndex, 0, this.clxxTab);
           }
-          //删除材料信息选项卡数据
-          this.tabList.splice(this.clxxIndex, 1);
-        } else {
-          //新增材料信息选项卡数据
-          this.tabList.splice(this.clxxIndex, 0, this.clxxTab);
-        }
           // this.closefp()
 
           // if (this.splitScreen) {
@@ -289,7 +295,7 @@ export default {
      * @description: del
      * @author: renchao
      */
-    del () {
+    del() {
       let formdata = new FormData();
       formdata.append("bsmSlsq", this.bsmSlsq);
       this.$confirm("确定要删除吗, 是否继续?", "提示", {
@@ -324,24 +330,27 @@ export default {
      * @param {*} obj
      * @author: renchao
      */
-    sendToNext (obj) {
+    sendToNext(obj) {
       this.$popupDialog("转出", "djbworkflow/components/zc", {
-        obj:obj,
+        obj: obj,
         bsmSlsq: this.bsmSlsq,
-        tabList: this.tabList
-      }, '800px', true)
+        tabList: this.tabList,
+        tshowidea: this.showidea
+      }, '600px', true)
     },
     //转出最后一个流程
     /**
      * @description: 转出最后一个流程
      * @author: renchao
      */
-    sendToEnd () {
+    sendToEnd() {
       this.$popupDialog("转出", "djbworkflow/components/zc", {
-        obj:"",
+        obj: "",
         bsmSlsq: this.bsmSlsq,
-        tabList: this.tabList
-      }, '800px', true)
+        tabList: this.tabList,
+        showidea: this.showidea
+
+      }, '600px', true)
     },
 
     //批量操作
@@ -349,7 +358,7 @@ export default {
      * @description: 批量操作
      * @author: renchao
      */
-    handleBatchDel () {
+    handleBatchDel() {
       this.$popupDialog("批量删除", "workflow/components/batchDel", {
         width: "50%",
         btnShow: false,
@@ -363,7 +372,7 @@ export default {
      * @param {*} file
      * @author: renchao
      */
-    handleChange (file) {
+    handleChange(file) {
       var formdata = new FormData();
       formdata.append("file", file.raw);
       formdata.append("bsmSldy", this.currentSelectProps.bsmSldy);
@@ -382,7 +391,7 @@ export default {
      * @param {*} file
      * @author: renchao
      */
-    beforeUpload (file) {
+    beforeUpload(file) {
       return true;
     }
   }

@@ -14,31 +14,34 @@
       :heightNumSetting="true"
       :minHeight="150"
       height="150"
-      style="width: 100%">
+      style="width: 100%"
+    >
       <el-table-column prop="index" width="50" :render-header="renderHeader">
         <template slot-scope="scope">
           <i
             class="el-icon-minus pointer"
             @click="deleClick(scope.$index, scope.row)"
-            v-if="ableOperation"></i>
+            v-if="ableOperation"
+          ></i>
           <div style="text-align: center" v-else>
             {{ scope.$index + 1 }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="tdyt" label="土地用途" min-width="100">
+      <el-table-column prop="yt" label="土地用途" min-width="100">
         <template slot-scope="scope">
           <treeselect
-            v-model="tdyt"
+            v-model="scope.row.yt"
             :disabled="!ableOperation"
             noOptionsText="暂无数据"
-            placeholder=''
+            placeholder=""
             :show-count="true"
             :options="dictData['tdyt']"
             :normalizer="normalizer"
             :appendToBody="true"
             z-index="9999"
-            @input="addrow(scope.row)" />
+            @input="addrow(scope.$index)"
+          />
         </template>
       </el-table-column>
       <el-table-column prop="qssj" label="土地使用起始时间" min-width="100">
@@ -51,7 +54,8 @@
             placeholder="选择日期"
             value-format="yyyy-MM-dd HH:mm:ss"
             format="yyyy-MM-dd"
-            @input="startTime(scope.$index)">
+            @input="startTime(scope.$index)"
+          >
           </el-date-picker>
         </template>
       </el-table-column>
@@ -65,7 +69,8 @@
             placeholder="选择日期"
             value-format="yyyy-MM-dd HH:mm:ss"
             format="yyyy-MM-dd"
-            @input="endTime(scope.$index)">
+            @input="endTime(scope.$index)"
+          >
           </el-date-picker>
         </template>
       </el-table-column>
@@ -74,246 +79,233 @@
           <el-input
             class="item"
             :disabled="!ableOperation"
-            v-model="scope.row.syqx"
+            v-model="scope.row.tdsyqx"
+            oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
             placeholder="请输入内容"
-            @input="sumTime(scope.$index,scope.row.syqx)">
-            ></el-input>
+            @input="sumTime(scope.$index, scope.row.tdsyqx)"
+          >
+            ></el-input
+          >
         </template>
       </el-table-column>
     </el-table>
   </div>
 </template>
 <script>
-  import { mapGetters } from "vuex";
-  export default {
-    computed: {
-      ...mapGetters(["dictData"]),
+import { mapGetters } from "vuex";
+export default {
+  computed: {
+    ...mapGetters(["dictData"]),
+  },
+  props: {
+    tableData: {
+      type: Array,
+      default: function () {
+        return [];
+      },
     },
-    props: {
-      tableData: {
-        type: Array,
-        default: function () {
-          return [];
-        },
+    ableOperation: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      // 键名转换，方法默认是label和children进行树状渲染
+      key: 0,
+      newdata: {
+        yt: null,
+        qssj: "",
+        jssj: "",
+        tdsyqx: "",
+      },
+      tableDataList: [],
+      // 起始时间选择范围
+      pickerStart: {},
+      pickerEnd: {},
+      normalizer(node) {
+        if (node.children == null || node.children == "null") {
+          delete node.children;
+        }
+        return {
+          id: node.dcode,
+          label: node.dname,
+          children: node.children,
+        };
       },
-      ableOperation: {
-        type: Boolean,
-        default: true,
+    };
+  },
+  mounted() {},
+  watch: {
+    tableData: {
+      handler: function (val, oldVal) {
+        let that = this;
+        this.$nextTick(() => {
+          if (val.length == 0 || !val) {
+            console.log("进了");
+            that.tableDataList = _.cloneDeep([
+              {
+                yt: null,
+                qssj: "",
+                jssj: "",
+                tdsyqx: "",
+              },
+            ]);
+          } else {
+            that.tableDataList = _.cloneDeep(val);
+          }
+        });
       },
+      immediate: true,
+      deep: true,
     },
-    data () {
-      return {
-        // 键名转换，方法默认是label和children进行树状渲染
-        tdyt: null,
-        key: 0,
-        newdata: {
-          yt: "",
-          qssj: "",
-          jssj: "",
-          syqx: "",
-        },
-        tableDataList: [],
-        // 起始时间选择范围
-        pickerStart: {},
-        pickerEnd: {},
-        normalizer (node) {
-          if (node.children == null || node.children == "null") {
-            delete node.children;
+  },
+  methods: {
+    /**
+     * @description: renderHeader
+     * @author: renchao
+     */
+    renderHeader() {
+      return (
+        <div>
+          {" "}
+          {!this.ableOperation ? (
+            "序号"
+          ) : (
+            <i
+              class="el-icon-plus pointer"
+              onClick={() => {
+                this.addClick();
+              }}
+            ></i>
+          )}
+        </div>
+      );
+    },
+    // 修改事件
+    /**
+     * @description: 修改事件
+     * @author: renchao
+     */
+    addrow(a) {
+      console.log(a);
+      // this.tableDataList = this.tableDataList.map((item) => {
+      //   return {
+      //     ...item,
+      //     yt: this.tdyt,
+      //   };
+      // });
+      // this.$emit("upDateTdytxxList", this.tableDataList);
+    },
+    /**
+     * @description: startTime
+     * @param {*} index
+     * @author: renchao
+     */
+    startTime(index) {
+      console.log("index", index);
+      //  let startTime = this.tableDataList[index].tdsyqssj;
+      let endTime = this.tableDataList[index].jssj;
+      let startTime = this.tableDataList[index].qssj;
+      this.tableDataList[index].pickerEnd = {
+        disabledDate: (time) => {
+          if (Object.keys(startTime).length > 0) {
+            return new Date(startTime).getTime() > time.getTime();
+          } else {
+            return time.getTime() < Date.now();
           }
-          return {
-            id: node.dcode,
-            label: node.dname,
-          };
         },
       };
+      if (startTime && endTime) {
+        let startYear = new Date(startTime).getFullYear();
+        let endYear = new Date(endTime).getFullYear();
+        this.tableDataList[index].tdsyqx = endYear - startYear;
+      }
+      this.$emit("upDateTdytxxList", this.tableDataList);
     },
-    mounted () {
-    },
-    watch: {
-      tableData: {
-        handler: function (val, oldVal) {
-          let that = this;
-          this.$nextTick(() => {
-            if (val.length == 0 || !val) {
-              that.tableDataList = _.cloneDeep([
-                {
-                  yt: "",
-                  qssj: "",
-                  jssj: "",
-                  syqx: "",
-                },
-              ]);
-              if (that.tableDataList.length > 0) {
-                this.tdyt = that.tableDataList[0].yt
-                  ? that.tableDataList[0].yt
-                  : null;
-              } else {
-                this.tdyt = null;
-              }
-            } else {
-              that.tableDataList = _.cloneDeep(val);
-              if (that.tableDataList.length > 0) {
-                this.tdyt = that.tableDataList[0].yt
-                  ? that.tableDataList[0].yt
-                  : null;
-              } else {
-                this.tdyt = null;
-              }
-            }
-          });
+    /**
+     * @description: endTime
+     * @param {*} index
+     * @author: renchao
+     */
+    endTime(index) {
+      //  let startTime = this.tableDataList[index].tdsyqssj;
+      let startTime = this.tableDataList[index].qssj;
+      let endTime = this.tableDataList[index].jssj;
+      this.tableDataList[index].pickerStart = {
+        disabledDate: (time) => {
+          if (Object.keys(endTime).length > 0) {
+            return new Date(endTime).getTime() < time.getTime();
+          } else {
+            return time.getTime() > Date.now();
+          }
         },
-        immediate: true,
-        deep: true,
-      },
+      };
+      if (startTime && endTime) {
+        let startYear = new Date(startTime).getFullYear();
+        let endYear = new Date(endTime).getFullYear();
+        this.tableDataList[index].tdsyqx = endYear - startYear;
+      }
+      this.$emit("upDateTdytxxList", this.tableDataList);
     },
-    methods: {
-      /**
-       * @description: renderHeader
-       * @author: renchao
-       */
-      renderHeader () {
-        return (
-          <div>
-            {" "}
-            {!this.ableOperation ? (
-              "序号"
-            ) : (
-              <i
-                class="el-icon-plus pointer"
-                onClick={() => {
-                  this.addClick();
-                }}
-              ></i>
-            )}
-          </div>
-        );
-      },
-      // 修改事件
-      /**
-       * @description: 修改事件
-       * @author: renchao
-       */
-      addrow () {
-        this.tableDataList = this.tableDataList.map((item) => {
-          return {
-            ...item,
-            yt: this.tdyt,
-          };
-        });
-        this.$emit("upDateTdytxxList", this.tableDataList);
-      },
-      /**
-       * @description: startTime
-       * @param {*} index
-       * @author: renchao
-       */
-      startTime (index) {
-        //  let startTime = this.tableDataList[index].tdsyqssj;
-        let endTime = this.tableDataList[index].jssj;
-        let startTime = this.tableDataList[index].qssj;
-        this.tableDataList[index].pickerEnd = {
-          disabledDate: (time) => {
-            if (Object.keys(startTime).length > 0) {
-              return new Date(startTime).getTime() > time.getTime();
-            } else {
-              return time.getTime() < Date.now();
-            }
-          },
-        };
-        if (
-          Object.keys(startTime).length > 0 &&
-          Object.keys(endTime).length > 0
-        ) {
-          let startYear = new Date(startTime).getFullYear();
-          let endYear = new Date(endTime).getFullYear();
-          this.tableDataList[index].syqx = endYear - startYear;
-        }
-      },
-      /**
-       * @description: endTime
-       * @param {*} index
-       * @author: renchao
-       */
-      endTime (index) {
-        //  let startTime = this.tableDataList[index].tdsyqssj;
-        let startTime = this.tableDataList[index].qssj;
-        let endTime = this.tableDataList[index].jssj;
-        this.tableDataList[index].pickerStart = {
-          disabledDate: (time) => {
-            if (Object.keys(endTime).length > 0) {
-              return new Date(endTime).getTime() < time.getTime();
-            } else {
-              return time.getTime() > Date.now();
-            }
-          },
-        };
-        if (
-          Object.keys(startTime).length > 0 &&
-          Object.keys(endTime).length > 0
-        ) {
-          let startYear = new Date(startTime).getFullYear();
-          let endYear = new Date(endTime).getFullYear();
-          this.tableDataList[index].syqx = endYear - startYear;
-        }
-      },
-      /**
-       * @description: sumTime
-       * @param {*} index
-       * @param {*} syqx
-       * @author: renchao
-       */
-      sumTime (index, syqx) {
-
-        let startTime = this.tableDataList[index].qssj;
-        this.tableDataList[index].jssj =
-          Number(startTime.substring(0, 4)) +
-          Number(syqx) +
-          startTime.slice(4, 19);
-
-      },
-      // 新增
-      /**
-       * @description: 新增
-       * @author: renchao
-       */
-      addClick () {
-        this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
+    /**
+     * @description: sumTime
+     * @param {*} index
+     * @param {*} tdsyqx
+     * @author: renchao
+     */
+    sumTime(index, tdsyqx) {
+      let startTime = this.tableDataList[index].qssj;
+      this.tableDataList[index].jssj =
+        Number(startTime.substring(0, 4)) +
+        Number(tdsyqx) +
+        startTime.slice(4, 19);
+      this.$emit("upDateTdytxxList", this.tableDataList);
+    },
+    // 新增
+    /**
+     * @description: 新增
+     * @author: renchao
+     */
+    addClick() {
+      this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
 
-        this.$emit("upDateTdytxxList", this.tableDataList);
-      },
+      this.$emit("upDateTdytxxList", this.tableDataList);
+    },
 
-      // 删除
-      /**
-       * @description: 删除
-       * @param {*} index
-       * @param {*} row
-       * @author: renchao
-       */
-      deleClick (index, row) {
-        this.$confirm("确定要删除吗, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+    // 删除
+    /**
+     * @description: 删除
+     * @param {*} index
+     * @param {*} row
+     * @author: renchao
+     */
+    deleClick(index, row) {
+      this.$confirm("确定要删除吗, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.tableData.splice(index, 1);
         })
-          .then(() => {
-            this.tableData.splice(index, 1);
-          })
-          .catch(() => { });
-      },
+        .catch(() => {});
+      this.$emit("upDateTdytxxList", this.tableDataList);
     },
-  };
+  },
+};
 </script>
 <style scoped lang="scss">
-  .el-input {
-    border: none !important;
-  }
-  /deep/.el-table__row {
-    border: none !important;
-  }
-  .el-date-editor.el-input {
-    width: 100%;
-  }
-  /deep/.el-table th {
-    height: 30px !important;
-  }
+.el-input {
+  border: none !important;
+}
+/deep/.el-table__row {
+  border: none !important;
+}
+.el-date-editor.el-input {
+  width: 100%;
+}
+/deep/.el-table th {
+  height: 30px !important;
+}
 </style>