Merge branch 'master' of 121.41.102.225:Nidong/jiufang into hw

src/views/Approval/agentOrders.vue

@@ -77,7 +77,7 @@ export default {
         { title: '订单状态', align: 'center', key: 'state', minWidth: 150, },
         { title: '代理商姓名', align: 'center', key: 'salesman', minWidth: 150 },
         { title: '紧急程度', align: 'center', key: 'warning_state', minWidth: 100, slot: 'basicTypeSet', },
-        { title: '小区', align: 'center', key: 'residential_name', minWidth: 200 },
+        { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
         {
           title: '收款', align: 'center', key: 'residential_name', minWidth: 100,
           render: (h, params) => h('span', {}, params.row.pay_state == 0 ? '未收款' : '已收款')

src/views/BasicSettings/Partfield.vue

@@ -116,7 +116,7 @@
                 <vxe-checkbox
                   v-for="_process in processList"
                   :key="_process.id"
-                  :label="_process.id"
+                  :label="_process.id + ''"
                   :content="_process.title"
                 ></vxe-checkbox>
               </vxe-checkbox-group>
@@ -184,7 +184,7 @@ export default {
   created() {
     this.axios.get("/api/basics_properties_index").then((res) => {
       this.processList = res.data.data;
-      this.processList.map((item) => this.process.push(item.id));
+      this.processList.map((item) => this.process.push(item.id + ""));
     });
   },
   methods: {
@@ -205,7 +205,7 @@ export default {
     },
     difference(arr1, arr2) {
       let diff = [];
-      let tmp = arr2;
+      let tmp = JSON.parse(JSON.stringify(arr2));
       arr1.forEach(function(val1) {
         if (arr2.indexOf(val1) < 0) {
           diff.push(val1);
@@ -213,8 +213,6 @@ export default {
           tmp.splice(tmp.indexOf(val1), 1);
         }
       });
-
-      console.log(diff.concat(tmp));
       return diff.concat(tmp);
     },
     changePage(e) {
@@ -235,17 +233,23 @@ export default {
         this.classInfo.title = obj.title;
         this.classInfo.process = this.difference(
           this.process,
-          this.classInfo.process || []
+          obj.process && obj.process.length > 0 ? obj.process : []
         );
         this.classInfo.measure = this.difference(
           this.measure,
-          this.classInfo.measure || []
+          obj.measure && obj.measure.length > 0 ? obj.measure : []
         );
       } else {
         //新增
         this.showType = 1;
-        this.classInfo.process = JSON.parse(JSON.stringify(this.process));
-        this.classInfo.measure = JSON.parse(JSON.stringify(this.measure));
+        this.classInfo.process = this.difference(
+          this.process,
+          this.classInfo.process || []
+        );
+        this.classInfo.measure = this.difference(
+          this.measure,
+          this.classInfo.measure || []
+        );
       }
     },
     postInfo() {

src/views/BidSystem/ContractList/edit.vue

@@ -175,11 +175,11 @@
         </FormItem>
         <FormItem
           v-if="
-            formSetTableData.filter((v) => v.key == 'custom_detail_id')[0]
+            formSetTableData.filter((v) => v.key == 'custom_detail_id')[1]
               .is_show
           "
           :label="
-            formSetTableData.filter((v) => v.key == 'custom_detail_id')[0].title
+            formSetTableData.filter((v) => v.key == 'custom_detail_id')[1].title
           "
         >
           <Select
@@ -463,7 +463,7 @@
       <div class="addAreaTable">
         <Table
           v-show="areaItem.product && areaItem.product.length > 0"
-          :columns="tableColumns"
+          :columns="set_tableColumns"
           :data="areaItem.product"
           max-height="600"
           border
@@ -606,11 +606,29 @@
             >
               <Option :value="1" label="左式" />
               <Option :value="2" label="右式" />
+              <Option :value="0" label="无" />
             </Select>
           </FormItem>
 
           <FormItem label="产品分类">
-            <Select
+            <el-cascader
+              clearable
+              v-model="tempItem.type_id"
+              size="small"
+              style="width: 120px"
+              :show-all-levels="false"
+              :options="PDTTypeList"
+              :props="{
+                expandTrigger: 'hover',
+                children: 'child',
+                value: 'id',
+                label: 'title',
+                checkStrictly: true,
+                emitPath: false,
+              }"
+              @change="(e) => hanndleAddPDTTypeChange(tempItem, e)"
+            ></el-cascader>
+            <!-- <Select
               v-model="tempItem.type_id"
               placeholder="请选择"
               style="width: 120px"
@@ -623,7 +641,7 @@
                 :key="item.value"
                 >{{ item.label }}</Option
               >
-            </Select>
+            </Select> -->
           </FormItem>
           <div
             style="display: contents"
@@ -846,10 +864,28 @@
             >
               <Option :value="1" label="左式" />
               <Option :value="2" label="右式" />
+              <Option :value="0" label="无" />
             </Select>
           </FormItem>
           <FormItem label="产品分类">
-            <Select
+            <el-cascader
+              clearable
+              v-model="PDTEdit.type_id"
+              size="small"
+              style="width: 120px"
+              :show-all-levels="false"
+              :options="PDTEditTypeList"
+              :props="{
+                expandTrigger: 'hover',
+                children: 'child',
+                value: 'id',
+                label: 'title',
+                checkStrictly: true,
+                emitPath: false,
+              }"
+              @change="(e) => hanndleAddPDTTypeChange(PDTEdit, e)"
+            ></el-cascader>
+            <!-- <Select
               v-model="PDTEdit.type_id"
               placeholder="请选择"
               style="width: 120px"
@@ -862,7 +898,7 @@
                 :key="item.value"
                 >{{ item.label }}</Option
               >
-            </Select>
+            </Select> -->
           </FormItem>
           <div
             style="display: contents"
@@ -1282,7 +1318,7 @@ export default {
                 ? "左式"
                 : params.row.left_right_mode == 2
                 ? "右式"
-                : ""
+                : "无"
             );
           },
         },
@@ -1311,7 +1347,13 @@ export default {
           slot: "combine",
           minWidth: 150,
         },
-        { title: "操作", align: "center", slot: "supSet", minWidth: 100 },
+        {
+          title: "操作",
+          key: "set",
+          align: "center",
+          slot: "supSet",
+          minWidth: 100,
+        },
       ],
       supTableData: [], //项目辅料→辅料名称列表
       PDTTypeList: [], // 产品分类列表
@@ -1752,10 +1794,6 @@ export default {
     //获取产品分类下拉列表
     this.axios("/api/parts_product_list").then((res) => {
       this.PDTTypeList = res.data;
-      this.PDTTypeList.forEach((el) => {
-        el.value = el.id;
-        el.label = el.title;
-      });
       this.PDTEditTypeList = this.PDTTypeList;
     });
     //获取基础测量字段列表
@@ -1906,7 +1944,7 @@ export default {
                   ? "左式"
                   : params.row.left_right_mode == 2
                   ? "右式"
-                  : ""
+                  : "无"
               );
             },
           },
@@ -1921,7 +1959,7 @@ export default {
           { title: "备注", key: "remark", align: "center", minWidth: 80 },
           {
             title: "操作",
-            key: "remark",
+            key: "set",
             align: "center",
             slot: "Set",
             minWidth: 120,
@@ -1959,6 +1997,7 @@ export default {
                 .get("/api/order_area_list_product", {
                   params: {
                     order_no: this.$route.query.order_no,
+                    oa_id: this.$route.query.oa_id,
                     area_id: element.id,
                     type: 1,
                   },
@@ -2085,6 +2124,7 @@ export default {
     },
     // 操作table数据 3编辑 4删除
     handleSet(row, index, type, table, areaIndex) {
+      let newmeasureList;
       switch (type) {
         case 3:
           this.PDTEdit = row;
@@ -2105,7 +2145,7 @@ export default {
             ));
 
           //获取属性
-          let newmeasureList = row.measure.split("*");
+          newmeasureList = row.measure.split("*");
           // for (let i in newmeasureList) {
           //   for (let j in this.measureList) {
           //     if (
@@ -2117,27 +2157,29 @@ export default {
           //     }
           //   }
           // }
-          this.axios("/api/basics_product_index", {
-            params: { type_id: this.PDTEdit.type_id },
-          }).then((res) => {
-            this.PDTEdit.tempPDTTypeList = res.data.data[0].measure_id.split(
-              ","
-            );
-            this.PDTEdit.tempMeasureList = JSON.parse(
-              JSON.stringify(this.measureList)
-            );
-            this.PDTEdit.tempMeasureList.forEach((el) => {
-              for (const i in newmeasureList) {
-                const item = newmeasureList[i];
-                if (item.indexOf(el.e_title) != -1) {
-                  this.PDTEdit[el.e_title] = item.substring(1);
+          if (this.PDTEdit.type_id) {
+            this.axios("/api/basics_product_index", {
+              params: { type_id: this.PDTEdit.type_id },
+            }).then((res) => {
+              this.PDTEdit.tempPDTTypeList = res.data.data[0].measure_id.split(
+                ","
+              );
+              this.PDTEdit.tempMeasureList = JSON.parse(
+                JSON.stringify(this.measureList)
+              );
+              this.PDTEdit.tempMeasureList.forEach((el) => {
+                for (const i in newmeasureList) {
+                  const item = newmeasureList[i];
+                  if (item.indexOf(el.e_title) != -1) {
+                    this.PDTEdit[el.e_title] = item.substring(1);
+                  }
                 }
-              }
-              // this.PDTEdit[el.e_title] = "";
+                // this.PDTEdit[el.e_title] = "";
+              });
+              this.PDTEdit = JSON.parse(JSON.stringify(this.PDTEdit));
+              this.$forceUpdate();
             });
-            this.PDTEdit = JSON.parse(JSON.stringify(this.PDTEdit));
-            this.$forceUpdate();
-          });
+          }
           this.showPDTEditModal = true;
           break;
         case 4:
@@ -2270,6 +2312,21 @@ export default {
                 JSON.stringify(this.areaSetTableData)
               );
             }
+            if (
+              res.data.table.productSet &&
+              res.data.table.productSet.length > 0
+            ) {
+              this.productSetTableData = JSON.parse(
+                JSON.stringify(res.data.table.productSet)
+              );
+              this.post_productSetTableData = JSON.parse(
+                JSON.stringify(res.data.table.productSet)
+              );
+            } else {
+              this.post_productSetTableData = JSON.parse(
+                JSON.stringify(this.productSetTableData)
+              );
+            }
           }
         });
     },
@@ -2285,6 +2342,7 @@ export default {
           result: {
             formSet: this.post_formSetTableData,
             areaSet: this.post_areaSetTableData,
+            productSet: this.post_productSetTableData,
           },
         },
       }).then((res) => {
@@ -2442,6 +2500,7 @@ export default {
                 .get("/api/order_area_list_product", {
                   params: {
                     order_no: this.$route.query.order_no,
+                    oa_id: this.$route.query.oa_id,
                     area_id: item.id,
                     type: 1,
                   },
@@ -2478,6 +2537,7 @@ export default {
           .get("/api/order_area_list_product", {
             params: {
               order_no: this.$route.query.order_no,
+              oa_id: this.$route.query.oa_id,
               area_id: item.id,
               type: 1,
             },
@@ -2575,15 +2635,24 @@ export default {
     // 产品分类选择→对应不同测量字段
     hanndleAddPDTTypeChange(item, e) {
       e &&
-        this.axios("/api/basics_product_index", {
-          params: { type_id: e },
+        this.axios("/api/basics_product_detail", {
+          params: { id: e },
         }).then((res) => {
-          item.tempPDTTypeList = res.data.data[0].measure_id.split(",");
-          item.tempMeasureList = JSON.parse(JSON.stringify(this.measureList));
-          item.tempMeasureList.forEach((el) => {
-            item[el.e_title] = "";
-          });
-          this.$forceUpdate();
+          if (res.code == 200) {
+            if (res.data.measure_id.length>0) {
+              item.tempPDTTypeList = res.data.measure_id
+              item.tempMeasureList = JSON.parse(
+                JSON.stringify(this.measureList)
+              );
+              item.tempMeasureList.forEach((el) => {
+                item[el.e_title] = "";
+              });
+            } else {
+              item.tempPDTTypeList = [];
+              item.tempMeasureList = [];
+            }
+            this.$forceUpdate();
+          }
         });
       // basics_measure_index
     },
@@ -2686,7 +2755,7 @@ export default {
                 ? "左式"
                 : params.row.left_right_mode == 2
                 ? "右式"
-                : ""
+                : "无"
             );
           },
         },
@@ -2701,7 +2770,7 @@ export default {
         { title: "备注", key: "remark", align: "center", minWidth: 80 },
         {
           title: "操作",
-          key: "remark",
+          key: "set",
           align: "center",
           slot: "Set",
           minWidth: 120,
@@ -2739,7 +2808,17 @@ export default {
     },
   },
   // 监听属性 类似于data概念
-  computed: {},
+  computed: {
+    set_tableColumns() {
+      if (this.productSetTableData.length < 1) {
+        return this.tableColumns;
+      }
+      return this.func.computedHeader(
+        this.productSetTableData,
+        this.tableColumns
+      );
+    },
+  },
   // 监控data中的数据变化
   watch: {},
   beforeCreate() {}, // 生命周期 - 创建之前
@@ -2942,4 +3021,8 @@ export default {
 /deep/.ivu-table-fixed-body {
   padding-bottom: 20px;
 }
+/deep/.el-input--small .el-input__inner {
+  height: 24px;
+  line-height: 24px;
+}
 </style>

src/views/BidSystem/ContractList/info.vue

@@ -157,19 +157,18 @@
               >收缩</Button
             > -->
             <Button
-              @click="handleOpenModal"
+              @click="handleOpenModal(areaItem.id)"
               size="small"
               type="primary"
               style="margin-right:10px"
-              v-show="areaItem.product && areaItem.product.length > 0"
               >下深化</Button
             >
-            <Button
+            <!-- <Button
               size="small"
               type="primary"
               v-show="areaItem.isAllDeeped && areaItem.product.length > 0"
               >已下深化</Button
-            >
+            > -->
           </div>
           <div class="addAreaForm">
             <Form :label-width="100" :model="areaItem" style="width: 60%">
@@ -211,7 +210,7 @@
             >
               <template slot="set" slot-scope="{ row, index }">
                 <a
-                  :disabled="row.sub_state == 1"
+                  :disabled="row.sub_state >= 1"
                   @click="handleRowDeep(row, index)"
                   >下深化</a
                 >
@@ -336,8 +335,9 @@
                   size="small"
                   style="width:120px"
                 >
-                  <Option label="已下深化" :value="1"></Option>
-                  <Option label="未下深化" :value="0"></Option>
+                  <Option label="未下深化" :value="1"></Option>
+                  <Option label="深化中" :value="1"></Option>
+                  <Option label="深化完成" :value="0"></Option>
                 </Select>
               </FormItem>
               <FormItem>
@@ -438,7 +438,7 @@
           >
             <template slot="set" slot-scope="{ row, index }">
               <a
-                :disabled="row.sub_state == 1"
+                :disabled="row.sub_state >= 1"
                 @click="handleRowDeep(row, index)"
                 >下深化</a
               >
@@ -478,8 +478,12 @@
                 :label="item.title"
               ></Option>
             </Select> -->
-            <span v-for="_item in combineList" :key="_item.id" v-show="_item.id==supTableData[index].id">
-              {{_item.title}}
+            <span
+              v-for="_item in combineList"
+              :key="_item.id"
+              v-show="_item.id == supTableData[index].id"
+            >
+              {{ _item.title }}
             </span>
           </template>
           <template slot="supSet" slot-scope="{ row, index }">
@@ -822,7 +826,7 @@ export default {
           align: "center",
           minWidth: 80,
           render: (h, params) => {
-            return h("span", {}, params.row.sub_state == 1 ? "是" : "否");
+            return h("span", {}, params.row.sub_state >= 1 ? "是" : "否");
           },
         },
         {
@@ -888,8 +892,7 @@ export default {
             let url = row.url ? row.url : [];
             return h("img", {
               attrs: {
-                src:
-                  url.length > 0 ? this.$store.state.ip + url[0].img_url : "",
+                src: url.length > 0 ? this.$store.state.ip + url[0] : "",
                 style:
                   "max-width:50px;max-height:50px;position:relative;top:3px;",
               },
@@ -901,7 +904,7 @@ export default {
                   row.url.forEach((el) => {
                     list.push({ img_url: el });
                   });
-                  console.log('row.url :>> ', row.url);
+                  console.log("row.url :>> ", row.url);
                   this.$previewImg({
                     list,
                     baseUrl: this.$store.state.ip,
@@ -932,7 +935,11 @@ export default {
             return h(
               "span",
               {},
-              params.row.sub_state == 1 ? "已下深化" : "未下深化"
+              params.row.sub_state == 0
+                ? "未下深化"
+                : params.row.sub_state == 1
+                ? "深化中"
+                : "深化完成"
             );
           },
         },
@@ -1136,6 +1143,8 @@ export default {
       area_title_list: [],
       product_title_list: [],
       url_number_list: [],
+      is_area_deep: false,
+      order_area_id: null,
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -1220,6 +1229,7 @@ export default {
         url: "/api/order_area_list",
         params: {
           order_no,
+          oa_id: this.$route.query.oa_id || "",
           type: 1,
         },
       }).then((res) => {
@@ -1363,7 +1373,7 @@ export default {
               align: "center",
               minWidth: 80,
               render: (h, params) => {
-                return h("span", {}, params.row.sub_state == 1 ? "是" : "否");
+                return h("span", {}, params.row.sub_state >= 1 ? "是" : "否");
               },
             },
             {
@@ -1596,7 +1606,7 @@ export default {
           align: "center",
           minWidth: 80,
           render: (h, params) => {
-            return h("span", {}, params.row.sub_state == 1 ? "是" : "否");
+            return h("span", {}, params.row.sub_state >= 1 ? "是" : "否");
           },
         },
         {
@@ -1642,6 +1652,7 @@ export default {
         .get("/api/order_area_detail_list?", {
           params: {
             order_no: this.$route.query.order_no,
+            oa_id: this.$route.query.oa_id || "",
             ...this.searchData,
             type: 1,
           },
@@ -1673,11 +1684,19 @@ export default {
     handleSelection(selection) {
       this.selected = selection;
     },
-    handleOpenModal() {
-      if (this.selected.length < 1) {
-        this.$Message.warning("请选择数据");
-      } else {
+    handleOpenModal(order_area_id) {
+      if (typeof order_area_id == "number") {
+        this.is_area_deep = true;
+        this.order_area_id = order_area_id;
         this.processModal = true;
+      } else {
+        this.is_area_deep = false;
+        this.order_area_id = null;
+        if (this.selected.length < 1) {
+          this.$Message.warning("请选择数据");
+        } else {
+          this.processModal = true;
+        }
       }
     },
     handleRowDeep(row) {
@@ -1685,43 +1704,70 @@ export default {
     },
     handleProcess() {
       if (this.process_man) {
-        let flag = true;
-        this.selected.map((item) => {
-          if (item.sub_state > 1) {
-            flag = false;
-          }
-        });
-        if (!flag) {
-          this.$Message.warning("选择数据中存在已下深化产品，请重新选择");
+        if (this.is_area_deep) {
+          this.axios
+            .get("/api/order_area_deep_pull", {
+              params: {
+                order_no: this.order_no,
+                type: 1,
+                sub_state: 1,
+                order_area_id: this.order_area_id,
+                process_man: this.process_man,
+                process_start_time: this.process_start_time
+                  ? this.func.replaceDateNoHMS(this.process_start_time)
+                  : "",
+                process_end_time: this.process_end_time
+                  ? this.func.replaceDateNoHMS(this.process_end_time)
+                  : "",
+              },
+            })
+            .then((res) => {
+              if (res.code == 200) {
+                this.$Message.success(res.msg);
+                this.processModal = false;
+                this.getListData();
+                this.initData(this.$route.query.order_no);
+              }
+            });
         } else {
-          const order_area_product_id = this.selected.map(
-            (item) => item.order_area_product_id || item.id
-          );
-          this.axios({
-            method: "get",
-            url: "/api/order_area_detail_pull",
-            params: {
-              order_no: this.order_no,
-              type: 1,
-              sub_state: 1,
-              order_area_product_id,
-              process_man: this.process_man,
-              process_start_time: this.process_start_time
-                ? this.func.replaceDateNoHMS(this.process_start_time)
-                : "",
-              process_end_time: this.process_end_time
-                ? this.func.replaceDateNoHMS(this.process_end_time)
-                : "",
-            },
-          }).then((res) => {
-            if (res.code == 200) {
-              this.$Message.success(res.msg);
-              this.selected = [];
-              this.processModal = false;
-              this.getListData();
-              this.initData(this.$route.query.order_no);
+          let flag = true;
+          this.selected.map((item) => {
+            if (item.sub_state > 1) {
+              flag = false;
             }
           });
+          if (!flag) {
+            this.$Message.warning("选择数据中存在已下深化产品，请重新选择");
+          } else {
+            const order_area_product_id = this.selected.map(
+              (item) => item.order_area_product_id || item.id
+            );
+            this.axios({
+              method: "get",
+              url: "/api/order_area_detail_pull",
+              params: {
+                order_no: this.order_no,
+                type: 1,
+                sub_state: 1,
+                order_area_product_id,
+                process_man: this.process_man,
+                process_start_time: this.process_start_time
+                  ? this.func.replaceDateNoHMS(this.process_start_time)
+                  : "",
+                process_end_time: this.process_end_time
+                  ? this.func.replaceDateNoHMS(this.process_end_time)
+                  : "",
+              },
+            }).then((res) => {
+              if (res.code == 200) {
+                this.$Message.success(res.msg);
+                this.selected = [];
+                this.processModal = false;
+                this.getListData();
+                this.initData(this.$route.query.order_no);
+              }
+            });
+          }
         }
       } else {
         this.$Message.warning("请选择人员");
@@ -1756,6 +1802,7 @@ export default {
           .get("/api/order_area_list_product", {
             params: {
               order_no: this.$route.query.order_no,
+              oa_id: this.$route.query.oa_id || "",
               area_id: item.id,
               type: 1,
             },
@@ -1796,6 +1843,7 @@ export default {
           .get("/api/order_area_list_product", {
             params: {
               order_no: this.$route.query.order_no,
+              oa_id: this.$route.query.oa_id || "",
               area_id: item.id,
               type: 1,
             },

src/views/BidSystem/ContractList/list.vue

@@ -70,20 +70,20 @@
         <div>
           <a
             style="margin: 0 5px"
-            :disabled="row.sub_status>1"
+            :disabled="row.top_status >= 1"
             @click="handleSet(row, index, 1)"
             >深化</a
           >
           <a
             style="margin: 0 5px"
-            :disabled="row.sub_status != 0"
+            :disabled="row.top_status != 0"
             @click="handleSet(row, index, 2)"
             >编辑</a
           >
           <a style="margin: 0 5px" @click="handleSet(row, index, 3)">详情</a>
           <a
             style="margin: 0 5px"
-            :disabled="row.sub_status != 0"
+            :disabled="row.top_status != 0"
             @click="handleSet(row, index, 4)"
             >删除</a
           >
@@ -255,28 +255,28 @@ export default {
         {
           title: "订单状态",
           align: "center",
-          key: "sub_status",
+          key: "top_status",
           minWidth: 100,
           // { label: "安装", value: 16 },
           render: (h, params) =>
             h(
               "span",
               {},
-              params.row.sub_status == 0
+              params.row.top_status == 0
                 ? "订单制作中"
-                : params.row.sub_status == 1
+                : params.row.top_status == 1
                 ? "深化中"
-                : params.row.sub_status == 2
+                : params.row.top_status == 2
                 ? "拆单中"
-                : params.row.sub_status == 3
+                : params.row.top_status == 3
                 ? "生产订单"
-                : params.row.sub_status == 4
+                : params.row.top_status == 4
                 ? "计划订单"
-                : params.row.sub_status == 5
+                : params.row.top_status == 5
                 ? "派工订单"
-                : params.row.sub_status == 6
+                : params.row.top_status == 6
                 ? "已完成"
-                : params.row.sub_status == 99
+                : params.row.top_status == 99
                 ? "全部"
                 : "订单制作中"
             ),
@@ -390,7 +390,12 @@ export default {
           title: "客户姓名",
         },
         { is_show: true, key: "mobile", value: "手机号", title: "手机号" },
-        { is_show: true, key: "sub_status", value: "订单状态", title: "订单状态" },
+        {
+          is_show: true,
+          key: "top_status",
+          value: "订单状态",
+          title: "订单状态",
+        },
         {
           is_show: true,
           key: "warning_state",
@@ -497,7 +502,12 @@ export default {
           value: "交付日期",
           title: "交付日期",
         },
-        { is_show: true, key: "sub_status", value: "订单状态", title: "订单状态" },
+        {
+          is_show: true,
+          key: "top_status",
+          value: "订单状态",
+          title: "订单状态",
+        },
         {
           is_show: true,
           key: "crt_time",
@@ -559,6 +569,7 @@ export default {
             query: {
               type,
               order_no: row.order_no,
+              oa_id: row.oa_id,
             },
           });
           break;
@@ -568,6 +579,7 @@ export default {
             query: {
               type,
               order_no: row.order_no,
+              oa_id: row.oa_id,
             },
           });
           break;
@@ -606,6 +618,9 @@ export default {
       row.page_size = this.page_size;
       // 0 业务单
       // row.sub_status = 0;
+      if (!row.top_status && row.top_status != 0) {
+        row.top_status = 99;
+      }
       this.proxyObj = row;
       this.getData(row);
     },
@@ -752,10 +767,9 @@ export default {
           title: "订单状态",
           name: "Select",
           placeholder: "请选择订单状态",
-          serverName: "sub_status",
-          value: "",
+          serverName: "top_status",
+          value: 99,
           option: [
-            { label: "全部", value: 99 },
             { label: "订单制作中", value: 0 },
             { label: "深化中", value: 1 },
             { label: "拆单中", value: 2 },

src/views/BidSystem/DeepeningOrder/approvalDetail.vue

@@ -25,7 +25,7 @@
       <div class="info_wrapper">
         <div class="info">
           <div class="info_item"><span>订单号:</span><span>{{orderInfo.order_no}}</span></div>
-          <div class="info_item"><span>小区名称:</span><span>{{orderInfo.residential_name}}</span></div>
+          <div class="info_item"><span>项目名称:</span><span>{{orderInfo.residential_name}}</span></div>
           <div class="info_item"><span>客户姓名:</span><span>{{orderInfo.client_name}}</span></div>
           <div class="info_item"><span>紧急程度:</span><span v-for="_item in warningList"
                   :key="_item.id"

src/views/BidSystem/DeepeningOrder/approvalProductDetail.vue

@@ -2,42 +2,71 @@
   <div>
     <Toptitle title="深化单审批产品详情">
       <slot name="titleButton">
-        <Button @click="goback()"
-                type="primary"
-                style="margin-right:10px;">返回</Button>
+        <Button @click="goback()" type="primary" style="margin-right:10px;"
+          >返回</Button
+        >
       </slot>
     </Toptitle>
     <div class="body">
-      <div class="header">
-      </div>
+      <div class="header"></div>
       <div class="info_wrapper">
         <div class="info">
-          <div class="info_item"><span>区域编码: </span><span>{{orderInfo.area_num}}</span></div>
-          <div class="info_item"><span>区域名称: </span><span>{{orderInfo.area_title}}</span></div>
-          <div class="info_item"><span>产品名称: </span><span>{{orderInfo.title}}</span></div>
-          <div class="info_item"><span>数量: </span><span>{{orderInfo.num}}</span></div>
-          <div class="info_item"><span>规格: </span><span>{{orderInfo.measure}}</span></div>
-          <div class="info_item"><span>工艺属性: </span><span>{{orderInfo.process_property}}</span></div>
-          <div class="info_item"><span>图号: </span><span>{{orderInfo.url_number}}</span></div>
-          <div class="info_item"><span>图纸: </span><span>{{orderInfo.url}}</span></div>
-          <div class="info_item"><span>左右式: </span><span>{{orderInfo.end_time}}</span></div>
-          <div class="info_item"><span>价格: </span><span>{{orderInfo.price}}</span></div>
-          <div class="info_item"><span>备注: </span><span>{{orderInfo.remark}}</span></div>
+          <div class="info_item">
+            <span>区域编码: </span><span>{{ orderInfo.area_num }}</span>
+          </div>
+          <div class="info_item">
+            <span>区域名称: </span><span>{{ orderInfo.area_title }}</span>
+          </div>
+          <div class="info_item">
+            <span>产品名称: </span><span>{{ orderInfo.title }}</span>
+          </div>
+          <div class="info_item">
+            <span>数量: </span><span>{{ orderInfo.num }}</span>
+          </div>
+          <div class="info_item">
+            <span>规格: </span><span>{{ orderInfo.measure }}</span>
+          </div>
+          <div class="info_item">
+            <span>工艺属性: </span><span>{{ orderInfo.process_property }}</span>
+          </div>
+          <div class="info_item">
+            <span>图号: </span><span>{{ orderInfo.url_number }}</span>
+          </div>
+          <div class="info_item">
+            <span>图纸: </span><span>{{ orderInfo.url }}</span>
+          </div>
+          <div class="info_item">
+            <span>左右式: </span
+            ><span>{{
+              orderInfo.left_right_mode == 1
+                ? "左式"
+                : orderInfo.left_right_mode == 2
+                ? "右式"
+                : "无"
+            }}</span>
+          </div>
+          <div class="info_item">
+            <span>价格: </span><span>{{ orderInfo.price }}</span>
+          </div>
+          <div class="info_item">
+            <span>备注: </span><span>{{ orderInfo.remark }}</span>
+          </div>
         </div>
       </div>
       <div class="content">
-        <div class="content_header">
-        </div>
+        <div class="content_header"></div>
         <div class="addArea">
           <div class="addAreaTable">
-            <Table :columns="tableColumns"
-                   :data="tableData"
-                   max-height="600"
-                   border>
-              <template slot="Set"
-                        slot-scope="{row,index}">
-                <a style="margin:0 5px"
-                   @click="handleSet(row,index,3)">详情</a>
+            <Table
+              :columns="tableColumns"
+              :data="tableData"
+              max-height="600"
+              border
+            >
+              <template slot="Set" slot-scope="{ row, index }">
+                <a style="margin:0 5px" @click="handleSet(row, index, 3)"
+                  >详情</a
+                >
               </template>
             </Table>
           </div>
@@ -52,102 +81,145 @@
 // 例如：import 《组件名称》 from '《组件路径》';
 
 export default {
-  name: '',
-  components: {
-
-  },
+  name: "",
+  components: {},
   props: {},
   // import引入的组件需要注入到对象中才能使用
-  data () {
+  data() {
     // 这里存放数据
     return {
       setpContent: [],
       orderInfo: {},
       type: null,
       tableColumns: [
-        { title: '序号', type: 'index', key: '', align: 'center', minWidth: 80 },
-        { title: '楼栋', key: 'house', align: 'center', tooltip: true, minWidth: 100 },
-        { title: '楼单元', key: 'unit', align: 'center', minWidth: 80 },
-        { title: '楼层', key: 'layer', align: 'center', minWidth: 80 },
-        { title: '房间号', key: 'room', align: 'center', tooltip: true, minWidth: 140 },
-        { title: '产品', key: 'title', align: 'center', tooltip: true, minWidth: 120 },
-        { title: '价格', key: 'price', align: 'center', minWidth: 80 },
-        { title: '计量单位', key: 'unit', align: 'center', minWidth: 80 },
-        { title: '位置', key: 'price', align: 'center', minWidth: 80 },
         {
-          title: '图纸', align: 'center', key: 'url', minWidth: 100,
+          title: "序号",
+          type: "index",
+          key: "",
+          align: "center",
+          minWidth: 80,
+        },
+        {
+          title: "楼栋",
+          key: "house",
+          align: "center",
+          tooltip: true,
+          minWidth: 100,
+        },
+        { title: "楼单元", key: "unit", align: "center", minWidth: 80 },
+        { title: "楼层", key: "layer", align: "center", minWidth: 80 },
+        {
+          title: "房间号",
+          key: "room",
+          align: "center",
+          tooltip: true,
+          minWidth: 140,
+        },
+        {
+          title: "产品",
+          key: "title",
+          align: "center",
+          tooltip: true,
+          minWidth: 120,
+        },
+        { title: "价格", key: "price", align: "center", minWidth: 80 },
+        { title: "计量单位", key: "unit", align: "center", minWidth: 80 },
+        { title: "位置", key: "price", align: "center", minWidth: 80 },
+        {
+          title: "图纸",
+          align: "center",
+          key: "url",
+          minWidth: 100,
           render: (h, params) => {
-            const { row } = params
-            let url = row.url ? row.url : []
-            return h('img', {
+            const { row } = params;
+            let url = row.url ? row.url : [];
+            return h("img", {
               attrs: {
                 src: this.$store.state.ip + url[0],
-                style: 'max-width:50px;max-height:50px;position:relative;top:3px;'
+                style:
+                  "max-width:50px;max-height:50px;position:relative;top:3px;",
               },
               on: {
                 click: (e) => {
                   // this.axios('/api/orders_img', { params: { id: row.id, type: 1 } }).then(res => {
                   // row.imgs = res.data
-                  let list = []
-                  url.length > 0 && url.forEach(el => {
-                    list.push({ img_url: el })
-                  });
+                  let list = [];
+                  url.length > 0 &&
+                    url.forEach((el) => {
+                      list.push({ img_url: el });
+                    });
                   this.$previewImg({
                     list,
                     baseUrl: this.$store.state.ip,
-                    baseImgField: 'img_url',
-                    baseTitleField: ''
-                  })
+                    baseImgField: "img_url",
+                    baseTitleField: "",
+                  });
                   // })
-                }
-              }
-            })
-          }
+                },
+              },
+            });
+          },
+        },
+        {
+          title: "图号",
+          key: "url_number",
+          align: "center",
+          tooltip: true,
+          minWidth: 80,
+        },
+        { title: "型号", key: "remark", align: "center", minWidth: 80 },
+        {
+          title: "操作",
+          key: "remark",
+          align: "center",
+          slot: "Set",
+          minWidth: 120,
         },
-        { title: '图号', key: 'url_number', align: 'center', tooltip: true, minWidth: 80 },
-        { title: '型号', key: 'remark', align: 'center', minWidth: 80 },
-        { title: '操作', key: 'remark', align: 'center', slot: 'Set', minWidth: 120 },
       ],
       tableData: [],
-    }
+    };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
-  created () {
-    let id = this.$route.query.currency_type
-    this.type = id == 78 ? 3 : id == 74 ? 1 : id == 82 ? 2 : ''
+  created() {
+    let id = this.$route.query.currency_type;
+    this.type = id == 78 ? 3 : id == 74 ? 1 : id == 82 ? 2 : "";
   },
   // 生命周期 - 挂载完成（可以访问DOM元素）
-  mounted () {
+  mounted() {
     this.axios({
-      method: 'get',
-      url: '/api/order_price_oa_take_product_detail',
+      method: "get",
+      url: "/api/order_price_oa_take_product_detail",
       params: {
-        oa_id: this.$route.query.oa_id
-      }
-    }).then((res) => {
-      this.orderInfo = res.data
-      this.tableData = res.data.product
-    }).catch((err) => { });
+        oa_id: this.$route.query.oa_id,
+      },
+    })
+      .then((res) => {
+        this.orderInfo = res.data;
+        this.tableData = res.data.product;
+      })
+      .catch((err) => {});
   },
   methods: {
-    handleSet () { },
-    goback () { this.$router.go(-1) },
+    handleSet() {},
+    goback() {
+      this.$router.go(-1);
+    },
   },
   // 监听属性 类似于data概念
   computed: {},
   // 监控data中的数据变化
   watch: {},
-  beforeCreate () { }, // 生命周期 - 创建之前
-  beforeMount () { }, // 生命周期 - 挂载之前
-  beforeUpdate () { }, // 生命周期 - 更新之前
-  updated () { }, // 生命周期 - 更新之后
-  beforeDestroy () { }, // 生命周期 - 销毁之前
-  destroyed () { }, // 生命周期 - 销毁完成
-  activated () { }, // 如果页面有keep-alive缓存功能，这个函数会触发
-}
+  beforeCreate() {}, // 生命周期 - 创建之前
+  beforeMount() {}, // 生命周期 - 挂载之前
+  beforeUpdate() {}, // 生命周期 - 更新之前
+  updated() {}, // 生命周期 - 更新之后
+  beforeDestroy() {}, // 生命周期 - 销毁之前
+  destroyed() {}, // 生命周期 - 销毁完成
+  activated() {}, // 如果页面有keep-alive缓存功能，这个函数会触发
+};
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .body {
   margin-top: 10px;
   .header {

src/views/BidSystem/DeepeningOrder/compare.vue

@@ -10,7 +10,7 @@
     </Toptitle>
     <div class="top_info">
       <div><span>订单号:</span>{{formData.order_no}}</div>
-      <div><span>小区名称:</span>{{formData.order_no}}</div>
+      <div><span>项目名称:</span>{{formData.order_no}}</div>
       <div><span>客户姓名:</span>{{formData.order_no}}</div>
       <div><span>紧急程度:</span><span v-for="_item in warningList"
               :key="_item.id"

src/views/BidSystem/DeepeningOrder/detail.vue

@@ -73,7 +73,7 @@
             ><span style="font-weight:bold">{{ formData.order_no }}</span>
           </div>
           <div>
-            <span>小区名称:</span
+            <span>项目名称:</span
             ><span style="font-weight:bold">{{
               formData.residential_name
             }}</span>
@@ -214,7 +214,7 @@
                 <template slot="set" slot-scope="{ row, index }">
                   <a
                     style="margin:0 5px"
-                    :disabled="row.sub_state == 2"
+                    :disabled="row.status == 1"
                     @click="handleSet(row, index, 1, item)"
                     >深化</a
                   >
@@ -401,12 +401,12 @@
             border
           >
             <template slot="statusSlot" slot-scope="{ row }">
-              {{ row.sub_state == 2 ? "已完成" : "未完成" }}
+              {{ row.status == 1 ? "已完成" : "未完成" }}
             </template>
             <template slot="set" slot-scope="{ row, index }">
               <a
                 style="margin:0 5px"
-                :disabled="row.sub_state == 2"
+                :disabled="row.status == 1"
                 @click="handleSet(row, index, 1, formData)"
                 >深化</a
               >
@@ -553,10 +553,28 @@
             >
               <Option :value="1" label="左式" />
               <Option :value="2" label="右式" />
+              <Option :value="0" label="无" />
             </Select>
           </FormItem>
           <FormItem label="产品分类">
-            <Select
+            <el-cascader
+              clearable
+              v-model="item.type_id"
+              size="small"
+              style="width: 120px"
+              :show-all-levels="false"
+              :options="PDTTypeList"
+              :props="{
+                expandTrigger: 'hover',
+                children: 'child',
+                value: 'id',
+                label: 'title',
+                checkStrictly: true,
+                emitPath: false,
+              }"
+              @change="(e) => hanndleAddPDTTypeChange(item, e)"
+            ></el-cascader>
+            <!-- <Select
               v-model="item.type_id"
               placeholder="请选择"
               style="width:120px"
@@ -570,7 +588,7 @@
                 :key="item.value"
                 >{{ item.label }}</Option
               >
-            </Select>
+            </Select> -->
           </FormItem>
           <div
             style="display:contents"
@@ -805,7 +823,7 @@ export default {
                 ? "左式"
                 : params.row.left_right_mode == 2
                 ? "右式"
-                : ""
+                : "无"
             );
           },
         },
@@ -936,7 +954,7 @@ export default {
                 ? "左式"
                 : params.row.left_right_mode == 2
                 ? "右式"
-                : ""
+                : "无"
             );
           },
         },
@@ -961,6 +979,7 @@ export default {
       area_title_list: [],
       product_title_list: [],
       url_number_list: [],
+      oa_id: this.$route.query.oa_id || "",
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -997,7 +1016,7 @@ export default {
     this.axios("/api/basics_measure_index").then((res) => {
       this.measureList = res.data.data;
     });
-    this.initData(this.formData.order_no, this.tempPDTIndex);
+    this.initData(this.formData.order_no, this.tempPDTIndex, this.oa_id);
   },
   methods: {
     handleSelection(selection) {
@@ -1010,6 +1029,7 @@ export default {
             order_no: this.$route.query.order_no,
             ...this.searchData,
             type: 2,
+            oa_id: this.oa_id,
           },
         })
         .then((res) => {
@@ -1053,13 +1073,14 @@ export default {
     onProgress(e) {
       console.log(e);
     },
-    initData(order_no, curIndex) {
+    initData(order_no, curIndex, oa_id) {
       this.axios({
         method: "get",
         url: "/api/order_area_list",
         params: {
           order_no,
           type: 2,
+          oa_id,
         },
       }).then((res) => {
         this.formData = res.data;
@@ -1149,7 +1170,7 @@ export default {
                   ? "左式"
                   : params.row.left_right_mode == 2
                   ? "右式"
-                  : ""
+                  : "无"
               );
             },
           },
@@ -1352,6 +1373,7 @@ export default {
                 .get("/api/order_area_list_product", {
                   params: {
                     order_no: this.$route.query.order_no,
+                    oa_id: this.$route.query.oa_id,
                     area_id: item.id,
                     type: 2,
                   },
@@ -1388,6 +1410,7 @@ export default {
           .get("/api/order_area_list_product", {
             params: {
               order_no: this.$route.query.order_no,
+              oa_id: this.$route.query.oa_id,
               area_id: item.id,
               type: 2,
             },
@@ -1433,7 +1456,11 @@ export default {
             }).then((res) => {
               if (res.code == 200) {
                 this.$Message.success(res.msg);
-                this.initData(this.formData.order_no, this.tempPDTIndex);
+                this.initData(
+                  this.formData.order_no,
+                  this.tempPDTIndex,
+                  this.oa_id
+                );
               }
             });
           },
@@ -1504,13 +1531,14 @@ export default {
         url: "/api/order_area_deep_add",
         data: {
           order_no: this.formData.order_no,
+          oa_id: this.$route.query.oa_id,
           order_area_id: this.order_area_id,
           ...this.tempPDTList[0],
         },
       }).then((res) => {
         this.$Message.success(res.msg);
         this.showPDTModal = false;
-        this.initData(this.formData.order_no, this.tempPDTIndex);
+        this.initData(this.formData.order_no, this.tempPDTIndex, this.oa_id);
       });
       // this.tempPDTList = [
       //   {
@@ -1571,15 +1599,25 @@ export default {
     },
     // 产品分类选择→对应不同测量字段
     hanndleAddPDTTypeChange(item, e) {
-      this.axios("/api/basics_product_index", {
-        params: { title: e.label },
-      }).then((res) => {
-        item.tempPDTTypeList = res.data.data[0].measure_id.split(",");
-        item.tempMeasureList = this.measureList;
-        this.measureList.forEach((el) => {
-          item[el.e_title] = "";
+      e &&
+        this.axios("/api/basics_product_detail", {
+          params: { id: e },
+        }).then((res) => {
+          if (res.code == 200) {
+            if (res.data.measure_id.length > 0) {
+              item.tempPDTTypeList = res.data.measure_id;
+              item.tempMeasureList = JSON.parse(
+                JSON.stringify(this.measureList)
+              );
+              this.measureList.forEach((el) => {
+                item[el.e_title] = "";
+              });
+            } else {
+              item.tempPDTTypeList = [];
+              item.tempMeasureList = [];
+            }
+          }
         });
-      });
       // basics_measure_index
     },
     handleImgClick(e, row) {
@@ -1721,7 +1759,6 @@ export default {
 }
 .addPDTFormModal {
   /deep/ .ivu-modal-body {
-    height: 400px;
     overflow: hidden;
     overflow-y: auto;
   }
@@ -1831,4 +1868,8 @@ export default {
   display: flex;
   justify-content: center;
 }
+/deep/.el-input--small .el-input__inner {
+  height: 24px;
+  line-height: 24px;
+}
 </style>

src/views/BidSystem/DeepeningOrder/edit.vue

@@ -41,7 +41,13 @@
       </div>
       <div>
         <span>左右式:</span
-        >{{ formData.left_right_mode == 1 ? "左式" : "右式" }}
+        >{{
+          formData.left_right_mode == 1
+            ? "左式"
+            : formData.left_right_mode == 2
+            ? "右式"
+            : "无"
+        }}
       </div>
       <!-- <div><span>价格:</span>{{ formData.price }}</div> -->
       <div><span>备注:</span>{{ formData.remark }}</div>

src/views/BidSystem/DeepeningOrder/info.vue

@@ -52,7 +52,7 @@
             ><span style="font-weight:bold">{{ formData.order_no }}</span>
           </div>
           <div>
-            <span>小区名称:</span
+            <span>项目名称:</span
             ><span style="font-weight:bold">{{
               formData.residential_name
             }}</span>
@@ -181,7 +181,7 @@
                   </span>
                 </template>
                 <template slot="statusSlot" slot-scope="{ row }">
-                  {{ row.sub_state == 2 ? "已完成" : "未完成" }}
+                  {{ row.sub_state >= 2 ? "已完成" : "未完成" }}
                 </template>
                 <template slot="set" slot-scope="{ row, index }">
                   <a
@@ -208,44 +208,68 @@
               class="top_search_form"
             >
               <FormItem label="区域编码:">
-                <Input
-                  type="text"
-                  size="small"
+                <Select
+                  filterable
                   clearable
                   v-model="searchData.area_no"
-                  placeholder="请输入区域编码"
-                  style="width: 120px"
-                />
+                  size="small"
+                  style="width:120px"
+                >
+                  <Option
+                    v-for="(_item, _index) in area_no_list"
+                    :key="_index"
+                    :label="_item"
+                    :value="_item"
+                  ></Option>
+                </Select>
               </FormItem>
               <FormItem label="区域名称:">
-                <Input
-                  type="text"
-                  size="small"
+                <Select
+                  filterable
                   clearable
                   v-model="searchData.area_title"
-                  placeholder="请输入区域名称"
-                  style="width: 120px"
-                />
+                  size="small"
+                  style="width:120px"
+                >
+                  <Option
+                    v-for="(_item, _index) in area_title_list"
+                    :key="_index"
+                    :label="_item"
+                    :value="_item"
+                  ></Option>
+                </Select>
               </FormItem>
               <FormItem label="产品名称:">
-                <Input
-                  type="text"
-                  size="small"
+                <Select
+                  filterable
                   clearable
                   v-model="searchData.product_title"
-                  placeholder="请输入产品名称"
-                  style="width: 120px"
-                />
+                  size="small"
+                  style="width:120px"
+                >
+                  <Option
+                    v-for="(_item, _index) in product_title_list"
+                    :key="_index"
+                    :label="_item"
+                    :value="_item"
+                  ></Option>
+                </Select>
               </FormItem>
               <FormItem label="图号:">
-                <Input
-                  type="text"
-                  size="small"
+                <Select
+                  filterable
                   clearable
                   v-model="searchData.url_number"
-                  placeholder="请输入图号"
-                  style="width: 120px"
-                />
+                  size="small"
+                  style="width:120px"
+                >
+                  <Option
+                    v-for="(_item, _index) in url_number_list"
+                    :key="_index"
+                    :label="_item"
+                    :value="_item"
+                  ></Option>
+                </Select>
               </FormItem>
               <FormItem label="状态:">
                 <Select
@@ -355,7 +379,7 @@
             border
           >
             <template slot="statusSlot" slot-scope="{ row }">
-              {{ row.sub_state == 2 ? "已完成" : "未完成" }}
+              {{ row.sub_state >= 2 ? "已完成" : "未完成" }}
             </template>
             <template slot="set" slot-scope="{ row, index }">
               <a
@@ -389,7 +413,12 @@
         </div>
         <Table :columns="supTableColumns" :data="supTableData" border>
           <template slot="combine" slot-scope="{ index }">
-            <span v-for="_item in combineList" :key="_item.id" v-show="_item.id==supTableData[index].id">{{_item.title}}</span>
+            <span
+              v-for="_item in combineList"
+              :key="_item.id"
+              v-show="_item.id == supTableData[index].id"
+              >{{ _item.title }}</span
+            >
             <!-- <Select
               v-model="supTableData[index].id"
               disabled
@@ -878,7 +907,23 @@ export default {
             });
           },
         },
-        { title: "左右式", key: "title", align: "center", minWidth: 100 },
+        {
+          title: "左右式",
+          key: "left_right_mode",
+          align: "center",
+          minWidth: 100,
+          render: (h, params) => {
+            return h(
+              "span",
+              {},
+              params.row.left_right_mode == 1
+                ? "左式"
+                : params.row.left_right_mode == 2
+                ? "右式"
+                : "无"
+            );
+          },
+        },
         { title: "图号", key: "url_number", align: "center", minWidth: 100 },
         { title: "备注", key: "remark", align: "center", minWidth: 100 },
         {
@@ -923,6 +968,11 @@ export default {
       page_size: 10,
       total: 0,
       searchData: {},
+      area_no_list: [],
+      area_title_list: [],
+      product_title_list: [],
+      url_number_list: [],
+      oa_id: this.$route.query.oa_id || "",
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -964,7 +1014,7 @@ export default {
     this.axios("/api/basics_measure_index").then((res) => {
       this.measureList = res.data.data;
     });
-    this.initData(this.formData.order_no);
+    this.initData(this.formData.order_no, this.oa_id);
   },
   methods: {
     async handleBeforeUpload(row) {
@@ -976,13 +1026,14 @@ export default {
     onProgress(e) {
       console.log(e);
     },
-    initData(order_no) {
+    initData(order_no, oa_id) {
       this.axios({
         method: "get",
         url: "/api/order_area_list",
         params: {
           order_no,
           type: 2,
+          oa_id,
         },
       }).then((res) => {
         this.formData = res.data;
@@ -1191,7 +1242,7 @@ export default {
               }).then((res) => {
                 if (res.doce == 200) {
                   this.$Message.success(res.msg);
-                  this.initData(this.formData.order_no);
+                  this.initData(this.formData.order_no, this.oa_id);
                 }
               });
             },
@@ -1255,15 +1306,14 @@ export default {
         data: {
           order_no: this.formData.order_no,
           order_area_id: this.order_area_id,
+          oa_id: this.$route.query.oa_id,
           ...this.tempPDTList[0],
         },
-      })
-        .then((res) => {
-          this.$Message.success(res.msg);
-          this.showPDTModal = false;
-          this.initData(this.formData.order_no);
-        })
-        .catch((err) => {});
+      }).then((res) => {
+        this.$Message.success(res.msg);
+        this.showPDTModal = false;
+        this.initData(this.formData.order_no, this.oa_id);
+      });
       // this.tempPDTList = [
       //   {
       //     addPDTProcessAttrList:[{}]
@@ -1320,7 +1370,7 @@ export default {
             }).then((res) => {
               if (res.doce == 200) {
                 this.$Message.success(res.msg);
-                this.initData(this.formData.order_no);
+                this.initData(this.formData.order_no, this.oa_id);
               }
             });
           },
@@ -1411,7 +1461,7 @@ export default {
         if (res.code == 200) {
           this.$Message.success(res.msg);
           this.getListData();
-          this.initData(this.formData.order_no);
+          this.initData(this.formData.order_no, this.oa_id);
         }
       });
     },
@@ -1435,9 +1485,14 @@ export default {
             order_no: this.$route.query.order_no,
             ...this.searchData,
             type: 2,
+            oa_id: this.oa_id,
           },
         })
         .then((res) => {
+          this.area_no_list = res.data.area_no;
+          this.area_title_list = res.data.area_title;
+          this.product_title_list = res.data.product_title;
+          this.url_number_list = res.data.url_number;
           this.listTableData = res.data.data;
           this.listTableData.map((item) => {
             !item.url && (item.url = []);
@@ -1477,6 +1532,7 @@ export default {
           .get("/api/order_area_list_product", {
             params: {
               order_no: this.$route.query.order_no,
+              oa_id: this.$route.query.oa_id,
               area_id: item.id,
               type: 2,
             },
@@ -1511,6 +1567,7 @@ export default {
           .get("/api/order_area_list_product", {
             params: {
               order_no: this.$route.query.order_no,
+              oa_id: this.$route.query.oa_id,
               area_id: item.id,
               type: 2,
             },

src/views/BidSystem/DeepeningOrder/list.vue

@@ -60,20 +60,20 @@
         <div>
           <a
             style="margin: 0 5px"
-            :disabled="row.sub_status != 1"
+            :disabled="row.deep_status != 2"
             @click="handleSet(row, index, 1)"
             >下拆单</a
           >
           <a
             style="margin: 0 5px"
-            :disabled="row.sub_status == 2"
+            :disabled="row.deep_status == 2"
             @click="handleSet(row, index, 2)"
             >编辑</a
           >
           <a style="margin: 0 5px" @click="handleSet(row, index, 3)">详情</a>
           <!-- <a
             style="margin: 0 5px"
-            :disabled="row.sub_status == 1"
+            :disabled="row.deep_status == 1"
             @click="handleSet(row, index, 4)"
             >变更</a
           >
@@ -167,7 +167,7 @@ export default {
         },
         { title: "订单号", align: "center", key: "order_no", minWidth: 150 },
         {
-          title: "小区名称",
+          title: "项目名称",
           align: "center",
           key: "residential_name",
           minWidth: 120,
@@ -219,15 +219,15 @@ export default {
         {
           title: "深化状态",
           align: "center",
-          key: "sub_status",
+          key: "deep_status",
           minWidth: 100,
           render: (h, params) =>
             h(
               "span",
               {},
-              params.row.sub_status == 0
+              params.row.deep_status == 0
                 ? "未深化"
-                : params.row.sub_status == 1
+                : params.row.deep_status == 1
                 ? "深化中"
                 : "深化完成"
             ),
@@ -300,7 +300,7 @@ export default {
           },
         }).then((res) => {
           this.$Message.success(res.msg);
-          this.processModal = false
+          this.processModal = false;
           this.getData(this.proxyObj);
         });
       } else {
@@ -340,6 +340,7 @@ export default {
             query: {
               type,
               order_no: row.order_no,
+              oa_id: row.oa_id,
             },
           });
           break;
@@ -349,6 +350,7 @@ export default {
             query: {
               type,
               order_no: row.order_no,
+              oa_id: row.oa_id,
             },
           });
           break;
@@ -369,8 +371,11 @@ export default {
     },
     init(row) {
       this.page_index = 1;
-      //1 深化
-      row.deep_status = 1;
+      //1 深化   换接口 弃用
+      // row.sub_status = 1;
+      if (!row.deep_status && row.deep_status != 0) {
+        row.deep_status = 99;
+      }
       row.page_index = this.page_index;
       row.page_size = this.page_size;
       this.proxyObj = row;
@@ -378,7 +383,7 @@ export default {
     },
     getData(row) {
       this.loading = true;
-      this.axios("/api/order_area", { params: row }).then((res) => {
+      this.axios("/api/order_area_deep_list", { params: row }).then((res) => {
         this.loading = false;
         this.tableData = res.data.data;
         this.total = res.data.total;
@@ -431,7 +436,7 @@ export default {
           placeholder: "请输入订单号",
         },
         {
-          title: "小区名字",
+          title: "项目名称",
           name: "Input",
           placeholder: "请输入",
           value: "",
@@ -455,8 +460,8 @@ export default {
           title: "深化状态",
           name: "Select",
           placeholder: "请选择",
-          serverName: "sub_status",
-          value: "",
+          serverName: "deep_status",
+          value: 99,
           option: [
             { label: "未深化", value: 0 },
             { label: "深化中", value: 1 },
@@ -488,7 +493,7 @@ export default {
 };
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .pageSlotStyle {
   display: flex;
   justify-content: center;

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -314,7 +314,7 @@
         </div>
         <div style="padding: 10px 0">
           <span>工艺路线：</span>
-          <Tooltip>
+          <Tooltip max-width="200px">
             <div
               slot="content"
               v-show="!partsItem.isAddProcessRoute || type == 2"
@@ -326,7 +326,7 @@
               @click="editRouter(partsItem, partsIndex)"
               >选择工艺路线</Button
             >
-            {{ process_name }}
+            {{ partsItem.process_name }}
           </Tooltip>
         </div>
 
@@ -513,7 +513,7 @@
               >
               <a
                 :style="
-                  type == 2
+                  !partsItem.isAddPart || type == 2
                     ? 'margin: 0 5px; color: #ccc'
                     : 'margin: 0 5px; color: red'
                 "
@@ -586,7 +586,7 @@
               >
               <a
                 :style="
-                  type == 2
+                  !partsItem.isAddPart || type == 2
                     ? 'margin: 0 5px; color: #ccc'
                     : 'margin: 0 5px; color: red'
                 "
@@ -1288,6 +1288,8 @@ export default {
       nowSelectObj: {},
       temp_info_bps: [],
       process_name: "",
+      // 判断工艺路线是否新增
+      isNewProcess: false,
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -1330,7 +1332,7 @@ export default {
           v.cld.map((v) => (v.show = false));
         }
       });
-      this.tempProcessAttrList = res.data;
+      this.tempProcessAttrList = JSON.parse(JSON.stringify(res.data));
       this.formData.parts.forEach((element) => {
         element.ProcessAttrList = res.data;
       });
@@ -1518,12 +1520,46 @@ export default {
     },
     getChangeLists(e) {},
     saveTableData(row, index) {
-      this.formData.parts[
-        this.tempSelectedPartIndex
-      ].partsProcessLineTableData = this.formData.parts[
-        this.tempSelectedPartIndex
-      ].partsProcessLineTableData.concat(this.selectTags);
-      this.process_name = this.info.process_route_title;
+      if (this.isNewProcess) {
+        let temparr = [];
+        this.selectTags.forEach((el) => {
+          temparr.push(el.id);
+        });
+        this.axios({
+          method: "post",
+          url: "/api/technological_route_edit",
+          data: {
+            id: "",
+            title: this.info.title,
+            procedure_id: temparr.join(","),
+          },
+        }).then((res) => {
+          if (res.code == 200) {
+            this.formData.parts[
+              this.tempSelectedPartIndex
+            ].partsProcessLineTableData = [];
+            this.formData.parts[
+              this.tempSelectedPartIndex
+            ].partsProcessLineTableData = this.formData.parts[
+              this.tempSelectedPartIndex
+            ].partsProcessLineTableData.concat(this.selectTags);
+            this.showProcessLineDetailModal = false;
+            this.formData.parts[
+              this.tempSelectedPartIndex
+            ].process_name = this.info.title;
+          }
+        });
+      } else {
+        this.formData.parts[
+          this.tempSelectedPartIndex
+        ].partsProcessLineTableData = [];
+        this.formData.parts[
+          this.tempSelectedPartIndex
+        ].partsProcessLineTableData = this.formData.parts[
+          this.tempSelectedPartIndex
+        ].partsProcessLineTableData.concat(this.selectTags);
+        this.showProcessLineDetailModal = false;
+      }
     },
     // 删除工艺路线列表项
     handleProcessLineDele(row, i, index) {
@@ -1762,6 +1798,7 @@ export default {
           }).then((res) => {
             item.pay_state = res.data.label;
             item.company = res.data.company;
+            item.ProcessAttrList = this.tempProcessAttrList;
             item.partsWoodTableData ? "" : (item.partsWoodTableData = []);
             item.partsMetalseData ? "" : (item.partsMetalseData = []);
             item.partsWoodTableData = res.data.detail.filter(
@@ -1787,18 +1824,26 @@ export default {
           });
         } else {
           item.isAddPart = true;
+          item.ProcessAttrList = this.tempProcessAttrList;
+          item.partsWoodTableData = [];
+          item.partsMetalseData = [];
+          item.process_name = "";
         }
       }
     },
     // 选择工艺组合名称
     handleProcessRouteSelect(item, val) {
       if (val) {
-        item.ProcessAttrList.forEach((v) => {
-          v.cld.forEach((z) => {
-            z.list.forEach((element) => {
-              element.display = true;
+        item.ProcessAttrList.map((level0) => {
+          level0.cld &&
+            level0.cld.length > 0 &&
+            level0.cld.map((level1) => {
+              level1.list &&
+                level1.list.length > 0 &&
+                level1.list.map((level2) => {
+                  level2.display = true;
+                });
             });
-          });
         });
         if (val.label != val.value) {
           item.isAddProcessRoute = false;
@@ -1815,6 +1860,7 @@ export default {
             this.selectTags = res.data.produce_list;
             const selectTagsId = this.selectTags.map((item) => item.id);
             item.ProcessAttrList = res.data.list;
+            item.process_name = res.data.technological_route_title;
             item.properties = res.data.pp_id.split(","); ///存在问题
             this.info.bps.forEach((v) => {
               v.cld &&
@@ -1838,16 +1884,29 @@ export default {
                     });
                 });
             });
-            this.process_name = res.data.technological_route_title;
+            item.ProcessAttrList.map((level0) => {
+              level0.cld &&
+                level0.cld.length > 0 &&
+                level0.cld.map((level1) => {
+                  level1.list &&
+                    level1.list.length > 0 &&
+                    level1.list.map((level2) => {
+                      level2.display = level2.show;
+                    });
+                });
+            });
             item.partsProcessLineTableData = this.selectTags;
           });
         } else {
           item.isAddProcessRoute = true;
+          item.process_name = "";
         }
       }
     },
     //选择工艺路线
     editRouter(item, index) {
+      // 重新打开则重新判定是否为新增工艺路线
+      this.isNewProcess = false;
       this.showProcessLineModal = true;
       this.tempSelectedPartIndex = index;
       this.handleSearchProcessLine(this.tempProcessLine.title);
@@ -1864,6 +1923,8 @@ export default {
       });
     },
     changeCheck(e, item, selectArray) {
+      // 一旦更改便标记为新增工艺路线
+      this.isNewProcess = true;
       //复选框选中与非选中同时同步tag标签跟随操作
       item.show = e;
       if (e) {
@@ -1911,19 +1972,18 @@ export default {
       // });
     },
     setRadioChange(parent, child, index, parts, cld) {
-      console.log("parent :>> ", parent);
-      console.log("parts :>> ", parts);
-      console.log("cld :>> ", cld);
       if (this.type == 1) {
-        cld.forEach((element) => {
-          element.list.forEach((elem) => {
-            elem.id != child.id && (elem.show = false);
+        if (parts.isAddProcessRoute) {
+          cld.forEach((element) => {
+            element.list.forEach((elem) => {
+              elem.id != child.id && (elem.show = false);
+            });
           });
-        });
-        child.show = !child.show;
-        parts.properties[index] = child.id;
-        this.$forceUpdate();
+          child.show = !child.show;
+          parts.properties[index] = child.id;
+        }
       }
+      this.$forceUpdate();
     },
     // setRadioChange(parent, child) {
     //   const { type } = this.$route.query;
@@ -1945,7 +2005,7 @@ export default {
     handleProcessLineSet(row, index) {
       this.process_name = row.title;
       this.info.id = row.id;
-      // this.info.title = row.title;
+      this.info.title = row.title;
       this.info.procedure_id = row.procedure_id;
       this.selectTags = [];
       const arr = this.info.procedure_id
@@ -2561,7 +2621,7 @@ export default {
 
 /deep/ .ivu-modal {
   .modal_process_route_content {
-    max-height: 500px;
+    max-height: 600px;
     position: relative;
     overflow: hidden;
     overflow-y: auto;

src/views/BidSystem/ProductDeOrder/detail.vue

@@ -75,7 +75,7 @@
     </div>
     <div class="top_search">
       <div><span>订单号:</span>{{ formData.order_no }}</div>
-      <div><span>小区名称:</span>{{ formData.residential_name }}</div>
+      <div><span>项目名称:</span>{{ formData.residential_name }}</div>
       <div><span>客户姓名:</span>{{ formData.client_name }}</div>
       <div>
         <span>紧急程度:</span
@@ -133,6 +133,7 @@
             <Select
               v-model="supTableData[index].id"
               @on-change="handlechange"
+              transfer
               size="small"
             >
               <Option
@@ -312,7 +313,15 @@ export default {
           minWidth: 80,
           render: (h, params) => {
             const { row } = params;
-            return h("span", {}, row.left_right_mode == 1 ? "左式" : "右式");
+            return h(
+              "span",
+              {},
+              row.left_right_mode == 1
+                ? "左式"
+                : row.left_right_mode == 2
+                ? "右式"
+                : "无"
+            );
           },
         },
         {
@@ -411,10 +420,12 @@ export default {
         url: "/api/order_area_explode",
         params: {
           order_no,
+          oa_id: this.$route.query.oa_id,
           ...this.searchData,
         },
       }).then((res) => {
         this.formData = res.data;
+        this.supTableData = res.data.ext;
         // this.formData.list.forEach((element) => {
         //   element.product.forEach((el, index) => {
         //     el.index = index + 1;

src/views/BidSystem/ProductDeOrder/edit.vue

@@ -112,7 +112,7 @@
       <div class="top_search_info">
         <div><span>订单编号:</span>{{formData.order_no}}</div>
         <div><span>订单类型:</span>{{formData.renovation_type==1?"工装":"家装"}}</div>
-        <div><span>小区昵称:</span>{{formData.residential_name}}</div>
+        <div><span>项目名称:</span>{{formData.residential_name}}</div>
         <div><span>地址:</span>{{formData.address}}</div>
         <div>
           <span>业务员:</span> <span v-for="item in salesmanList"

src/views/BidSystem/ProductDeOrder/list.vue

@@ -160,7 +160,7 @@ export default {
         },
         { title: "订单号", align: "center", key: "order_no", minWidth: 150 },
         {
-          title: "小区名称",
+          title: "项目名称",
           align: "center",
           key: "residential_name",
           minWidth: 120,
@@ -212,17 +212,17 @@ export default {
         {
           title: "拆单状态",
           align: "center",
-          key: "sub_status",
+          key: "explode_status",
           minWidth: 100,
           render: (h, params) =>
             h(
               "span",
               {},
-              // params.row.sub_status == 0
+              // params.row.explode_status == 0
               //   ? "待审核"
-              params.row.sub_status == 1
+              params.row.explode_status == 0
                 ? "未拆单"
-                : params.row.sub_status == 2
+                : params.row.explode_status == 1
                 ? "拆单中"
                 : "拆单完成"
             ),
@@ -329,6 +329,7 @@ export default {
             query: {
               type,
               order_no: row.order_no,
+              oa_id: row.oa_id,
             },
           });
           break;
@@ -338,6 +339,7 @@ export default {
             query: {
               type,
               order_no: row.order_no,
+              oa_id: row.oa_id,
               editType: 1,
               // orders_area_product_detail_id:row.id
             },
@@ -360,7 +362,6 @@ export default {
                   this.$Message.success(res.msg);
                   this.getData(this.proxyObj);
                 })
-                .catch((err) => {});
             },
             onCancel: () => {},
           });
@@ -378,8 +379,11 @@ export default {
     },
     init(row) {
       this.page_index = 1;
-      // 2拆单
-      row.explode_status = 2;
+      // 2拆单  换接口 弃用
+      // row.sub_status = 2;
+      if (!row.explode_status&&row.explode_status!=0) {
+        row.explode_status = 99
+      }
       row.page_index = this.page_index;
       row.page_size = this.page_size;
       this.proxyObj = row;
@@ -387,7 +391,7 @@ export default {
     },
     getData(row) {
       this.loading = true;
-      this.axios("/api/order_area", { params: row }).then((res) => {
+      this.axios("/api/order_area_explode_list", { params: row }).then((res) => {
         this.loading = false;
         this.tableData = res.data.data;
         this.total = res.data.total;
@@ -440,7 +444,7 @@ export default {
           placeholder: "请输入订单号",
         },
         {
-          title: "小区名字",
+          title: "项目名称",
           name: "Input",
           placeholder: "请输入",
           value: "",
@@ -464,13 +468,13 @@ export default {
           title: "拆单状态",
           name: "Select",
           placeholder: "请选择",
-          serverName: "state",
-          value: "",
+          serverName: "explode_status",
+          value: 99,
           option: [
             //{ label: "待审核", value: 0 },
-            { label: "未拆单", value: 1 },
-            { label: "拆单中", value: 2 },
-            { label: "拆单完成", value: 3 },
+            { label: "未拆单", value: 0 },
+            { label: "拆单中", value: 1 },
+            { label: "拆单完成", value: 2 },
           ],
         },
         {

src/views/MeasurementOrderMannage/list.vue

@@ -114,7 +114,7 @@ export default {
           render: (h, params) => h('span', {}, (((params.row.measure_rate * 1).toFixed(2)) * 100) + '%')
         },
         { title: '紧急程度', align: 'center', key: 'warning_state', minWidth: 100, slot: 'basicTypeSet', },
-        { title: '小区', align: 'center', key: 'residential_name', minWidth: 200 },
+        { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
         { title: '地址', align: 'center', key: 'address', minWidth: 200 },
         { title: '客户姓名', align: 'center', key: 'client_name', minWidth: 100 },
         { title: '电话', align: 'center', key: 'mobile', minWidth: 150 },
@@ -211,7 +211,7 @@ export default {
         },
         { title: '测量日期范围', start_server: 'start_time', end_server: 'end_time', start_value: '', end_value: this.corssPageData ? this.corssPageData.end_value : '', isDate: true, start_placeholder: '开始日期', end_placeholder: '结束日期' },
         { title: '测量单号', serverName: 'order_no', name: 'Input', value: '', placeholder: '请输入测量单号' },
-        { title: '小区名称', serverName: 'residential_name', name: 'Input', value: '', placeholder: '请输入小区名称' },
+        { title: '项目名称', serverName: 'residential_name', name: 'Input', value: '', placeholder: '请输入项目名称' },
         { title: '客户姓名', serverName: 'client_name', name: 'Input', value: '', placeholder: '请输入客户姓名' },
         {
           title: '订单状态', name: 'Select', placeholder: '请选择', serverName: 'sub_state', value: '',

src/views/MountOrder/index.vue

@@ -52,7 +52,7 @@ export default {
         { title: '客户', align: 'center', key: 'client_name', minWidth: 150 },
         { title: '手机号', align: 'center', key: 'mobile', minWidth: 150 },
         { title: '地址', align: 'center', key: 'address', minWidth: 150 },
-        { title: '小区', align: 'center', key: 'residential_name', minWidth: 200 },
+        { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
         {
           title: '出库时间', align: 'center', key: 'predict_time', minWidth: 200,
           render: (h, params) => h('span', {}, this.func.replaceDate(params.row.transport_start_time))
@@ -104,7 +104,7 @@ export default {
           ]
         },
         { title: '紧急程度', name: 'Select', serverName: 'warning_state', placeholder: '请选择', value: '', optionName: 'title', optionValue: 'id', option: this.warningList },
-        { title: '小区名称', name: 'Input', serverName: 'residential_name', placeholder: '小区名称', value: '' },
+        { title: '项目名称', name: 'Input', serverName: 'residential_name', placeholder: '项目名称', value: '' },
         { title: '客户', name: 'Input', serverName: 'client_name', placeholder: '客户', value: '' },
         { title: '手机号', name: 'Input', serverName: 'mobile', placeholder: '手机号', value: '' },
         { title: '出库时间', name: 'Input', start_server: 'start_out_storage_time', end_server: 'end_out_storage_time', start_value: '', end_value: '', isDate: true, start_placeholder: '开始日期', end_placeholder: '结束日期' },

src/views/OrderMannage/BusinessOrderlist/Decorationlist.vue

@@ -122,7 +122,7 @@ export default {
       ],
       tableColums: [
         { type: 'selection', align: 'center', fixed: 'left', minWidth: 100 },
-        { title: '小区', align: 'center', key: 'residential_name', minWidth: 200 },
+        { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
         { title: '楼幢', align: 'center', key: 'house', minWidth: 100 },
         { title: '单元', align: 'center', key: 'unit', minWidth: 100 },
         { title: '楼层', align: 'center', key: 'layer', minWidth: 100 },

src/views/OrderMannage/BusinessOrderlist/agentOrder.vue

@@ -33,11 +33,11 @@
                  placeholder="自动生成" />
         </FormItem>
 
-        <FormItem label="小区名称:"
+        <FormItem label="项目名称:"
                   prop='residential_name'>
           <Input v-model="info.residential_name"
                  class="auto-width"
-                 placeholder="请输入小区名称" />
+                 placeholder="请输入项目名称" />
         </FormItem>
 
         <FormItem label="客户姓名:"
@@ -84,7 +84,7 @@
                   prop='address'>
           <Input v-model="info.address"
                  class="auto-width"
-                 placeholder="请输入小区名称" />
+                 placeholder="请输入项目名称" />
         </FormItem>
 
         <FormItem label="手机号:"
@@ -277,7 +277,7 @@ export default {
         number: [{ required: true, message: ' ', trigger: 'blur' }],
       },
       info: {
-        residential_name: '',//小区名称
+        residential_name: '',//项目名称
         order_no: '',//订单号
         renovation_type: 1,//订单类型
         client_name: '',//客户名称

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -1139,14 +1139,14 @@
                       style="margin-right: 5px"
                       size="small"
                       >{{
-                        !element.isShowPartDetail ? "收起" : "修改原材料"
+                        element.isShowPartDetail ? "收起" : "修改原材料"
                       }}</Button
                     >
                   </FormItem>
                   <div
                     :class="[
                       'part_detail_form',
-                      !element.isShowPartDetail ? '' : 'hide_part_detail',
+                      element.isShowPartDetail ? '' : 'hide_part_detail',
                     ]"
                     :data-index="idx"
                   >
@@ -1959,7 +1959,7 @@
                       style="margin-right: 5px"
                       size="small"
                       >{{
-                        !element.isShowPartDetail
+                        element.isShowPartDetail
                           ? "收起"
                           : isCheck
                           ? "查看"
@@ -1970,7 +1970,7 @@
                   <div
                     :class="[
                       'part_detail_form',
-                      !element.isShowPartDetail ? '' : 'hide_part_detail',
+                      element.isShowPartDetail ? '' : 'hide_part_detail',
                     ]"
                     :data-index="idx"
                   >

src/views/OrderMannage/BusinessOrderlist/editcopy.vue

@@ -20,8 +20,8 @@
                     <Input disabled v-model="info.order_no" class="auto-width" placeholder="自动生成"/>
                 </FormItem>
 
-                <FormItem v-if='formObjs.residential_name' label="小区名称:" prop='residential_name'>
-                    <Input v-model="info.residential_name" class="auto-width" placeholder="请输入小区名称"/>
+                <FormItem v-if='formObjs.residential_name' label="项目名称:" prop='residential_name'>
+                    <Input v-model="info.residential_name" class="auto-width" placeholder="请输入项目名称"/>
                 </FormItem>
 
                 <FormItem v-if='formObjs.client_name' label="客户姓名:">
@@ -51,7 +51,7 @@
                 </FormItem>
 
                 <FormItem v-if='formObjs.address' label="详细地址:">
-                    <Input v-model="info.address" class="auto-width" placeholder="请输入小区名称"/>
+                    <Input v-model="info.address" class="auto-width" placeholder="请输入项目名称"/>
                 </FormItem>
 
                 <FormItem v-if='formObjs.mobile' label="手机号:" prop='mobile'>
@@ -271,7 +271,7 @@
             <CheckboxGroup v-model="forms_list">
                 <Checkbox label="renovation_type">订单类型</Checkbox>
                 <Checkbox label="order_no">订单编号</Checkbox>
-                <Checkbox label="residential_name">小区名称</Checkbox>
+                <Checkbox label="residential_name">项目名称</Checkbox>
                 <Checkbox label="client_name">客户姓名</Checkbox>
                 <Checkbox label="warning_state">紧急程度</Checkbox>
                 <Checkbox label="salesman">业务员</Checkbox>
@@ -406,7 +406,7 @@ export default {
                 product_id:[{required: true,message:' ',}]
             },
             info:{
-                residential_name:'',//小区名称
+                residential_name:'',//项目名称
                 order_no:'',//订单号
                 renovation_type:1,//订单类型
                 client_name:'',//客户名称

src/views/OrderMannage/BusinessOrderlist/listcopy.vue

@@ -124,7 +124,7 @@ export default {
     return {
       list: [
         { title: '订单编号', name: 'Input', placeholder: '请输入订单编号', value: '', serverName: 'order_no' },
-        { title: '小区名字', name: 'Input', placeholder: '请输入', value: '', serverName: 'residential_name' },
+        { title: '项目名称', name: 'Input', placeholder: '请输入', value: '', serverName: 'residential_name' },
         { title: '客户昵称', name: 'Input', placeholder: '请输入', value: '', serverName: 'client_name' },
         { title: '手机号', name: 'Input', placeholder: '请输入', value: '', serverName: 'mobile' },
         {
@@ -201,7 +201,7 @@ export default {
           title: '订单创建时间', align: 'center', minWidth: 180, key: 'crt_time',
           render: (h, params) => h('span', {}, this.func.replaceDate(params.row.crt_time))
         },
-        { title: '小区', align: 'center', key: 'residential_name', minWidth: 200 },
+        { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
         {
           title: '订单开始日期', align: 'center', minWidth: 180, key: 'start_time',
           render: (h, params) => h('span', {}, this.func.replaceDate(params.row.start_time, 1))
@@ -284,7 +284,7 @@ export default {
       ],
       formModalTableData: [
         // { is_show: true, key: 'order_no', value: '订单编号' },
-        // { is_show: true, key: 'residential_name', value: '小区名字' },
+        // { is_show: true, key: 'residential_name', value: '项目名称' },
         // { is_show: true, key: 'client_name', value: '客户昵称' },
         // { is_show: true, key: 'mobile', value: '手机号' },
         // { is_show: true, key: 'salesman', value: '业务员' },
@@ -343,7 +343,7 @@ export default {
         // { is_show: true, key: 'salesman', value: '业务员' },
         // { is_show: true, key: 'warning_state', value: '紧急程度' },
         // { is_show: true, key: 'crt_time', value: '订单创建时间' },
-        // { is_show: true, key: 'residential_name', value: '小区' },
+        // { is_show: true, key: 'residential_name', value: '项目名称' },
         // { is_show: true, key: 'start_time', value: '订单开始日期' },
         // { is_show: true, key: 'end_time', value: '订单交付日期' },
         // { is_show: true, key: 'complete_rate', value: '生产进度' },
@@ -365,7 +365,7 @@ export default {
     set_list () {
       return [
         { title: '订单编号', name: 'Input', placeholder: '请输入订单编号', value: localStorage.getItem('corssPageData') ? JSON.parse(localStorage.getItem('corssPageData')).order_no : '', serverName: 'order_no' },
-        { title: '小区名字', name: 'Input', placeholder: '请输入', value: localStorage.getItem('corssPageData') ? JSON.parse(localStorage.getItem('corssPageData')).residential_name : '', serverName: 'residential_name' },
+        { title: '项目名称', name: 'Input', placeholder: '请输入', value: localStorage.getItem('corssPageData') ? JSON.parse(localStorage.getItem('corssPageData')).residential_name : '', serverName: 'residential_name' },
         { title: '客户昵称', name: 'Input', placeholder: '请输入', value: localStorage.getItem('corssPageData') ? JSON.parse(localStorage.getItem('corssPageData')).client_name : '', serverName: 'client_name' },
         { title: '手机号', name: 'Input', placeholder: '请输入', value: localStorage.getItem('corssPageData') ? JSON.parse(localStorage.getItem('corssPageData')).mobile : '', serverName: 'mobile' },
         {

src/views/ProductionOrderList/Deliverylist/Deliverylist.vue

@@ -185,7 +185,7 @@ export default {
           slot: "basicTypeSet",
         },
         {
-          title: "小区名称",
+          title: "项目名称",
           align: "center",
           key: "residential_name",
           minWidth: 200,
@@ -193,10 +193,10 @@ export default {
         {
           title: "出库时间",
           align: "center",
-          key: "start_time",
+          key: "dispatch_time",
           minWidth: 200,
           render: (h, params) =>
-            h("span", {}, this.func.replaceDate(params.row.start_time, 1)),
+            h("span", {}, this.func.replaceDate(params.row.dispatch_time, 1)),
         },
         {
           title: "确认出库百分比",
@@ -329,10 +329,10 @@ export default {
           option: this.warningList,
         },
         {
-          title: "小区名称",
+          title: "项目名称",
           name: "Input",
           serverName: "residential_name",
-          placeholder: "小区名称",
+          placeholder: "项目名称",
           value: "",
         },
         {

src/views/ProductionOrderList/Dispatchlist/list.vue

@@ -76,7 +76,7 @@ export default {
         },
 
         { title: '紧急程度', align: 'center', key: 'warning_state', minWidth: 100, slot: 'basicTypeSet', },
-        { title: '小区名称', align: 'center', key: 'residential_name', minWidth: 200 },
+        { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
         {
           title: '派工开始时间', align: 'center', key: 'start_time', minWidth: 200,
           render: (h, params) => h('span', {}, this.func.replaceDate(params.row.start_time * 1, 1))
@@ -133,7 +133,7 @@ export default {
           ]
         },
         { title: '紧急程度', name: 'Select', serverName: 'warning_state', placeholder: '请选择', value: '', optionName: 'title', optionValue: 'id', option: this.warningList },
-        { title: '小区名称', name: 'Input', serverName: 'residential_name', placeholder: '请输入小区名称', value: '' },
+        { title: '项目名称', name: 'Input', serverName: 'residential_name', placeholder: '请输入项目名称', value: '' },
         {
           title: '派工人员', name: 'Select', serverName: 'user_id', placeholder: '请选择派工人员', optionName: 'nickname', optionValue: 'id', value: '',
           option: this.userList

src/views/ProductionOrderList/InboundForm/index.vue

@@ -178,9 +178,9 @@ export default {
           serverName: "order_no",
         },
         {
-          title: "小区名字",
+          title: "项目名称",
           name: "Input",
-          placeholder: "请输入小区名字",
+          placeholder: "请输入项目名称",
           value: "",
           serverName: "residential_name",
         },

src/views/ProductionOrderList/ProductionPlanlist/list.vue

@@ -273,10 +273,10 @@ export default {
           value: "",
         },
         {
-          title: "小区名字",
+          title: "项目名称",
           name: "Input",
           serverName: "residential_name",
-          placeholder: "请选择",
+          placeholder: "请选择项目名称",
           value: "",
         },
         {

src/views/ProductionOrderList/ProductionsOrder/Decorationlist.vue

@@ -283,7 +283,6 @@ export default {
           value: '',
           serverName: 'part_state',
           option: [
-            { label: '全部', value: 99 },
             { label: '未下计划', value: 0 },
             { label: '已下计划', value: 1 },
           ],
@@ -359,7 +358,6 @@ export default {
         { title: '部件名', align: 'center', key: 'part_title', minWidth: 200 },
         {
           title: '部件测量数据',
-          key: '',
           align: 'center',
           key: 'measure',
           minWidth: 200,
@@ -465,7 +463,7 @@ export default {
       batchTablePartsColumn: [
         { type: 'selection', fixed: 'left', minWidth: 90, align: 'center' },
         {
-          title: '小区名称',
+          title: '项目名称',
           key: 'residential_name',
           align: 'center',
           minWidth: 200,
@@ -486,14 +484,12 @@ export default {
         },
         {
           title: '产品',
-          key: '',
           align: 'center',
           key: 'product_title',
           minWidth: 150,
         },
         {
           title: '位置',
-          key: '',
           align: 'center',
           key: 'position',
           minWidth: 100,

src/views/ProductionOrderList/ProductionsOrder/list.vue

@@ -23,11 +23,11 @@
       </div>
 
       <div slot='navButton'>
-        <Button @click="setupTableHeader"
+        <!-- <Button @click="setupTableHeader"
                 v-if='persimissionData["表头设置"]||persimissionData.all'
                 type="primary"
                 ghost
-                icon='ios-cog'>表头设置</Button>
+                icon='ios-cog'>表头设置</Button> -->
       </div>
       <template slot="basicTypeSet"
                 slot-scope="{row}">
@@ -51,7 +51,7 @@
              @click="goDetial(row)">详情</a>
           <a v-if='persimissionData["下生产计划"]||persimissionData.all'
              style="margin:0 5px"
-             :disabled="row.state>1"
+             :disabled="row.is_plan==1"
              @click="openModal(row)">下生产计划</a>
         </div>
       </template>
@@ -94,7 +94,7 @@ export default {
           render: (h, params) => h('span', {},
             params.row.state == 0 ? '未下计划'
               : (params.row.state == 1 ? '计划中'
-                : (params.row.state == 2 ? '计划完成' : '全部'))
+                : (params.row.state >= 2 ? '计划完成' : '全部'))
           )
         },
         { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
@@ -176,7 +176,7 @@ export default {
     set_list () {
       return [
         { title: '订单编号', name: 'Input', serverName: 'order_no', placeholder: '请输入订单编号', value: '' },
-        { title: '小区名称', name: 'Input', serverName: 'residential_name', placeholder: '请输入小区名称', value: '' },
+        { title: '项目名称', name: 'Input', serverName: 'residential_name', placeholder: '请输入项目名称', value: '' },
         {
           title: '订单类型', name: 'Select', serverName: 'order_type', placeholder: '请选择', value: '',
           option: [

src/views/ProjectProgressMannage/list.vue

@@ -29,7 +29,7 @@ export default {
   data () {
     return {
       list: [
-        { title: '小区名称', name: 'Input', value: '', serverName: 'residential_name', placeholder: '小区名称' },
+        { title: '项目名称', name: 'Input', value: '', serverName: 'residential_name', placeholder: '项目名称' },
         { title: '订单编号', name: 'Input', value: '', serverName: 'order_no', placeholder: '订单编号' },
       ],
       tableColums: [
@@ -55,7 +55,7 @@ export default {
           title: '订单创建时间', align: 'center', minWidth: 180, key: 'crt_time',
           render: (h, params) => h('span', {}, this.func.replaceDate(params.row.crt_time))
         },
-        { title: '小区', align: 'center', key: 'residential_name', minWidth: 200 },
+        { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
         {
           title: '订单开始日期', align: 'center', minWidth: 180, key: 'start_time',
           render: (h, params) => h('span', {}, this.func.replaceDate(params.row.start_time, 1))

src/views/PurchasingManage/Approval.vue

@@ -48,7 +48,7 @@ export default {
       tableColums: [
         { type: 'selection', align: 'center', fixed: 'left', minWidth: 100, },
         { title: '订单编号', align: 'center', key: 'order_no', width: '180' },
-        { title: '小区名称', align: 'center', key: 'name', minWidth: 200 },
+        { title: '项目名称', align: 'center', key: 'name', minWidth: 200 },
         // { title: '订单流水号', align: 'center', key: 'oa_order_no', minWidth: 200 },
         { title: '客户', align: 'center', key: 'client_name', minWidth: 100 },
         { title: '手机号', align: 'center', key: 'mobile', minWidth: 150 },
@@ -106,7 +106,7 @@ export default {
     set_list () {
       return [
         { title: '订单号', name: 'Input', value: '', serverName: 'order_no', placeholder: '请输入订单号' },
-        { title: '小区名称', name: 'Input', value: '', serverName: 'residential_name', placeholder: '请输入小区名称' },
+        { title: '项目名称', name: 'Input', value: '', serverName: 'residential_name', placeholder: '请输入项目名称' },
         {
           title: '审批状态', name: 'Select', placeholder: '请选择', value: '', serverName: 'state',
           option: [