11

src/views/BidSystem/ContractList/edit.vue

@@ -340,53 +340,91 @@
       </div>
       <div class="addAreaForm">
         <Form :label-width="100" :model="areaItem" style="width: 60%">
-          <FormItem label="区域编码:">
+          <FormItem
+            v-if="areaSetTableData.filter((v) => v.key == 'num')[0].is_show"
+            :label="areaSetTableData.filter((v) => v.key == 'num')[0].title"
+          >
             <Input
               type="text"
               size="small"
               :disabled="isChecked"
               v-model="areaItem.num"
-              placeholder="请输入区域编码"
+              :placeholder="
+                '请输入' +
+                  areaSetTableData.filter((v) => v.key == 'num')[0].title
+              "
               style="width: 120px"
             />
           </FormItem>
-          <FormItem label="区域名称:">
+          <FormItem
+            v-if="areaSetTableData.filter((v) => v.key == 'title')[0].is_show"
+            :label="areaSetTableData.filter((v) => v.key == 'title')[0].title"
+          >
             <Input
               type="text"
               size="small"
               :disabled="isChecked"
               v-model="areaItem.title"
-              placeholder="请输入区域名称"
+              :placeholder="
+                '请输入' +
+                  areaSetTableData.filter((v) => v.key == 'title')[0].title
+              "
               style="width: 120px"
             />
           </FormItem>
-          <FormItem label="单位:">
+          <FormItem
+            v-if="areaSetTableData.filter((v) => v.key == 'unit')[0].is_show"
+            :label="areaSetTableData.filter((v) => v.key == 'unit')[0].title"
+          >
             <Input
               type="text"
               size="small"
               :disabled="isChecked"
               v-model="areaItem.unit"
-              placeholder="请输入单位"
+              :placeholder="
+                '请输入' +
+                  areaSetTableData.filter((v) => v.key == 'unit')[0].title
+              "
               style="width: 120px"
             />
           </FormItem>
-          <FormItem label="工程量:">
+          <FormItem
+            v-if="
+              areaSetTableData.filter((v) => v.key == 'quantity')[0].is_show
+            "
+            :label="
+              areaSetTableData.filter((v) => v.key == 'quantity')[0].title
+            "
+          >
             <Input
               type="text"
               size="small"
               v-model="areaItem.quantity"
               :disabled="isChecked"
-              placeholder="请输入工程量"
+              :placeholder="
+                '请输入' +
+                  areaSetTableData.filter((v) => v.key == 'quantity')[0].title
+              "
               style="width: 120px"
             />
           </FormItem>
-          <FormItem label="户型:">
+          <FormItem
+            v-if="
+              areaSetTableData.filter((v) => v.key == 'house_type')[0].is_show
+            "
+            :label="
+              areaSetTableData.filter((v) => v.key == 'house_type')[0].title
+            "
+          >
             <Input
               type="text"
               size="small"
               :disabled="isChecked"
               v-model="areaItem.house_type"
-              placeholder="请输入户型"
+              :placeholder="
+                '请输入' +
+                  areaSetTableData.filter((v) => v.key == 'house_type')[0].title
+              "
               style="width: 120px"
             />
           </FormItem>
@@ -404,13 +442,19 @@
               style="width: 120px"
             />
           </FormItem>
-          <FormItem label="备注:">
+          <FormItem
+            v-if="areaSetTableData.filter((v) => v.key == 'remark')[0].is_show"
+            :label="areaSetTableData.filter((v) => v.key == 'remark')[0].title"
+          >
             <Input
               type="text"
               :disabled="isChecked"
               size="small"
               v-model="areaItem.remark"
-              placeholder="请输入备注"
+              :placeholder="
+                '请输入' +
+                  areaSetTableData.filter((v) => v.key == 'remark')[0].title
+              "
               style="width: 120px"
             />
           </FormItem>
@@ -1082,13 +1126,35 @@
       style="max-height: 700px; overflow: hidden; overflow-y: auto"
       title="表单设置"
     >
