工序报工-接口修改参数修改

src/api/produce/workOrder.js

@@ -364,3 +364,14 @@ export async function fileReleaseAPI(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// 获取工单内所有产品，产品编码和产品名称
+export async function getAllProductInWorkOrder(params) {
+  const res = await request.get(`/mes/workorder/getAllProductInWorkOrder`, {
+    params
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/producetaskrecordrulesrecord/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request';
 // 一键报工，新增或修改填写表单类型的执行记录，并修改状态为已执行
 export async function saveOrUpdateAndSubmit(body) {
   const res = await request.post(
-    '/mes/producetaskrecordrulesrecord/saveOrUpdateAndSubmit',
+    '/mes/producetaskrulerecord/saveOrUpdateAndSubmit',
     body
   );
   if (res.data.code == 0) {
@@ -15,7 +15,7 @@ export async function saveOrUpdateAndSubmit(body) {
 // 缓存，新增或修改填写表单类型的执行记录
 export async function saveOrUpdate(body) {
   const res = await request.post(
-    '/mes/producetaskrecordrulesrecord/saveOrUpdate',
+    '/mes/producetaskrulerecord/saveOrUpdate',
     body
   );
   if (res.data.code == 0) {
@@ -27,7 +27,7 @@ export async function saveOrUpdate(body) {
 // 一键报工，新增或修改填写表单类型的执行记录，并修改状态为已执行
 export async function logicDelete(id) {
   const res = await request.delete(
-    '/mes/producetaskrecordrulesrecord/logicDelete/' + id
+    '/mes/producetaskrulerecord/logicDelete/' + id
   );
   if (res.data.code == 0) {
     return res.data.data;
@@ -36,9 +36,7 @@ export async function logicDelete(id) {
 }
 
 export async function getById(id) {
-  const res = await request.get(
-    '/mes/producetaskrecordrulesrecord/getById/' + id
-  );
+  const res = await request.get('/mes/producetaskrulerecord/getById/' + id);
   if (res.data.code == 0) {
     return res.data.data;
   }

src/api/producetaskrulerecord/index.js

@@ -35,3 +35,12 @@ export async function isPreProductionResult(body) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// 分页，展示事项规则和记录规则的执行记录，无论是否临时记录 /mes/producetaskrulerecord/page
+export async function producetaskrulerecordPage(body) {
+  const res = await request.post('/mes/producetaskrulerecord/page', body);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/components/common/seekPage.vue

@@ -1,199 +1,255 @@
 <template>
-    <div class="index_box">
-        <el-form label-width="90px" :inline="true">
-            <el-form-item v-for="(item, i) in seekList" :key="i">
-                <el-form-item :label="item.label" :label-width="item.labelWidth + 'px'" v-if="i <= 2">
-                    <!-- input 输入 -->
-                    <div>
-                        <div v-if="item.type == 'input'">
-
-                            <el-input clearable v-model="defaultWhere[item.value]"
-                                :placeholder="item.placeholder || '请输入内容'"
-                                :style="{ width: item.width ? item.width + 'px' : '220px' }" />
-                        </div>
-                        <div v-if="item.type == 'select'">
-                            <el-select clearable :v-model="defaultWhere[item.value]"
-                                :placeholder="item.placeholder || '请输入内容'" :multiple="item.multiple ? item.multiple : false"
-                                :filterable="item.filterable ? item.filterable : true"
-                                :style="{ width: item.width ? item.width + 'px' : '220px' }">
-                                <el-option v-for="(op, i) in item.planList" :label="op.label" :value="op.value"
-                                    :key="i"></el-option>
-                            </el-select>
-                        </div>
-                        <div v-if="item.type == 'date'">
-                            <el-date-picker v-model="defaultWhere[item.value]" @visible-change="change"
-                                :type="item.dateType || 'daterange'" range-separator="至" start-placeholder="开始日期"
-                                end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
-                                :style="{ width: item.width ? item.width + 'px' : '220px' }">
-
-
-                            </el-date-picker>
-                        </div>
-                    </div>
-                </el-form-item>
-
-            </el-form-item>
-
-            <el-form-item>
-                <el-dropdown ref="dropdownref" trigger="click" :hide-on-click="false" v-model="dropdownVisible">
-                    <div v-if="seekList.length > 3">
-                        <span class="el-dropdown-link">
-                            更多选项<i class="el-icon-arrow-down el-icon--right"></i>
-                        </span>
-                        <el-dropdown-menu slot="dropdown" >
-                            <div class="padding">
-                                <el-form label-position="left">
-                                    <el-form-item v-for="(item, i) in deboListRow" :key="i" :inline="true"
-                                        label-position="left">
-                                        <el-form-item :label-width="item.labelWidth ? item.labelWidth : '90' + 'px'"
-                                            :inline="true" :label="item.label">
-                                            <div v-if="item.type == 'input'">
-                                                <el-input clearable v-model="defaultWhere[item.value]"
-                                                    :placeholder="item.placeholder || '请输入内容'"
-                                                    :style="{ width: item.width ? item.width + 'px' : '220px' }" />
-                                            </div>
-                                            <div v-if="item.type == 'select'">
-                                                <el-select clearable v-model="defaultWhere[item.value]"
-                                                    :multiple="item.multiple ? item.multiple : false"
-                                                    :filterable="item.filterable ? item.filterable : true"
-                                                    :placeholder="item.placeholder || '请输入内容'"
-                                                    :style="{ width: item.width ? item.width + 'px' : '220px' }"
-                                                    @visible-change="change" @change="handerChange">
-                                                    <el-option v-for="(op, i) in item.planList" :label="op.label"
-                                                        :value="op.value" :key="i"></el-option>
-                                                </el-select>
-                                            </div>
-
-                                            <div v-if="item.type == 'date'">
-                                                <el-date-picker v-model="defaultWhere[item.value]"
-                                                    @blur="change" :type="item.dateType || 'daterange'"
-                                                    range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-                                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                                    
-                                                    :style="{ width: item.width ? item.width + 'px' : '220px' }">
-
-
-                                                </el-date-picker>
-                                            </div>
-
-                                        </el-form-item>
-                                    </el-form-item>
-                                </el-form>
-                            </div>
-
-                        </el-dropdown-menu>
-                    </div>
-                </el-dropdown>
-
-
-            </el-form-item>
-
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
-                    查询
-                </el-button>
-                <el-button @click="reset" icon="el-icon-refresh-left" type="primary">重置</el-button>
-            </el-form-item>
-        </el-form>
-
-
-    </div>
+  <div class="index_box">
+    <el-form label-width="90px" :inline="true">
+      <el-form-item v-for="(item, i) in seekList" :key="i">
+        <el-form-item
+          :label="item.label"
+          :label-width="item.labelWidth + 'px'"
+          v-if="i <= maxLength - 1"
+        >
+          <!-- input 输入 -->
+          <div>
+            <div v-if="item.type == 'input'">
+              <el-input
+                clearable
+                v-model="defaultWhere[item.value]"
+                :placeholder="item.placeholder || '请输入内容'"
+                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+              />
+            </div>
+            <div v-if="item.type == 'select'">
+              <el-select
+                clearable
+                :v-model="defaultWhere[item.value]"
+                :placeholder="item.placeholder || '请输入内容'"
+                :multiple="item.multiple ? item.multiple : false"
+                :filterable="item.filterable ? item.filterable : true"
+                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+              >
+                <el-option
+                  v-for="(op, i) in item.planList"
+                  :label="op.label"
+                  :value="op.value"
+                  :key="i"
+                ></el-option>
+              </el-select>
+            </div>
+            <div v-if="item.type == 'selectTree'">
+              <ele-tree-select
+                clearable
+                ref="processTypeRef"
+                filterable
+                :data="item.planList"
+                v-model="defaultWhere[item.value]"
+                :childrenKey="item.childrenKey || 'children'"
+                valueKey="id"
+                labelKey="name"
+                :placeholder="item.placeholder || '请选择'"
+                default-expand-all
+                :style="{ width: item.width ? item.width + 'px' : '230px' }"
+              />
+            </div>
+            <div v-if="item.type == 'date'">
+              <el-date-picker
+                v-model="defaultWhere[item.value]"
+                @visible-change="change"
+                :type="item.dateType || 'daterange'"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+              >
+              </el-date-picker>
+            </div>
+          </div>
+        </el-form-item>
+      </el-form-item>
+
+      <el-form-item>
+        <el-dropdown
+          ref="dropdownref"
+          trigger="click"
+          :hide-on-click="false"
+          v-model="dropdownVisible"
+          v-if="seekList.length > maxLength"
+        >
+          <div>
+            <span class="el-dropdown-link">
+              更多选项<i class="el-icon-arrow-down el-icon--right"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <div class="padding">
+                <el-form label-position="left">
+                  <el-form-item
+                    v-for="(item, i) in deboListRow"
+                    :key="i"
+                    :inline="true"
+                    label-position="left"
+                  >
+                    <el-form-item
+                      :label-width="
+                        item.labelWidth ? item.labelWidth : '90' + 'px'
+                      "
+                      :inline="true"
+                      :label="item.label"
+                    >
+                      <div v-if="item.type == 'input'">
+                        <el-input
+                          clearable
+                          v-model="defaultWhere[item.value]"
+                          :placeholder="item.placeholder || '请输入内容'"
+                          :style="{
+                            width: item.width ? item.width + 'px' : '220px'
+                          }"
+                        />
+                      </div>
+                      <div v-if="item.type == 'select'">
+                        <el-select
+                          clearable
+                          v-model="defaultWhere[item.value]"
+                          :multiple="item.multiple ? item.multiple : false"
+                          :filterable="item.filterable ? item.filterable : true"
+                          :placeholder="item.placeholder || '请输入内容'"
+                          :style="{
+                            width: item.width ? item.width + 'px' : '220px'
+                          }"
+                          @visible-change="change"
+                          @change="handerChange"
+                        >
+                          <el-option
+                            v-for="(op, i) in item.planList"
+                            :label="op.label"
+                            :value="op.value"
+                            :key="i"
+                          ></el-option>
+                        </el-select>
+                      </div>
+
+                      <div v-if="item.type == 'date'">
+                        <el-date-picker
+                          v-model="defaultWhere[item.value]"
+                          @blur="change"
+                          :type="item.dateType || 'daterange'"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          :style="{
+                            width: item.width ? item.width + 'px' : '220px'
+                          }"
+                        >
+                        </el-date-picker>
+                      </div>
+                    </el-form-item>
+                  </el-form-item>
+                </el-form>
+              </div>
+            </el-dropdown-menu>
+          </div>
+        </el-dropdown>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="ele-btn-icon"
+          @click="search"
+        >
+          查询
+        </el-button>
+        <el-button @click="reset" icon="el-icon-refresh-left" type="primary"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+  </div>
 </template>
 
 <script>
-
-let defaultWhere = {};
-export default {
+  let defaultWhere = {};
+  export default {
     props: {
-        seekList: {
-            type: Array,
-            default: () => []
-        }
+      seekList: {
+        type: Array,
+        default: () => []
+      },
+      // 展示几个选择项，其余收起到更多
+      maxLength: {
+        type: Number,
+        default: 3
+      }
     },
 
-    components: {
-
-    },
+    components: {},
     watch: {
-        seekList: {
-            handler(val) {
-
-                val.forEach(item => {
-
-                    defaultWhere[item.value] = null;
-
-                })
-
-                this.$nextTick(() => {
-
-                    if (Array.isArray(val) && val.length <= 3) {
-                        this.seekListRow = val
-                    } else if (Array.isArray(val) && val.length >= 3) {
-                        this.seekListRow = val.slice(0, 3);
-                        this.deboListRow = val.slice(3);
-                    }
-                })
-
-            },
-            deep: true,
-            immediate: true,
-        }
+      seekList: {
+        handler(val) {
+          val.forEach((item) => {
+            defaultWhere[item.value] = null;
+          });
+
+          this.$nextTick(() => {
+            if (Array.isArray(val) && val.length <= this.maxLength) {
+              this.seekListRow = val;
+            } else if (Array.isArray(val) && val.length >= this.maxLength) {
+              this.seekListRow = val.slice(0, this.maxLength);
+              this.deboListRow = val.slice(this.maxLength);
+            }
+          });
+        },
+        deep: true,
+        immediate: true
+      }
     },
 
     data() {
+      return {
+        defaultWhere: {},
+        dropdownVisible: true,
 
-
-        return {
-            defaultWhere: {},
-            dropdownVisible: true,
-
-            deboListRow: [],
-            seekListRow: []
-        }
+        deboListRow: [],
+        seekListRow: []
+      };
     },
 
     computed: {
-        info() {
-            return this.$store.state.user.info;
-        },
-
+      info() {
+        return this.$store.state.user.info;
+      }
     },
 
-    created() {
-
-
-    },
+    created() {},
     methods: {
-
-        change(visible) {
-           
-            this.dropdownVisible = visible;
-            this.$refs.dropdownref.show()
-        },
-        handerChange() {
-            this.$refs.dropdownref.show()
-        },
-
-        search() {
-            this.$emit('search', this.defaultWhere);
-        },
-        // 重置
-        reset() {
-            this.defaultWhere = {};
-            this.search();
-        }
-
-        //  折叠悬浮中样式调整
-    },
-}
+      change(visible) {
+        this.dropdownVisible = visible;
+        this.$refs.dropdownref.show();
+      },
+      handerChange() {
+        this.$refs.dropdownref.show();
+      },
+
+      search() {
+        this.$emit('search', this.defaultWhere);
+      },
+      // 重置
+      reset() {
+        this.defaultWhere = {};
+        this.search();
+      }
+
+      //  折叠悬浮中样式调整
+    }
+  };
 </script>
 
 <style scoped>
-.index_box {
+  .index_box {
     display: flex;
-}
+  }
 
-.padding {
+  .padding {
     padding: 20px;
-}
-</style>
+  }
+</style>

src/views/batchRecord/after.vue

@@ -17,7 +17,12 @@
       };
     },
     created() {},
-    methods: {}
+    methods: {
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        return pageUsers({ ...where, ...order, page, limit });
+      }
+    }
   };
 </script>
 

src/views/batchRecord/before.vue

@@ -1,6 +1,16 @@
 <template>
   <div class="ele-body">
-    <el-card shadow="never" v-loading="loading"> 产前准备 </el-card>
+    <el-card shadow="never">
+      <seekPage :seekList="seekList" :maxLength="3" @search="search"></seekPage>
+
+      <ele-pro-table
+        ref="table"
+        row-key="id"
+        :columns="columns"
+        :datasource="datasource"
+      >
+      </ele-pro-table>
+    </el-card>
   </div>
 </template>
 
@@ -13,11 +23,73 @@
     mixins: [dictMixins, tableColumnsMixin],
     data() {
       return {
-        loading: true
+        // 搜索字段
+        seekList: [
+          {
+            label: '记录编码:',
+            value: 'name',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '类型:',
+            value: 'classify',
+            type: 'select',
+            placeholder: '请选择',
+            planList: []
+          },
+          {
+            label: '产品名称:',
+            value: 'name',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '状态:',
+            value: 'classify',
+            type: 'select',
+            placeholder: '请选择',
+            planList: []
+          }
+        ],
+        // 表格字段
+        columns: [
+          {
+            width: 45,
+            type: 'index',
+            columnKey: 'index',
+            align: 'center'
+          },
+          {
+            prop: 'username',
+            label: '用户账号'
+          },
+          {
+            label: '用户名',
+            prop: 'nickname'
+          },
+          {
+            label: '手机号',
+            prop: 'phone'
+          },
+          {
+            label: '创建时间',
+            prop: 'createTime'
+          }
+        ]
       };
     },
     created() {},
-    methods: {}
+    methods: {
+      // 刷新表格
+      reload(where) {
+        this.$refs.table.reload({ page: 1, where });
+      },
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        return pageUsers({ ...where, ...order, page, limit });
+      }
+    }
   };
 </script>
 

src/views/batchRecord/index.vue

@@ -1,24 +1,215 @@
 <template>
   <div class="ele-body">
-    <el-card shadow="never" v-loading="loading"> 批记录管理 </el-card>
+    <el-card shadow="never">
+      <ele-split-layout
+        width="460px"
+        allow-collapse
+        :right-style="{ overflow: 'hidden' }"
+      >
+        <div class="left-box">
+          <div class="left-item">
+            <div class="title">产品</div>
+
+            <el-input
+              placeholder="搜索"
+              suffix-icon="el-icon-search"
+              v-model="queryParam"
+              @change="debounce(getAllProductInWorkOrder(), 500)"
+            ></el-input>
+
+            <div class="list-box">
+              <div class="list-item" v-for="i in 10" :key="i">
+                产品{{ i }}
+              </div>
+            </div>
+          </div>
+          <div class="left-item">
+            <div class="title">批次号</div>
+            <div class="list-box">
+              <div class="list-item" v-for="i in 10" :key="i">
+                产品{{ i }}
+              </div>
+            </div>
+          </div>
+          <div class="left-item">
+            <div class="title">批记录类型</div>
+            <div class="list-box">
+              <div
+                class="list-item"
+                v-for="i in types"
+                :key="i.name"
+                :class="{ active: activeType == i.name }"
+              >
+                {{ i.name }}
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <template v-slot:content>
+          <div>
+            <seek-page :seekList="seekList" @search="search"></seek-page>
+            <ele-pro-table
+              ref="table"
+              row-key="id"
+              :columns="columns"
+              :datasource="datasource"
+            >
+            </ele-pro-table>
+          </div>
+        </template>
+      </ele-split-layout>
+    </el-card>
   </div>
 </template>
 
 <script>
   import dictMixins from '@/mixins/dictMixins';
   import tableColumnsMixin from '@/mixins/tableColumnsMixin';
+  import { producetaskrulerecordPage } from '@/api/producetaskrulerecord/index';
+  import seekPage from '@/components/common/seekPage.vue';
+  import { getAllProductInWorkOrder } from '@/api/produce/workOrder';
 
   export default {
+    components: { seekPage },
     name: 'batchRecord',
     mixins: [dictMixins, tableColumnsMixin],
     data() {
       return {
-        loading: true
+        seekList: [
+          {
+            label: '单据编码：',
+            value: 'keyWord',
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '单据名称：',
+            value: 'name',
+            type: 'input',
+            placeholder: ''
+          }
+        ],
+        columns: [
+          {
+            width: 45,
+            type: 'index',
+            columnKey: 'index',
+            align: 'center'
+          }
+          // {
+          //   prop: 'username',
+          //   label: '批记录类型'
+          // },
+          // {
+          //   prop: '',
+          //   label: '单据名称'
+          // },
+          // {
+          //   prop: '',
+          //   label: '单据编码'
+          // },
+          // {
+          //   prop: '',
+          //   label: '单据状态'
+          // },
+          // {
+          //   prop: '',
+          //   label: '审核状态'
+          // }
+        ],
+        types: [
+          {
+            name: '全部'
+          },
+          {
+            name: '生产工单'
+          },
+          {
+            name: '领料单'
+          },
+          {
+            name: '退票单'
+          },
+          {
+            name: '报工'
+          },
+          {
+            name: '质检工单'
+          },
+          {
+            name: '入库单'
+          },
+          {
+            name: '生产记录'
+          },
+          {
+            name: '设备工单'
+          },
+          {
+            name: '工艺文件'
+          }
+        ],
+        activeType: '全部',
+        // 产品搜索条件
+        queryParam: ''
       };
     },
-    created() {},
-    methods: {}
+    created() {
+      // this.getAllProductInWorkOrder();
+    },
+    methods: {
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        // return pageUsers({ ...where, ...order, page, limit });
+        return [];
+      },
+      search(where) {
+        this.$refs.table.reload(where);
+      },
+      // 获取产品和批次号
+      async getAllProductInWorkOrder() {
+        const data = await getAllProductInWorkOrder({
+          queryParam: this.queryParam
+        });
+      }
+    }
   };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  .left-box {
+    display: flex;
+
+    .left-item {
+      flex: 1;
+      border-right: 1px solid #ededed;
+      min-height: 80vh;
+      padding: 0 5px;
+
+      .title {
+        text-align: center;
+        font-size: 16px;
+        padding: 10px 0;
+        border-bottom: 1px solid #ededed;
+        margin-bottom: 15px;
+      }
+
+      .list-box {
+        margin-top: 10px;
+
+        .list-item {
+          padding: 15px 10px;
+          border-bottom: 1px solid #ededed;
+          font-size: 14px;
+          cursor: pointer;
+        }
+
+        .active {
+          background: #1890ff;
+          color: #fff;
+        }
+      }
+    }
+  }
+</style>

src/views/produce/components/footBtn.vue

@@ -15,7 +15,8 @@
 
 <script>
   export default {
-    props: {
+  props: {
+      // ?
       type: {
         type: String | Number,
         default: ''

src/views/produce/components/new_produceOrder.vue

@@ -462,6 +462,8 @@
             workOrderIds: val.map((i) => i.id)
           });
           this.$emit('changeIsPreProductionResult', result);
+        } else {
+          this.$emit('changeIsPreProductionResult', true);
         }
 
         let ids = [];

src/views/produce/components/prenatalExamination/programRulesDialog.vue

@@ -249,7 +249,7 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作指导" prop="operationGuide">
+                <el-table-column label="操作指导" prop="operationGuide" width="200">
                   <template slot-scope="scope">
                     <div
                       class="operationGuide_box"
@@ -479,7 +479,7 @@
       async getInfo() {
         try {
           this.loading = true;
-          const { data } = await getById(this.productionInfo.eamPlanIds[0]);
+          const { data } = await getById(this.productionInfo.eamPlanId);
           console.log('data 基本信息', data);
           // 数据回显
           this.$util.assignObject(this.addForm, data);
@@ -648,7 +648,8 @@
               produceTaskConfigId: this.productionInfo.produceTaskConfigId,
               produceTaskId: this.productionInfo.produceTaskId,
               reportWorkType: this.productionInfo.reportWorkType,
-              ruleId: this.productionInfo.ruleId,
+              ruleId: this.ruleInfo.id,
+              ruleName: this.ruleInfo.name,
               workOrderCode: this.workOrderInfo.code,
               workOrderId: this.workOrderInfo.id,
               batchNo: this.workOrderInfo.batchNo,
@@ -659,7 +660,9 @@
               productName: this.workOrderInfo.productName,
               specification: this.workOrderInfo.specification,
               isTempRecord: 0,
-              itemType: this.productionInfo.itemType
+              itemType: this.productionInfo.itemType,
+              deviceId: deviceInfo.id,
+              deviceName: deviceInfo.name
             };
 
             console.log('body', body);

src/views/produce/components/prenatalExamination/releaseRulesDialog.vue

@@ -21,7 +21,7 @@
         <el-col :span="8">
           <el-form-item label="记录规则名称" required>
             <el-input
-              v-model="addForm.recordRulesName"
+              v-model="addForm.ruleName"
               size="small"
               placeholder="自动带出"
               disabled
@@ -277,8 +277,8 @@
         productModel: '',
         productName: '',
         recordRulesClassify: null,
-        recordRulesId: 0,
-        recordRulesName: '',
+        ruleId: 0,
+        ruleName: '',
         reportWorkType: 0,
         specification: '',
         workOrderCode: '',
@@ -401,8 +401,8 @@
         if (this.productionInfo.recordId == null) {
           // 赋值表单信息
           this.addForm.recordRulesClassify = this.ruleInfo.classify + '';
-          this.addForm.recordRulesId = this.ruleInfo.id;
-          this.addForm.recordRulesName = this.ruleInfo.name;
+          this.addForm.ruleId = this.ruleInfo.id;
+          this.addForm.ruleName = this.ruleInfo.name;
           this.addForm.deviceId = this.ruleInfo.deviceId;
           this.addForm.deviceName = this.ruleInfo.deviceName;
         }
@@ -498,9 +498,9 @@
               await saveOrUpdateAndSubmit(this.addForm);
               this.$message.success('报工成功！');
             } else {
-              await saveOrUpdate(this.addForm);
+              const id = await saveOrUpdate(this.addForm);
+              this.addForm.id = id;
               this.$message.success('缓存成功！');
-              this.productionInfo.executeStatus = 1;
             }
 
             this.butLoading = false;
@@ -508,9 +508,8 @@
             // 返回
             this.$emit('reload');
 
-            if (type == 'submit') {
-              this.handleBeforeClose();
-            }
+            this.handleBeforeClose();
+
           } catch (error) {
             this.butLoading = false;
           }

vue.config.js

@@ -33,7 +33,7 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.116:18086',
-        // target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',192.168.1.116
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
@@ -43,7 +43,7 @@ module.exports = {
         // target: 'http://192.168.1.33:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18087',
-        target: 'http://192.168.1.116:18086',
+        // target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''