土工试验Lims

pages/soil-sample-manage/backups-manage/SampleParpareApply.vue

@@ -45,7 +45,7 @@
             <Input :rows="3" v-model="formObj.handleReason" placeholder="请输入处理原因" type="textarea" name="handleReason"/>
           </Form-item>
           <Form-item label="附件上传" style="width: 90%;">
-            <div v-for="item in formObj.lmsEquipFiles" class="file-upload-list">
+            <div v-for="item in formObj.lmsEquipFiles" v-bind:key="item" class="file-upload-list">
               <div>
                 <!--<img :src="item.url">-->
                 <div class="file-upload-list-cover">

pages/soil-sample-manage/sample-preparation/Preparation.vue

@@ -5,20 +5,20 @@
       <Row>
         <!--操作-->
         <Col span="24">
-          <btn-list :msg="btn" @on-result-change="_btnClick" class="contHide"></btn-list>
+          <btn-list :msg="btn" class="contHide" @on-result-change="_btnClick"></btn-list>
         </Col>
         <!--内容-->
         <Col span="24">
           <PTVXETable
             ref="pageTable"
-            :tableHeight="tableHeight"
-            :getPage="getPage"
-            :iconMsg="iconMsg"
-            @on-result-change="_tableResultChange"
+            :table-height="tableHeight"
+            :get-page="getPage"
+            :icon-msg="iconMsg"
             :form-id="formId"
             select-data
             is-edit
-            hide-page>
+            hide-page
+            @on-result-change="_tableResultChange">
             <vxe-table-column
               v-for="item in pageColumns"
               :key="item.key"
@@ -32,9 +32,9 @@
               <!--可编辑模板-->
               <template v-slot:edit="scope">
                 <div v-if="item.key==='prepareWay'" @click="_handleRow(scope)">
-                  <AutoComplete v-model="scope.row.prepareWay" :downData="preparationWayData" :wayData="wayData"
-                                 :handleObj="scope" @on-result-change="_preparationChange" clearable
-                                 placeholder="输入或选择制备方式"></AutoComplete>
+                  <AutoComplete v-model="scope.row.prepareWay" :down-data="preparationWayData" :way-data="wayData"
+                                 :handle-obj="scope" clearable placeholder="输入或选择制备方式"
+                                 @on-result-change="_preparationChange"></AutoComplete>
                 </div>
                 <div v-else-if="item.key==='unit'" @click="_handleRow(scope)">
                   <el-input v-model="scope.row.unit" name="unit" placeholder="输入或选择单位">
@@ -46,14 +46,14 @@
                 </div>
                 <span v-else-if="item.key==='type'">{{ scope.row[item.key]===0? '检样':'备样' }}</span>
                 <div v-else-if="item.key==='keepWay'" @click="_handleRow(scope)">
-                  <AutoComplete v-model="scope.row.keepWay" :handleObj="scope" :downData="saveWayData"
-                                @on-result-change="_saveChange" clearable
-                                placeholder="输入或选择保存方式" show-key="name"></AutoComplete>
+                  <AutoComplete v-model="scope.row.keepWay" :handle-obj="scope" :down-data="saveWayData"
+                                clearable placeholder="输入或选择保存方式"
+                                show-key="name" @on-result-change="_saveChange"></AutoComplete>
                 </div>
                 <div v-else-if="item.key==='keepContainer'" @click="_handleRow(scope)">
-                  <AutoComplete v-model="scope.row.keepContainer" :handleObj="scope" :downData="packList"
-                                @on-result-change="_packSaveChange" clearable
-                                placeholder="输入或选择保存容器" show-key="name"></AutoComplete>
+                  <AutoComplete v-model="scope.row.keepContainer" :handle-obj="scope" :down-data="packList"
+                                clearable placeholder="输入或选择保存容器"
+                                show-key="name" @on-result-change="_packSaveChange"></AutoComplete>
                 </div>
 <!--                <div v-else-if="item.key==='prepareDate'" @click="_handleTimeRow(scope)">-->
 <!--                  <el-date-picker-->
@@ -91,12 +91,12 @@
 <!--                  </el-date-picker>-->
 <!--                </div>-->
                 <div v-else-if="item.key==='preparer'" @click="_handleRow(scope)">
-                  <el-input v-model="scope.row.preparer" @focus="_handleRow(scope)"
-                            placeholder="制备人" size="small" name="preparer"></el-input>
+                  <el-input v-model="scope.row.preparer" placeholder="制备人"
+                            size="small" name="preparer" @focus="_handleRow(scope)"></el-input>
                 </div>
                 <div v-else-if="item.key==='remark'" @click="_handleRow(scope)">
-                  <el-input v-model="scope.row.remark" @focus="_handleRow(scope)" placeholder="备注"
-                            size="small"></el-input>
+                  <el-input v-model="scope.row.remark" placeholder="备注" size="small"
+                            @focus="_handleRow(scope)"></el-input>
                 </div>
                 <span v-else>{{scope.row[item.key]}}</span>
               </template>
@@ -127,7 +127,7 @@
                 <div v-else-if="item.key==='prepareDate'">
                   {{scope.row.prepareDate?$dateformat(scope.row.preparationDate,'yyyy-mm-dd HH:MM'):''}}
                 </div>
-                <span v-else-if="item.key==='type'">{{ scope.row[item.key]===0? '检样':'备样' }}</span>
+                <span v-else-if="item.key==='type'">{{ scope.row[item.key]===0? '检样':'余样' }}</span>
                 <span v-else-if="item.key==='status'">{{ scope.row[item.key].display }}</span>
                 <div v-else>{{scope.row[item.key]}}</div>
               </template>
@@ -136,7 +136,7 @@
         </Col>
       </Row>
       <div slot="footer">
-        <modal-footer ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></modal-footer>
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
       <!--打印标签-->
       <!--选择人员-->
@@ -410,6 +410,11 @@ export default {
       for (let i = 0; i < this.getPage.records.length; i++) {
         prepareList.push(this.getPage.records[i])
       }
+      if (prepareList.length === 0) {
+        this.$Message.warning('制备数据不能为空')
+        this._hideLoading()
+        return false
+      }
       this.save({ prepareList: prepareList })
       // const preList = []
       // for (let i = 0; i < this.getPage.records.length; i++) {