-      <Table
-        :max-height="600"
-        border
-        :columns="formSetTableColumns"
-        :data="post_formSetTableData"
-      >
-      </Table>
+      <Tabs value="form1">
+        <TabPane label="订单表单设置" name="form1">
+          <Table
+            :max-height="600"
+            border
+            :columns="formSetTableColumns"
+            :data="post_formSetTableData"
+          >
+          </Table>
+        </TabPane>
+        <TabPane label="区域表单设置" name="form2">
+          <Table
+            :max-height="600"
+            border
+            :columns="areaSetTableColumns"
+            :data="post_areaSetTableData"
+          >
+          </Table>
+        </TabPane>
+        <TabPane label="产品表头设置" name="form3">
+          <Table
+            :max-height="600"
+            border
+            :columns="productSetTableColumns"
+            :data="post_productSetTableData"
+          >
+          </Table>
+        </TabPane>
+      </Tabs>
     </Modal>
   </div>
 </template>
@@ -1230,7 +1296,7 @@ export default {
         { title: "备注", key: "remark", align: "center", minWidth: 80 },
         {
           title: "操作",
-          key: "remark",
+          key: "set",
           align: "center",
           slot: "Set",
           minWidth: 120,
@@ -1370,6 +1436,112 @@ export default {
           title: "备注",
         },
       ],
+      areaSetTableData: [
+        {
+          is_show: true,
+          key: "num",
+          value: "区域编码",
+          title: "区域编码",
+        },
+        {
+          is_show: true,
+          key: "title",
+          value: "区域名称",
+          title: "区域名称",
+        },
+        {
+          is_show: true,
+          key: "unit",
+          value: "单位",
+          title: "单位",
+        },
+        {
+          is_show: true,
+          key: "quantity",
+          value: "工程量",
+          title: "工程量",
+        },
+        {
+          is_show: true,
+          key: "house_type",
+          value: "户型",
+          title: "户型",
+        },
+        {
+          is_show: true,
+          key: "remark",
+          value: "备注",
+          title: "备注",
+        },
+      ],
+      productSetTableData: [
+        {
+          is_show: true,
+          key: "index",
+          value: "序号",
+          title: "序号",
+        },
+        {
+          is_show: true,
+          key: "title",
+          value: "产品名称",
+          title: "产品名称",
+        },
+        {
+          is_show: true,
+          key: "num",
+          value: "数量",
+          title: "数量",
+        },
+        {
+          is_show: true,
+          key: "price",
+          value: "价格",
+          title: "价格",
+        },
+        {
+          is_show: true,
+          key: "measure",
+          value: "规格",
+          title: "规格",
+        },
+        {
+          is_show: true,
+          key: "process_property",
+          value: "工艺属性",
+          title: "工艺属性",
+        },
+        {
+          is_show: true,
+          key: "url",
+          value: "图纸",
+          title: "图纸",
+        },
+        {
+          is_show: true,
+          key: "left_right_mode",
+          value: "左右式",
+          title: "左右式",
+        },
+        {
+          is_show: true,
+          key: "url_number",
+          value: "图号",
+          title: "图号",
+        },
+        {
+          is_show: true,
+          key: "remark",
+          value: "备注",
+          title: "备注",
+        },
+        {
+          is_show: true,
+          key: "set",
+          value: "操作",
+          title: "操作",
+        },
+      ],
       formSetTableColumns: [
         {
           title: "是否展示",
@@ -1428,7 +1600,125 @@ export default {
           },
         },
       ],
+      areaSetTableColumns: [
+        {
+          title: "是否展示",
+          align: "center",
+          key: "is_show",
+          minWidth: 120,
+          render: (h, params) => {
+            const { index } = params;
+            const currentRow = JSON.parse(
+              JSON.stringify(this.post_areaSetTableData[index])
+            );
+            return h("Checkbox", {
+              props: {
+                value: currentRow.is_show,
+                // disabled:
+                //   currentRow.key == "fax_price" ||
+                //   currentRow.key == "remark",
+              },
+              on: {
+                "on-change": (e) => {
+                  currentRow.is_show = e;
+                  this.post_areaSetTableData.splice(index, 1, currentRow);
+                },
+              },
+            });
+          },
+        },
+        {
+          title: "字段名",
+          align: "center",
+          key: "value",
+          minWidth: 180,
+        },
+        {
+          title: "展示名称",
+          align: "center",
+          key: "title",
+          minWidth: 180,
+          render: (h, params) => {
+            const { index } = params;
+            const currentRow = JSON.parse(
+              JSON.stringify(this.post_areaSetTableData[index])
+            );
+            return h("Input", {
+              props: {
+                value: currentRow.title,
+                type: "text",
+              },
+              on: {
+                "on-change": (e) => {
+                  currentRow.title = e.target.value;
+                  this.post_areaSetTableData.splice(index, 1, currentRow);
+                },
+              },
+            });
+          },
+        },
+      ],
+      productSetTableColumns: [
+        {
+          title: "是否展示",
+          align: "center",
+          key: "is_show",
+          minWidth: 120,
+          render: (h, params) => {
+            const { index } = params;
+            const currentRow = JSON.parse(
+              JSON.stringify(this.post_productSetTableData[index])
+            );
+            return h("Checkbox", {
+              props: {
+                value: currentRow.is_show,
+                // disabled:
+                //   currentRow.key == "fax_price" ||
+                //   currentRow.key == "remark",
+              },
+              on: {
+                "on-change": (e) => {
+                  currentRow.is_show = e;
+                  this.post_productSetTableData.splice(index, 1, currentRow);
+                },
+              },
+            });
+          },
+        },
+        {
+          title: "字段名",
+          align: "center",
+          key: "value",
+          minWidth: 180,
+        },
+        {
+          title: "展示名称",
+          align: "center",
+          key: "title",
+          minWidth: 180,
+          render: (h, params) => {
+            const { index } = params;
+            const currentRow = JSON.parse(
+              JSON.stringify(this.post_productSetTableData[index])
+            );
+            return h("Input", {
+              props: {
+                value: currentRow.title,
+                type: "text",
+              },
+              on: {
+                "on-change": (e) => {
+                  currentRow.title = e.target.value;
+                  this.post_productSetTableData.splice(index, 1, currentRow);
+                },
+              },
+            });
+          },
+        },
+      ],
       post_formSetTableData: [],
+      post_areaSetTableData: [],
+      post_productSetTableData: [],
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -1949,6 +2239,12 @@ export default {
             this.post_formSetTableData = JSON.parse(
               JSON.stringify(this.formSetTableData)
             );
+            this.post_areaSetTableData = JSON.parse(
+              JSON.stringify(this.areaSetTableData)
+            );
+            this.post_productSetTableData = JSON.parse(
+              JSON.stringify(this.productSetTableData)
+            );
           } else {
             if (res.data.table.formSet && res.data.table.formSet.length > 0) {
               this.formSetTableData = JSON.parse(
@@ -1962,6 +2258,18 @@ export default {
                 JSON.stringify(this.formSetTableData)
               );
             }
+            if (res.data.table.areaSet && res.data.table.areaSet.length > 0) {
+              this.areaSetTableData = JSON.parse(
+                JSON.stringify(res.data.table.areaSet)
+              );
+              this.post_areaSetTableData = JSON.parse(
+                JSON.stringify(res.data.table.areaSet)
+              );
+            } else {
+              this.post_areaSetTableData = JSON.parse(
+                JSON.stringify(this.areaSetTableData)
+              );
+            }
           }
         });
     },
