优化

src/api/workOrder/index.js

@@ -23,3 +23,5 @@ export async function releaseWorkOrder({ id, teamId }) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+

src/views/saleOrder/components/create-order.vue

@@ -69,6 +69,7 @@
         <el-table-column label="单重" align="center" prop="productUnitWeight">
         </el-table-column>
         <el-table-column label="重量单位" align="center" prop="weightUnit">
+          
         </el-table-column>
         <el-table-column label="交付数量" align="center" prop="contractNum">
           <template slot-scope="scope">
@@ -251,6 +252,7 @@ export default {
     },
     // 确定选择
     confirmChoose(list) {
+      console.log(list)
       console.log(
         'this.form.productInfoList',
         deepClone(this.form.productInfoList)
@@ -271,6 +273,7 @@ export default {
               productCode: item.code,
               productName: item.name,
               productUnitWeight: item.weightUnit == 'G' ? item.netWeight / 1000 : item.netWeight,
+              weightUnit: 'g',
               model: item.modelType,
               brandNo: item.brandNum
             };

src/views/workOrder/components/order-search.vue

@@ -1,11 +1,6 @@
 <!-- 搜索表单 -->
 <template>
-  <el-form
-    label-width="90px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
+  <el-form label-width="90px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="生产工单号:">
@@ -14,52 +9,32 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划编码:">
-          <el-input
-            clearable
-            v-model="where.productionPlanCode"
-            placeholder="请输入"
-          />
+          <el-input clearable v-model="where.productionPlanCode" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="生产版本:">
-          <el-input
-            clearable
-            v-model="where.produceVersionName"
-            placeholder="请输入"
-          />
+          <el-input clearable v-model="where.produceRoutingName" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="物料编码:">
-          <el-input
-            clearable
-            v-model="where.productCode"
-            placeholder="请输入"
-          />
+          <el-input clearable v-model="where.productCode" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="产品名称:">
-          <el-input
-            clearable
-            v-model="where.productName"
-            placeholder="请输入"
-          />
+          <el-input clearable v-model="where.productName" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="状态:">
+          <el-select v-model="where.status" placeholder="请选择">
+            <el-option v-for="item in statusOpt" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-col>
-	  <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-	    <el-form-item label="状态:">
-	      <el-select v-model="where.status" placeholder="请选择">
-	        <el-option
-	          v-for="item in statusOpt"
-	          :key="item.value"
-	          :label="item.label"
-	          :value="item.value">
-	        </el-option>
-	      </el-select>
-	    </el-form-item>
-	  </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="牌号:">
           <el-input clearable v-model="where.brandNo" placeholder="请输入" />
@@ -70,34 +45,28 @@
           <el-input clearable v-model="where.model" placeholder="请输入" />
         </el-form-item>
       </el-col>
+
+
+
+
+
+
+
+
       <el-col v-bind="styleResponsive ? { lg: 9, md: 12 } : { span: 9 }">
         <el-form-item label="创建时间:">
-          <el-date-picker
-            class="w100"
-            v-model="where.createTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']"
-          >
+          <el-date-picker class="w100" v-model="where.createTime" type="daterange" range-separator="至"
+            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']">
           </el-date-picker>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label-width="0px">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-          >
+          <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-button @click="reset" icon="el-icon-refresh-left" type="primary">重置</el-button>
         </el-form-item>
       </el-col>
     </el-row>
@@ -105,62 +74,69 @@
 </template>
 
 <script>
-  export default {
-    props: [  ],
-    data () {
-      // 默认表单数据
-      const defaultWhere = {
-        code: '',
-        productionPlanCode: '',
-        produceVersionName: '',
-        productCode: '',
-        productName: '',
-        brandNo: '',
-        model: '',
-		status:'',
-        createTime: []
-      };
-      return {
-        // 表单数据
-        where: { ...defaultWhere },
-		statusOpt: [
-			{ label: '待下达', value: 8 },
-		    { label: '待生产', value: 4 },
-		    { label: '生产中', value: 5 }
-		],
-      };
-    },
-    computed: {
-      // 是否开启响应式布局
-      styleResponsive () {
-        return this.$store.state.theme.styleResponsive;
+
+export default {
+  props: [],
+  data() {
+    // 默认表单数据
+    const defaultWhere = {
+      code: '',
+      productionPlanCode: '',
+      produceRoutingName: '',
+      productCode: '',
+      productName: '',
+      brandNo: '',
+      model: '',
+
+      status: '',
+      createTime: []
+    };
+    return {
+      // 表单数据
+      where: { ...defaultWhere },
+      statusOpt: [
+        { label: '待下达', value: 8 },
+        { label: '待生产', value: 4 },
+        { label: '生产中', value: 5 }
+      ],
+      teamList: [],
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
+  },
+  watch: {},
+  created() {
+   
+   },
+  methods: {
+    /* 搜索 */
+    search() {
+      const where = { ...this.where };
+      if (where.createTime?.length) {
+        where.createTimeStart = where.createTime[0];
+        where.createTimeEnd = where.createTime[1];
       }
+      delete where.createTime;
+      this.$emit('search', where);
     },
-    watch: { },
-    created () {},
-    methods: {
-      /* 搜索 */
-      search () {
-        const where = { ...this.where };
-        if (where.createTime?.length) {
-          where.createTimeStart = where.createTime[0];
-          where.createTimeEnd = where.createTime[1];
-        }
-        delete where.createTime;
-        this.$emit('search', where);
-      },
-      /*  重置 */
-      reset () {
-        this.where = { ...this.defaultWhere };
-        this.search();
-      }
-    }
-  };
+    /*  重置 */
+    reset() {
+      this.where = { ...this.defaultWhere };
+      this.search();
+    },
+
+
+  }
+};
 </script>
 <style lang="scss" scoped>
-  .ele-form-actions {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-  }
+.ele-form-actions {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
 </style>

src/views/workOrder/index.vue

@@ -100,7 +100,7 @@
           },
           {
             slot: 'code',
-            label: '生产工单号',
+            label: '生产订单号',
             align: 'center',
             minWidth: 110
           },
@@ -110,7 +110,7 @@
             align: 'center'
           },
           {
-            prop: 'produceVersionName',
+            prop: 'produceRoutingName',
             label: '工艺路线',
             align: 'center'
           },