Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/views/base/craftManagement/route/components/setExcel/index.vue

@@ -128,7 +128,8 @@ const getTemplate = async () => {
   const { data } = await getForm({
     pageNo: 1,
     pageSize: 9999999,
-    formType: 0
+    formType: 0,
+    state: 2
   });
   options.value = [];
   data.records.forEach((element) => {

src/views/quality/outsource/index.vue

@@ -49,6 +49,25 @@
       <el-form ref="queryFormRef"  label-width="100" :inline="true">
         <el-row :gutter="24">
           <el-col :lg="10" :xs="24">
+            <el-form-item label="订单编码">
+              <el-text>{{form.orderCode}}</el-text>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="6" :xs="24">
+            <el-form-item label="订单名称">
+              <el-text>{{form.orderName}}</el-text>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="2" :xs="24">
+            <el-form-item label="工单编码">
+              <el-text>{{form.workOrderCode}}</el-text>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :lg="10" :xs="24">
             <el-form-item label="产品名称">
               <el-text>{{form.materialName}}</el-text>
             </el-form-item>