1

src/views/BidSystem/ContractList/info.vue

@@ -10,13 +10,13 @@
         >
           添加特殊字段
         </Button> -->
-        <Button
+        <!-- <Button
           @click="showForms = true"
           v-show="currencyTab == 'name2'"
           type="primary"
           style="margin-right: 10px"
           >表单设置</Button
-        >
+        > -->
         <Button
           @click="handleOpenModal"
           v-show="currencyTab == 'name2'"
@@ -144,6 +144,7 @@
               @click="handleShowCurrencyArea(areaItem, areaIndex)"
               size="small"
               type="primary"
+              style="margin-right:10px"
               v-show="!(areaItem.product && areaItem.product.length > 0)"
               >展示产品</Button
             >
@@ -163,7 +164,10 @@
               v-show="areaItem.product && areaItem.product.length > 0"
               >下深化</Button
             >
-            <Button size="small" type="primary" v-show="areaItem.isAllDeeped"
+            <Button
+              size="small"
+              type="primary"
+              v-show="areaItem.isAllDeeped && areaItem.product.length > 0"
               >已下深化</Button
             >
           </div>
@@ -207,7 +211,7 @@
             >
               <template slot="set" slot-scope="{ row, index }">
                 <a
-                  :disabled="row.sub_state > 1"
+                  :disabled="row.sub_state == 1"
                   @click="handleRowDeep(row, index)"
                   >下深化</a
                 >
@@ -434,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
               >
@@ -656,7 +660,7 @@
       </div>
     </Modal>
     <!-- 表单设置 -->
-    <Modal
+    <!-- <Modal
       v-model="showForms"
       @on-ok="postForms(1)"
       class-name="vertical-center-modal"
@@ -670,12 +674,11 @@
         :data="post_formSetTableData"
       >
       </Table>
-    </Modal>
+    </Modal> -->
   </div>
 </template>
 
 <script>
-import { isArray } from "xe-utils";
 // 这里可以导入其他文件（比如:组件，工具js，第三方插件js，json文件，图片文件等等）
 // 例如:import 《组件名称》 from '《组件路径》';
 