@@ -1976,6 +2284,7 @@ export default {
           id: "ContractList_edit",
           result: {
             formSet: this.post_formSetTableData,
+            areaSet: this.post_areaSetTableData,
           },
         },
       }).then((res) => {
@@ -2501,9 +2810,9 @@ export default {
     }
   }
   /deep/ .ivu-modal-body {
-    // display: flex;
-    // justify-content: center;
-    // flex-wrap: wrap;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
     max-height: 700px;
     overflow: hidden;
     overflow-y: auto;

src/views/BidSystem/DeepeningOrder/edit.vue

@@ -43,7 +43,7 @@
         <span>左右式:</span
         >{{ formData.left_right_mode == 1 ? "左式" : "右式" }}
       </div>
-      <div><span>价格:</span>{{ formData.price }}</div>
+      <!-- <div><span>价格:</span>{{ formData.price }}</div> -->
       <div><span>备注:</span>{{ formData.remark }}</div>
     </div>
     <div class="table-data">

src/views/BidSystem/DeepeningOrder/info.vue

@@ -388,23 +388,27 @@
           <!-- <Button @click="handleAddSup" type="primary">新增</Button> -->
         </div>
         <Table :columns="supTableColumns" :data="supTableData" border>
-          <template slot="combine" slot-scope="{ row }">
-            {{ row.order_no }}
-            <!-- <Select v-model="row.order_no" size="small">
+          <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>
+            <!-- <Select
+              v-model="supTableData[index].id"
+              disabled
+              size="small"
+            >
               <Option
                 v-for="item in combineList"
                 :value="item.id"
                 :key="item.id"
-                >{{ item.title }}</Option
-              >
+                :label="item.title"
+              ></Option>
             </Select> -->
           </template>
           <template slot="supSet" slot-scope="{ row, index }">
-            <a
+            <!-- <a
               style="margin: 0 5px; color: red"
               @click="handleSupSet(row, index)"
               >删除</a
-            >
+            > -->
           </template>
         </Table>
       </div>
@@ -982,6 +986,7 @@ export default {
         },
       }).then((res) => {
         this.formData = res.data;
+        this.supTableData = res.data.ext;
         // 产品特殊字段→ 弹窗窗口，table表头
         let arr = [];
         res.data.head[3] &&
@@ -1268,9 +1273,9 @@ export default {
     //项目辅料新增
     handleAddSup() {
       this.supTableData.push({ index: "", title: "" });
-      this.supTableData.forEach((element, index) => {
-        element.index = index + 1;
-      });
+      // this.supTableData.forEach((element, index) => {
+      //   element.index = index + 1;
+      // });
     },
     //项目辅料删除
     handleSupSet(row, index) {

src/views/BidSystem/DeepeningOrder/list.vue

@@ -291,7 +291,7 @@ export default {
           url: "/api/order_area_pull",
           params: {
             order_no: this.order_no,
-            deep_status: 2,
+            sub_status: 2,
             process_man: this.process_man,
             process_start_time: this.func.replaceDateNoHMS(
               this.process_start_time

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -284,12 +284,10 @@
             :key="_item.type_title"
           >
             <!-- v-show="_item.display" -->
-              <!-- v-show="_item.list && _item.list.length > 0" -->
-            <span
-              :class="['box-us']"
-              @click="setBoxChange(item, _item)"
-              >{{ _item.type_title }}</span
-            >
+            <!-- v-show="_item.list && _item.list.length > 0" -->
+            <span :class="['box-us']" @click="setBoxChange(item, _item)">{{
+              _item.type_title
+            }}</span>
             <div
               :class="['radio-us', __item.show ? 'radio-us-foc' : '']"
               v-for="__item in _item.list"
@@ -315,11 +313,19 @@
         </div>
         <div style="padding: 10px 0">
           <span>工艺路线：</span>
-          <Button
-            :disabled="!partsItem.isAddProcessRoute || type == 2"
-            @click="editRouter(partsItem, partsIndex)"
-            >选择工艺路线</Button
-          >
+          <Tooltip>
+            <div
+              slot="content"
+              v-show="!partsItem.isAddProcessRoute || type == 2"
+            >
+              若要编辑工艺路线，请先选择工艺组合
+            </div>
+            <Button
+              :disabled="!partsItem.isAddProcessRoute || type == 2"
+              @click="editRouter(partsItem, partsIndex)"
+              >选择工艺路线</Button
+            >
+          </Tooltip>
         </div>
 
         <div class="parts_content_lineTable">
@@ -964,7 +970,7 @@ export default {
           slot: "partVeneer_idSet",
         },
         {
-          title: "油漆",
+          title: "油漆组合",
           key: "paint_id",
           align: "center",
           minWidth: 140,
@@ -1197,7 +1203,7 @@ export default {
       this.materialWoodSkinList = res.data.data;
     });
     // 获取油漆列表
-    this.axios("/api/material", { params: { sub_type_id: 6 } }).then((res) => {
+    this.axios("/api/material_combination").then((res) => {
       this.materialPaintList = res.data.data;
     });
     // 获取五金列表
@@ -1500,7 +1506,7 @@ export default {
                     url: "/api/parts_index",
                     params: {
                       bp_id: element.parts_type,
-                    }, 
+                    },
                   })
                     .then((r) => {
                       element.partsNameList = r.data.data;
@@ -1508,7 +1514,7 @@ export default {
                         let item = isEditItem;
                         // let item = JSON.parse(JSON.stringify(isEditItem));
                         item.parts.forEach((element) => {
-                          console.log('element :>> ', element);
+                          console.log("element :>> ", element);
                           element.processCombination = element.route_id;
                           let obj = { value: element.route_id, label: "" };
                           this.handleProcessRouteSelect(element, obj);
@@ -1563,6 +1569,8 @@ export default {
     },
     //新增工艺组合名称
     handleProcessRouteCreate(item, val) {
+      //////
+      item.isAddProcessRoute = false;
       item.ProcessAttrList = JSON.parse(
         JSON.stringify(this.tempProcessAttrList)
       );

src/views/BidSystem/ProductDeOrder/list.vue

@@ -281,7 +281,7 @@ export default {
         url: "/api/order_area_pull",
         params: {
           order_no: this.order_no,
-          explode_status: 3,
+          sub_status: 3,
           process_man: this.process_man,
           process_start_time: this.func.replaceDateNoHMS(
             this.process_start_time

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -1956,6 +1956,7 @@
                                 style="width: 80px"
                                 filterable
                                 clearable
+                                transfer
                                 :disabled="isCheck"
                                 v-model="ele.material_detail_id"
                                 @on-change="(e) => handleMaterialChange(e, ele)"
@@ -2586,6 +2587,8 @@ export default {
       post_formSetTableData: [],
       charge_list: [],
       cus_list: [],
+      add_pre_bp_id: "",
+      edit_pre_bp_id: "",
     };
   },
   computed: {
@@ -4068,6 +4071,12 @@ export default {
                   });
                 }
               });
+              // 更换产品，分类不同，清空附加信息
+              this.handleClearExtInfo(
+                modalData,
+                this.add_pre_bp_id,
+                res.data.bp_id
+              );
               // 是否有上一个的工艺属性ID
               // 因为现在出现2个入口 方法弃用
               // 在列表复制时需要被复制对象的工艺，在新增复制时同理
@@ -4078,6 +4087,16 @@ export default {
         });
       }
     },
+    handleClearExtInfo(modalData, pre_id, cur_id) {
+      if (cur_id != pre_id) {
+        modalData.extArray = [];
+        modalData.metalArray = [];
+      }
+      pre_id = cur_id;
+      // 可以合并
+      this.add_pre_bp_id = cur_id;
+      this.edit_pre_bp_id = cur_id;
+    },
     changeEditProduct(row) {
       if (row) {
         let id = row ? row.value : this.productList[0].id;
@@ -4233,6 +4252,11 @@ export default {
                   });
                 }
               });
+              this.handleClearExtInfo(
+                this.modalData,
+                this.edit_pre_bp_id,
+                res.data.bp_id
+              );
               // 是否有上一个的工艺属性ID
               this.chooseLastRouteId(this.modalData, res);
               this.$forceUpdate();
@@ -4373,7 +4397,7 @@ export default {
     handlePartChange(row, measure, product_num) {
       if (row.change_id) {
         let cur = row.change.filter((item) => item.id == row.change_id);
-        row.org_part_id =JSON.parse(JSON.stringify(row.part_id))
+        row.org_part_id = JSON.parse(JSON.stringify(row.part_id));
         row.part_id = cur[0].part_id;
         row.high = cur[0].high;
         row.highCalc = JSON.parse(JSON.stringify(row.high));
@@ -4434,8 +4458,12 @@ export default {
                   new RegExp(element.measureCalc, "g"),
                   element.value
                 );
-                item.long = eval(item.long);
-                item.long += "";
+                try {
+                  item.long = eval(item.long);
+                  item.long += "";
+                } catch (error) {
+                  item.long = "";
+                }
               }
             }
             if ((item.wide || "").indexOf(element.measureCalc) != -1) {
@@ -4444,8 +4472,12 @@ export default {
                   new RegExp(element.measureCalc, "g"),
                   element.value
                 );
-                item.wide = eval(item.wide);
-                item.wide += "";
+                try {
+                  item.wide = eval(item.wide);
+                  item.wide += "";
+                } catch (error) {
+                  item.wide = "";
+                }
               }
             }
             if ((item.high || "").indexOf(element.measureCalc) != -1) {
@@ -4454,8 +4486,12 @@ export default {
                   new RegExp(element.measureCalc, "g"),
                   element.value
                 );
-                item.high = eval(item.high);
-                item.high += "";
+                try {
+                  item.high = eval(item.high);
+                  item.high += "";
+                } catch (error) {
+                  item.high = "";
+                }
               }
             }
             item.material_detail_list.forEach((it) => {
@@ -4521,7 +4557,7 @@ export default {
       let change = [];
       product.part.map((item) => {
         change.push({
-          old_id: item.org_part_id||item.part_id,
+          old_id: item.org_part_id || item.part_id,
           new_id: item.change.filter((v) => v.id == item.change_id)[0].part_id,
         });
       });
@@ -4555,22 +4591,54 @@ export default {
       });
       return temp[0].material_detail_id;
     },
+    handleCalcPartDetailLong(part_detail, product) {
+      for (const key in product.measure) {
+        const element = product.measure[key];
+        if (element.value) {
+          part_detail._longCalc = part_detail.longCalc.replace(
+            new RegExp(element.e_title, "g"),
+            element.value || ""
+          );
+        }
+      }
+      try {
+        eval(part_detail._longCalc);
+      } catch (error) {
+        for (const key in product.measure) {
+          const element = product.measure[key];
+          part_detail._longCalc = part_detail._longCalc.replace(
+            new RegExp(element.e_title, "g"),
+            element.value || ""
+          );
+        }
+      }
+      return part_detail._longCalc;
+    },
     handleProductMeasureBlur(e, product, measure_detail) {
+      try {
+        measure_detail.value = eval(e.target.value);
+      } catch (error) {
+        console.log("error :>> ", error);
+      }
       product.part.map((part) => {
         part.part_detail.map((part_detail) => {
+          part_detail._longCalc = this.handleCalcPartDetailLong(
+            part_detail,
+            product
+          );
           if (part_detail.material_detail_list.length > 1) {
-            part_detail.material_detail_id = this.handleFindNearest(
-              part_detail.material_detail_list,
-              part.long
-            );
+            try {
+              part_detail.longCalcFinal = eval(part_detail._longCalc);
+              part_detail.material_detail_id = this.handleFindNearest(
+                part_detail.material_detail_list,
+                part_detail.longCalcFinal
+              );
+            } catch (error) {
+              console.log("error :>> ", error);
+            }
           }
         });
       });
-      try {
-        measure_detail.value = eval(e.target.value);
-      } catch (error) {
-        console.log("error :>> ", error);
-      }
       this.$forceUpdate();
     },
     handleProductMeasureChange(e, product, measure_detail) {

src/views/PartsMannage/edit.vue

@@ -501,7 +501,7 @@ export default {
           minWidth: 150,
         },
         {
-          title: "油漆",
+          title: "油漆组合",
           align: "center",
           key: "paint",
           slot: "paintSet",
@@ -631,7 +631,7 @@ export default {
     this.axios("/api/material", { params: { sub_type_id: 2 } }).then((res) => {
       this.materialWoodSkinList = res.data.data;
     });
-    this.axios("/api/material", { params: { sub_type_id: 6 } }).then((res) => {
+    this.axios("/api/material_combination").then((res) => {
       this.materialPaintList = res.data.data;
     });
     this.axios("/api/properties_index", { params: { id: 1 } }).then((res) => {

src/views/ProductMannage/index.vue

@@ -692,15 +692,15 @@ export default {
     changePage(e) {
       this.pageIndex = e;
       this.proxyObj.page_index = this.pageIndex;
-      const sortList = this.sortList.filter((item) => item.sort);
-      this.proxyObj.sortList = sortList;
+      // const sortList = this.sortList.filter((item) => item.sort);
+      // this.proxyObj.sortList = sortList;
       this.getData(this.proxyObj);
     },
     changeSize(e) {
       this.pageSize = e;
       this.proxyObj.page_size = this.pageSize;
-      const sortList = this.sortList.filter((item) => item.sort);
-      this.proxyObj.sortList = sortList;
+      // const sortList = this.sortList.filter((item) => item.sort);
+      // this.proxyObj.sortList = sortList;
       this.getData(this.proxyObj);
     },
     goPage(n, row) {

src/views/ProductionOrderList/ProductionsOrder/Decorationlist.vue

@@ -41,7 +41,7 @@
           <a @click="printChip(row)">打印芯片</a>
           <!-- <a @click="bingChip(row)">绑定芯片</a> -->
           <!-- <a @click="bingChip(row)" v-if="row.tagnum&&row.part_tag">更换芯片</a> -->
-          <a @click="openModal(row)">下生产计划</a>
+          <a @click="openModal(row)" :disabled="row.part_state!=0">下生产计划</a>
           <!-- <a @click="downImg(row.url,row.product_title)">下载图纸</a> -->
         </div>
       </template>
@@ -283,9 +283,9 @@ export default {
           value: '',
           serverName: 'part_state',
           option: [
-            { label: '全部', value: 0 },
-            { label: '未下计划', value: 1 },
-            { label: '已下计划', value: 2 },
+            { label: '全部', value: 99 },
+            { label: '未下计划', value: 0 },
+            { label: '已下计划', value: 1 },
           ],
         },
         {

src/views/ProductionOrderList/ProductionsOrder/list.vue

@@ -51,7 +51,7 @@
              @click="goDetial(row)">详情</a>
           <a v-if='persimissionData["下生产计划"]||persimissionData.all'
              style="margin:0 5px"
-             :disabled="row.state!=1"
+             :disabled="row.state>1"
              @click="openModal(row)">下生产计划</a>
         </div>
       </template>
@@ -92,9 +92,9 @@ export default {
         {
           title: '生产状态', align: 'center', key: 'state', minWidth: 150,
           render: (h, params) => h('span', {},
-            params.row.state == 1 ? '未下计划'
-              : (params.row.state == 2 ? '计划中'
-                : (params.row.state == 3 ? '计划完成' : '全部'))
+            params.row.state == 0 ? '未下计划'
+              : (params.row.state == 1 ? '计划中'
+                : (params.row.state == 2 ? '计划完成' : '全部'))
           )
         },
         { title: '小区', align: 'center', key: 'residential_name', minWidth: 200 },
@@ -195,10 +195,10 @@ export default {
         {
           title: '生产状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',
           option: [
-            { label: '全部', value: 0 },
-            { label: '未下计划', value: 1 },
-            { label: '计划中', value: 2 },
-            { label: '计划完成', value: 3 },
+            { label: '全部', value: 99 },
+            { label: '未下计划', value: 0 },
+            { label: '计划中', value: 1 },
+            { label: '计划完成', value: 2 },
           ]
         },
         { title: '下单日期范围', name: 'Input', start_server: 'start_time', end_server: 'end_time', start_value: '', end_value: '', isDate: true, serverName: 'id2', start_placeholder: '开始日期', end_placeholder: '结束日期' },