Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-app

src/pages/quality/Materialinspection/index.vue

@@ -77,9 +77,9 @@
           </div> -->
           <view class="item" v-for="(item, index) in detaillistceshi" :key="index">
             <div class="item1">项目名称: {{ item.ruleName }}</div>
-            <div class="item1">检查结果: {{ item.itemMethod }}</div>
-            <div class="item1 item2" v-if="item.propertyCode == '0'">
-              <div>检查标准: {{ item.checkStandard }}</div>
+            <div style="font-weight: 600">检查标准: {{ item.checkStandard }}</div>
+            <div class="item1 item2 item3" v-if="item.propertyCode == '0'">
+              <div class="item1">检查结果: {{ item.itemMethod }}</div>
               <div class="select">
                 <u-radio-group v-model="item.status" @change="radioGroupChange(item, item.status, index)">
                   <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="n.disabled">
@@ -89,13 +89,22 @@
               </div>
             </div>
             <div class="item1 item2" v-if="item.propertyCode == '1'">
-              <div>检查标准: {{ item.checkStandard }}</div>
               <div class="input-box" id="input-box1">
                 实际值:
                 <input class="input" v-model="item.actualValue" @focus="focus(item, item.actualValue, index)" @change="changeinput(item)" @input="input(item)" type="text" name="" id="" />
                 单位:mm
               </div>
             </div>
+            <div class="item1 item2 item3" v-if="item.propertyCode == '1'">
+              <div>检查结果:</div>
+              <div class="select">
+                <u-radio-group v-model="item.status" @change="radioGroupChange(item, item.status, index)">
+                  <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="n.disabled">
+                    {{ n.name }}
+                  </u-radio>
+                </u-radio-group>
+              </div>
+            </div>
 
             <!-- <div v-for="(item1, index1) in item.standardList" :key="index1">
               <div class="item1 item2" v-if="item1.standardType == 'qualitative'">
@@ -877,9 +886,9 @@ export default class PurchaseWHSRM extends BasePage {
         font-weight: 600;
       }
       .item2 {
-        display: flex;
-        align-content: center;
-        justify-content: space-between;
+        // display: flex;
+        // align-content: center;
+        // justify-content: space-between;
         .select {
           font-size: 15px;
           font-weight: 400;
@@ -894,9 +903,9 @@ export default class PurchaseWHSRM extends BasePage {
           margin-top: 2px;
           .input {
             font-size: 12px;
-            width: 65px;
+            // width: 100%;
             padding: 1px 8px;
-            height: 20px;
+            // height: 20px;
             box-sizing: border-box;
             border: 1px solid #b6b6b6;
             margin-left: 6px;
@@ -907,6 +916,11 @@ export default class PurchaseWHSRM extends BasePage {
           }
         }
       }
+      .item3 {
+        display: flex;
+        align-content: center;
+        justify-content: space-between;
+      }
     }
   }
   .modal {