@@ -816,7 +819,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 ? "是" : "否");
           },
         },
         {
@@ -1356,7 +1359,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 ? "是" : "否");
               },
             },
             {
@@ -1589,7 +1592,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 ? "是" : "否");
           },
         },
         {

src/views/BidSystem/ContractList/list.vue

@@ -70,7 +70,7 @@
         <div>
           <a
             style="margin: 0 5px"
-            :disabled="row.sub_status != 0"
+            :disabled="row.sub_status>1"
             @click="handleSet(row, index, 1)"
             >深化</a
           >
@@ -255,28 +255,28 @@ export default {
         {
           title: "订单状态",
           align: "center",
-          key: "state",
+          key: "sub_status",
           minWidth: 100,
           // { label: "安装", value: 16 },
           render: (h, params) =>
             h(
               "span",
               {},
-              params.row.state == 0
+              params.row.sub_status == 0
                 ? "订单制作中"
-                : params.row.state == 1
+                : params.row.sub_status == 1
                 ? "深化中"
-                : params.row.state == 2
+                : params.row.sub_status == 2
                 ? "拆单中"
-                : params.row.state == 3
+                : params.row.sub_status == 3
                 ? "生产订单"
-                : params.row.state == 4
+                : params.row.sub_status == 4
                 ? "计划订单"
-                : params.row.state == 5
+                : params.row.sub_status == 5
                 ? "派工订单"
-                : params.row.state == 6
+                : params.row.sub_status == 6
                 ? "已完成"
-                : params.row.state == 99
+                : params.row.sub_status == 99
                 ? "全部"
                 : "订单制作中"
             ),
@@ -390,7 +390,7 @@ export default {
           title: "客户姓名",
         },
         { is_show: true, key: "mobile", value: "手机号", title: "手机号" },
-        { is_show: true, key: "state", value: "订单状态", title: "订单状态" },
+        { is_show: true, key: "sub_status", value: "订单状态", title: "订单状态" },
         {
           is_show: true,
           key: "warning_state",
@@ -497,7 +497,7 @@ export default {
           value: "交付日期",
           title: "交付日期",
         },
-        { is_show: true, key: "state", value: "订单状态", title: "订单状态" },
+        { is_show: true, key: "sub_status", value: "订单状态", title: "订单状态" },
         {
           is_show: true,
           key: "crt_time",
@@ -605,7 +605,7 @@ export default {
       row.page_index = this.page_index;
       row.page_size = this.page_size;
       // 0 业务单
-      row.sub_status = 0;
+      // row.sub_status = 0;
       this.proxyObj = row;
       this.getData(row);
     },
@@ -752,22 +752,17 @@ export default {
           title: "订单状态",
           name: "Select",
           placeholder: "请选择订单状态",
-          serverName: "state",
+          serverName: "sub_status",
           value: "",
           option: [
-            { label: "订单审核中", value: 0 },
+            { label: "全部", value: 99 },
+            { label: "订单制作中", value: 0 },
             { label: "深化中", value: 1 },
-            { label: "深化审核中", value: 2 },
-            { label: "深化通过", value: 3 },
-            { label: "拆单中", value: 4 },
-            { label: "拆单审核中", value: 5 },
-            { label: "拆单通过", value: 6 },
-            { label: "生产审核中", value: 7 },
-            { label: "到生产计划", value: 8 },
-            { label: "派工", value: 9 },
-            { label: "包装", value: 10 },
-            { label: "发货", value: 11 },
-            { label: "安装", value: 12 },
+            { label: "拆单中", value: 2 },
+            { label: "生产订单", value: 3 },
+            { label: "计划订单", value: 4 },
+            { label: "派工订单", value: 5 },
+            { label: "已完成", value: 6 },
           ],
         },
         {

src/views/BidSystem/DeepeningOrder/edit.vue

@@ -663,6 +663,7 @@ export default {
             align: "center",
             width: "150",
             slot: `formula_${el.e_title}`,
+            resizable: true,
           });
         });
         this.tableColumns = [...this.tableColumns, ...tempArr];

src/views/BidSystem/DeepeningOrder/info.vue

@@ -2,12 +2,12 @@
   <div class="BidSystemDeepeningOrderDetail">
     <Toptitle title="深化单详情">
       <slot name="titleButton">
-        <!-- <Button
+        <Button
           @click="handleFinish()"
           type="primary"
           style="margin-right: 10px"
           >完成</Button
-        > -->
+        >
         <Upload
           style="display: inline"
           name="your_file"
@@ -17,9 +17,7 @@
           :on-success="uploadSuccess"
           :action="$store.state.ip + '/api/order_area_product_import'"
         >
-          <Button type="primary" style="margin-right: 10px"
-            >导入</Button
-          >
+          <Button type="primary" style="margin-right: 10px">导入</Button>
         </Upload>
         <Button
           @click="showSupModal = true"
@@ -1297,7 +1295,34 @@ export default {
       item.showValue = value.label;
       item.showId = value.value;
     },
-    handleFinish() {},
+    handleFinish() {
+      if (this.selected.length < 1) {
+        this.$Message.warning("请选择数据");
+      } else {
+        const order_area_product_id = this.selected.map(
+          (item) => item.order_area_product_id || item.id
+        );
+        this.$Modal.confirm({
+          title: "确认完成？",
+          // content: "此操作确认后不可恢复，请确认！",
+          onOk: () => {
+            this.axios({
+              method: "post",
+              url: "/api/order_area_product_status",
+              data: {
+                order_area_product_id,
+              },
+            }).then((res) => {
+              if (res.doce == 200) {
+                this.$Message.success(res.msg);
+                this.initData(this.formData.order_no);
+              }
+            });
+          },
+          onCancel: () => {},
+        });
+      }
+    },
     looks(img) {
       const array = [{ img_url: img }];
       this.$previewImg({

src/views/BidSystem/DeepeningOrder/list.vue

@@ -64,9 +64,9 @@
             @click="handleSet(row, index, 1)"
             >下拆单</a
           >
-            <!-- :disabled="row.sub_status != 1" -->
           <a
             style="margin: 0 5px"
+            :disabled="row.sub_status == 2"
             @click="handleSet(row, index, 2)"
             >编辑</a
           >
@@ -291,7 +291,7 @@ export default {
           url: "/api/order_area_pull",
           params: {
             order_no: this.order_no,
-            sub_status: 2,
+            deep_status: 2,
             process_man: this.process_man,
             process_start_time: this.func.replaceDateNoHMS(
               this.process_start_time
@@ -370,7 +370,7 @@ export default {
     init(row) {
       this.page_index = 1;
       //1 深化
-      row.sub_status = 1;
+      row.deep_status = 1;
       row.page_index = this.page_index;
       row.page_size = this.page_size;
       this.proxyObj = row;
@@ -455,10 +455,9 @@ export default {
           title: "深化状态",
           name: "Select",
           placeholder: "请选择",
-          serverName: "state",
+          serverName: "sub_status",
           value: "",
           option: [
-            { label: "全部", value: 99 },
             { label: "未深化", value: 0 },
             { label: "深化中", value: 1 },
             { label: "深化完成", value: 2 },

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -23,7 +23,7 @@
       <div><span>产品名称:</span>{{ formData.title }}</div>
       <div><span>计量单位:</span>{{ formData.unit }}</div>
       <div><span>数量:</span>{{ formData.num }}</div>
-      <div><span>价格:</span>{{ formData.price }}</div>
+      <!-- <div><span>价格:</span>{{ formData.price }}</div> -->
       <div><span>规格:</span>{{ formData.measure }}</div>
       <div><span>工艺属性:</span>{{ formData.process_property }}</div>
       <div>
@@ -42,7 +42,7 @@
       <div><span>备注:</span>{{ formData.remark }}</div>
     </div>
     <div class="similar_product">
-      <div>
+      <!-- <div>
         <span>价格:</span>
         <Input
           type="text"
@@ -52,7 +52,7 @@
           style="width: 150px; margin-right: 10px"
           placeholder="请输入价格"
         />
-      </div>
+      </div> -->
       <div>
         <span>型号:</span>
         <Input
@@ -819,7 +819,7 @@ export default {
       formData: {
         title: "", //产品名称
         num: "", //数量
-        price: "", //价格
+        // price: "", //价格
         measure: "", //规格
         process_property: "", //工艺属性
         url: [], //图纸

src/views/BidSystem/ProductDeOrder/detail.vue

@@ -30,6 +30,7 @@
           <Input
             type="text"
             size="small"
+            clearable
             v-model="searchData.title"
             placeholder="请输入产品名称"
           />
@@ -38,6 +39,7 @@
           <Input
             type="text"
             size="small"
+            clearable
             v-model="searchData.url_number"
             style="width: 150px"
             placeholder="请输入图号"
@@ -51,9 +53,9 @@
             filterable
             style="width: 150px"
           >
-            <Option label="未完成" :value="1"> </Option>
-            <Option label="拆单中" :value="2"> </Option>
-            <Option label="已完成" :value="3"> </Option>
+            <Option label="未完成" :value="0"> </Option>
+            <Option label="拆单中" :value="1"> </Option>
+            <Option label="已完成" :value="2"> </Option>
           </Select>
         </FormItem>
         <FormItem>
@@ -110,7 +112,7 @@
         <Table :columns="tableColumns" :data="formData.detail" border>
           <template slot="set" slot-scope="{ row, index }">
             <a
-              :disabled="row.product_id != 0"
+              :disabled="row.status != 0"
               style="margin:0 5px"
               @click="handleSet(row, index, 1)"
               >拆单</a
@@ -315,13 +317,13 @@ export default {
         },
         {
           title: "拆单状态",
-          key: "product_id",
+          key: "status",
           align: "center",
           resizable: true,
           minWidth: 80,
           render: (h, params) => {
             const { row } = params;
-            return h("span", {}, row.product_id == 0 ? "未完成" : "已完成");
+            return h("span", {}, row.status == 0 ? "未完成" : "已完成");
           },
         },
         {

src/views/BidSystem/ProductDeOrder/list.vue

@@ -64,16 +64,17 @@
             @click="handleSet(row, index, 1)"
             >下生产</a
           >
-          <a style="margin: 0 5px" @click="handleSet(row, index, 2)">拆单</a>
+          <a
+            style="margin: 0 5px"
+            :disabled="row.sub_status == 3"
+            @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 != 2"
-            :style="
-              row.sub_status != 2
-                ? 'margin: 0 5px;'
-                : 'margin: 0 5px;'
-            "
+            :style="row.sub_status != 2 ? 'margin: 0 5px;' : 'margin: 0 5px;'"
             @click="handleSet(row, index, 4)"
             >删除</a
           >
@@ -211,17 +212,17 @@ export default {
         {
           title: "拆单状态",
           align: "center",
-          key: "state",
+          key: "sub_status",
           minWidth: 100,
           render: (h, params) =>
             h(
               "span",
               {},
-              // params.row.state == 0
+              // params.row.sub_status == 0
               //   ? "待审核"
-                params.row.state == 1
+              params.row.sub_status == 1
                 ? "未拆单"
-                : params.row.state == 2
+                : params.row.sub_status == 2
                 ? "拆单中"
                 : "拆单完成"
             ),
@@ -280,30 +281,27 @@ export default {
         url: "/api/order_area_pull",
         params: {
           order_no: this.order_no,
-          sub_status: 3,
+          explode_status: 3,
           process_man: this.process_man,
           process_start_time: this.func.replaceDateNoHMS(
             this.process_start_time
           ),
           process_end_time: this.func.replaceDateNoHMS(this.process_end_time),
         },
-      })
-        .then((res) => {
-          if(res.code==200){
-              this.$Message.success(res.msg);
-              this.getData(this.proxyObj);
-          }
-        
-        })
-        .catch((err) => {});
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success(res.msg);
+          this.getData(this.proxyObj);
+        }
+      });
     },
     // 1下生产  2拆单  3详情 4删除 5成本预算
     handleSet(row, index, type) {
       switch (type) {
         case 1:
-          this.process_man = '';
-          this.process_start_time = '';
-          this.process_end_time = '';
+          this.process_man = "";
+          this.process_start_time = "";
+          this.process_end_time = "";
           this.processModal = true;
           this.order_no = row.order_no;
           // this.$Modal.confirm({
@@ -381,7 +379,7 @@ export default {
     init(row) {
       this.page_index = 1;
       // 2拆单
-      row.sub_status = 2;
+      row.explode_status = 2;
       row.page_index = this.page_index;
       row.page_size = this.page_size;
       this.proxyObj = row;
@@ -500,7 +498,7 @@ export default {
 };
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .pageSlotStyle {
   display: flex;
   justify-content: center;

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -4373,6 +4373,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.part_id = cur[0].part_id;
         row.high = cur[0].high;
         row.highCalc = JSON.parse(JSON.stringify(row.high));
@@ -4520,7 +4521,7 @@ export default {
       let change = [];
       product.part.map((item) => {
         change.push({
-          old_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,
         });
       });

vue.config.js

@@ -2,7 +2,7 @@ const axios_default_ip =
     process.env.NODE_ENV == 'dev' ?
     'http://121.41.102.225:82' :
     process.env.NODE_ENV == 'test-prd' ?
-    'http://121.41.102.225:82' //测试服
+    'http://124.71.176.88:882' //测试服
     :
     process.env.NODE_ENV == 'prd_other' ?
     'http://121.37.173.82:82' //森兰九鼎