Merge branch 'master' into feature/contract-variance-item

# Conflicts:
#	.env.development

.env.development

@@ -5,10 +5,11 @@ ENV = 'development'
 # VUE_APP_BASE_API = '/dev-api'
 # 线上正式地址
 #  VUE_APP_BASE_API = 'http://eam.modernfarming.cn:8000/'
+#  白少后台本地
 # 白少后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
+VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
 # 线上测试
-VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://127.0.0.1:8082/'
 
 # VUE_APP_BASE_API = 'http://36.155.144.182:18090/'

src/views/custom/custom/index.vue

@@ -362,6 +362,7 @@
                 <el-table-column label="出库数量" sortable prop="checkoutNumber" min-width="60px" align="center" />
                 <el-table-column label="单价" sortable prop="price" min-width="60px" align="center" />
                 <el-table-column label="总价" sortable prop="sumPrice" min-width="60px" align="center" />
+                <!-- <el-table-column label="冲销" sortable prop="sumPrice" min-width="60px" align="center" /> -->
               </el-table>
               <pagination v-show="total>0" :total="totalDelivery" :page.sync="getdataListParmDelivery.offset" :limit.sync="getdataListParmDelivery.pagecount" @pagination="getCardDelivery" />
             </el-tab-pane>

src/views/custom/outStock/index.vue

@@ -381,7 +381,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-if="No2" :span="8">
+            <el-col v-if="No2 && createTemp.useType == 5" :span="8">
               <el-form-item label="领用部门：" prop="departmentId">
                 <el-select v-model="createTemp.departmentId" placeholder="领用部门" class="filter-item" style="width:100%" @change="changeDepart">
                   <el-option
@@ -393,11 +393,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="No2 && createTemp.useType == 6" :span="8">
-              <el-form-item label="青贮单号：" prop="greenFodderNumber">
+            <el-col v-if="No2 && createTemp.useType == 6" :span="8">
+              <el-form-item label="订单号：" prop="greenFodderNumber">
                 <el-input ref="greenFodderNumber" v-model="createTemp.greenFodderNumber" maxlength="20" />
               </el-form-item>
-            </el-col> -->
+            </el-col>
             <el-col v-if="isReceiveTime2" :span="8">
               <el-form-item label="出库日期：" prop="receiveTime">
                 <el-date-picker

src/views/maintenance/subcontractingMainten/tabPage/tab2.vue

@@ -614,7 +614,7 @@
             <template slot-scope="scope">
               <el-form :model="scope.row">
                 <el-form-item prop="amount">
-                  <el-input ref="amount" v-model="scope.row.amount" :disabled="dialogStatus==='collectionSparePartsSee'" style="margin-top:15px" />
+                  <el-input ref="amount" v-model="scope.row.amount" :disabled="dialogStatus==='collectionSparePartsSee1'" style="margin-top:15px" />
                 </el-form-item>
               </el-form>
             </template>
@@ -628,7 +628,7 @@
             <template slot-scope="scope">
               <el-form :model="scope.row">
                 <el-form-item prop="note">
-                  <el-input ref="note" v-model="scope.row.note" :disabled="dialogStatus==='collectionSparePartsSee'" style="margin-top:15px" />
+                  <el-input ref="note" v-model="scope.row.note" :disabled="dialogStatus==='collectionSparePartsSee1'" style="margin-top:15px" />
                 </el-form-item>
               </el-form>
             </template>
@@ -921,6 +921,7 @@ export default {
         examine33: '审核4',
         examine3: '审核5',
         collectionSparePartsSee: '查看领用',
+        collectionSparePartsSee1:'查看领用',
         collectionSparePartsCreate: '添加领用',
       },
 
@@ -1113,7 +1114,7 @@ export default {
     handleCollarUseSee(row, isStock) {
       console.log(row)
       this.collectionSparePartsSeeTemp = Object.assign({}, row)
-      // this.dialogStatus = 'collectionSparePartsSee'
+      this.dialogStatus = 'collectionSparePartsSee1'
 
       this.collectionSparePartsSeeTemp.applyDate = row.createDate
       this.dialogFormVisible_CollectionSparePartsSee = true
@@ -1574,6 +1575,9 @@ export default {
                       this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
                     }
                   })
+                  setTimeout(() => {
+                    this.isokDisable = false
+                  }, 2000)
                   return true
                 }
               } else {
@@ -1664,7 +1668,7 @@ export default {
 
         this.collectionSparePartsSeeTemp.empId =  this.collectionSparePartsSeeTemp.applicant
         this.collectionSparePartsSeeTemp.applyDate = parseTime(new Date(), '{y}-{m}-{d}')
-        // this.dialogStatus = 'collectionSparePartsCreate'
+        this.dialogStatus = 'collectionSparePartsSee'
         this.dialogFormVisible_CollectionSparePartsSee = true
         this.isCreatePartDelete = true
         this.listCreateCollectionSpareParts = []
@@ -2269,29 +2273,33 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        var send_data1 = {
-            "name": "checkOutsourcingAmount",
-            "parammaps": { "outsourcingCode":row.outsourcingCode }
-        }
-        var send_data2 = {
-        "common": { "returnmap": "0" },
-        "data": [
-          {
-            "name": "editBigacceptanceIsAcceptance", "type": "e",
-            "parammaps": { "id":row.id }
-           }
-          ]
-        }
-        GetDataByName(send_data1).then(response => {
-          if(parseFloat(response.data.list[0].amount) !== 0){
-            this.save_submit(send_data2)
-          }else{
-            this.$message({
-              type: 'error',
-              message: '数据未填写，请完善相关信息'
-            })
+        if(row.isPartapply == 1){
+          var send_data1 = {
+              "name": "checkOutsourcingAmount",
+              "parammaps": { "outsourcingCode":row.outsourcingCode }
           }
-        })
+          var send_data2 = {
+          "common": { "returnmap": "0" },
+          "data": [
+            {
+              "name": "editBigacceptanceIsAcceptance", "type": "e",
+              "parammaps": { "id":row.id }
+             }
+            ]
+          }
+          GetDataByName(send_data1).then(response => {
+            if(parseFloat(response.data.list[0].amount) !== 0){
+              this.save_submit(send_data2)
+            }else{
+              this.$message({
+                type: 'error',
+                message: '数据未填写，请完善相关信息'
+              })
+            }
+          })
+        }else{
+          this.$message({ type: 'warning', message: '备件未领用，暂时不能提交。', duration: 2000 })
+        }
       }).catch(() => {
         this.$message({
           type: 'info',