Merge remote-tracking branch 'origin/dev' into dev

components/file/photo-manage/PhotoManageCont.vue

@@ -125,6 +125,20 @@ export default {
             viewUri: '/food/v1/sample_attachment/view'
           }
           break
+        case 'aloneSampleId':
+          // 样品
+          this.entrustId = id
+          this.urlData = {
+            msg: 'FoodSampleAttachment',
+            pageUrl: 'soil/v1/alone_sample_annex/page',
+            deleteUrl: '/soil/v1/alone_sample_annex/?ids=',
+            uploadFileUrl: '/soil/v1/alone_sample_annex/upload/',
+            downloadFileUrl: '/soil/v1/alone_sample_annex/download/',
+            downloadBatch: '/food/v1/sample_attachment/download_batch',
+            uri: 'FoodSampleAttachment/getBySampleId',
+            viewUri: '/soil/v1/alone_sample_annex/view'
+          }
+          break
         case 'subcontractorId':
           // 分包商
           this.subcontractorId = id

pages/soil-alone-sample-instock/EntrustRegister.vue

@@ -257,7 +257,7 @@ export default {
       // 上传照片文件
       this.currentComponent = 'PhotoManage'
       this.$nextTick(() => {
-        this.$refs.refModal._open(data.id, 'entrustId')
+        this.$refs.refModal._open(data.id, 'aloneSampleId')
       })
       // this.$refs.PhotoManage._open(id, 'entrustId')
     },
@@ -410,7 +410,7 @@ export default {
       // 上传文件
       this.currentComponent = 'FileManage'
       this.$nextTick(() => {
-        this.$refs.refModal._open(id, 'entrustId')
+        this.$refs.refModal._open(id, 'aloneSampleId')
       })
     },
     _getById: async function(id) {

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegister.vue

@@ -393,7 +393,7 @@ export default {
       // 上传文件
       this.currentComponent = 'FileManage'
       this.$nextTick(() => {
-        this.$refs.refModal._open(id, 'entrustId')
+        this.$refs.refModal._open(id, 'aloneSampleId')
       })
     },
     _getById: async function(id) {

pages/soil-alone-sample-manage/soil-alone-sample-outstock/Outstock.vue

@@ -4,13 +4,6 @@
       <p slot="header">{{modalTitle}}</p>
       <div>
         <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
-          <Form-item label="库房号" prop="storehouse" style="width: 100%">
-            <Input v-model="formObj.storehouse" name="storehouse" style="width: 95%;" placeholder="请输入库房号"/>
-            <span @click="_storageModel()" style="font-size: 20px;color: #00b5ec">+</span>
-          </Form-item>
-          <Form-item label="架位号" prop="shelfCode" style="width: 100%">
-            <Input v-model="formObj.shelfCode" name="shelfCode" placeholder="请输入架位号"/>
-          </Form-item>
           <Form-item label="出库人" prop="outStocker" style="width: 100%">
             <Input v-model="formObj.outStocker" @click.native="_selectStaff" name="outStocker" readonly/>
           </Form-item>

pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManage.vue

@@ -64,6 +64,7 @@
     <!--组件加载-->
     <ViewSample ref="viewSample"></ViewSample>
     <ViewDetail ref="viewDetail"></ViewDetail>
+    <Outstock ref="outStockModal" @on-result-change="_page"></Outstock>
     <FileManage ref="FileManage" @on-result-change="_page"></FileManage>
     <BatchModal ref="batchModal" @on-result-change="_page"></BatchModal>
     <stockSampleEdit ref="editModal" @on-result-change="_page"></stockSampleEdit>
@@ -73,6 +74,7 @@
 <script>
 import { soilEntrust, soilSample } from '../../../api'
 import ViewDetail from '../../soil-alone-sample/ViewDetail'
+import Outstock from '../soil-alone-sample-outstock/Outstock'
 import ViewSample from './ViewLocationEntrust'
 import stockSampleEdit from './stockSampleEdit'
 import BatchModal from './BatchModal'
@@ -81,7 +83,8 @@ export default {
     stockSampleEdit,
     ViewSample,
     ViewDetail,
-    BatchModal
+    BatchModal,
+    Outstock
   },
   data() {
     return {
@@ -156,6 +159,9 @@ export default {
             this._editModal(false)
           })
           break
+        case '出库':
+          this._outstock()
+          break
         case '批量填写':
           this._bathChange()
           break
@@ -176,6 +182,13 @@ export default {
           break
       }
     },
+    _outstock() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$refs.outStockModal._open(this.selectIds)
+      }
+    },
     _bathChange() {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条数据')

pages/soil-alone-sample/EntrustRegister.vue

@@ -242,7 +242,7 @@ export default {
       })
     },
     _submitToInstock() {
-      this._submitByContractIds('出库')
+      this._submitByContractIds('入库')
     },
     _submitToSkipReview() {
       const ids = this.selectIds

pages/soil-report-manage/report-make/tabs/ReportMakeByEntrust.vue

@@ -348,7 +348,7 @@ export default {
       this.$openWindowModeless({
         objectKey: data.objectKey,
         id: id,
-        idType: 11,
+        idType: 12,
         isReport: 4
       })
     },

pages/soil-test-manage/test-input/sample-tabs/SampleRightList.vue

@@ -408,7 +408,7 @@ export default {
       })
     },
     _submitOk: async function() {
-      const result = await soilTest.endExp(this.selectIds.join(','))
+      const result = await soilTest.endExpIds({ ids: this.selectIds.join(',') })
       if (result) {
         this._resultChange('提交成功')
       }