Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue

@@ -24,7 +24,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="">
-              <el-input v-model="formobj.useOrg" placeholder="使用组织" class="addinputw" :disabled="true"/>
+              <el-input v-model="formobj.useOrg" placeholder="" class="addinputw" :disabled="true"/>
             </el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
@@ -125,7 +125,6 @@ export default {
       warehouseGroup_list: [],
       libTube_list: [],
       formobj: {
-        id: '',
         sid: '',
         useOrg: '', // 使用组织
         useOrgSid: '', // 使用组织sid
@@ -137,8 +136,7 @@ export default {
         warehouseGroupValue: '',
         warehouseGroupKey: '',
         libTubeName: '',
-        libTubeSid: '',
+        libTubeSid: ''
-        orgPath: ''
       },
       rules: {
         useOrg: [{ required: true, message: '使用组织不能为空', trigger: 'change' }], // 使用组织
@@ -163,12 +161,12 @@ export default {
     getUseOrg() {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
+          this.formobj.useOrgSid = res.data // 使用组织sid
           fetchBySid(res.data).then((resp) => {
             if (resp.success) {
-              this.formobj.useOrg = res.data.name // 使用组织
+              this.formobj.useOrg = resp.data.name // 使用组织
             }
           })
-          this.formobj.useOrgSid = res.data // 使用组织sid
         }
       })
     },
@@ -186,7 +184,6 @@ export default {
       console.log('触发下拉框按钮', value)
       let bb = null
       this.useOrg_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
         if (e.name === value) {
           bb = {
             name: e.name,
@@ -316,20 +313,20 @@ export default {
 
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
-      this.formobj.id = ''
+      this.formobj = {
-      this.formobj.sid = '' // SID
+        sid: '',
-      this.formobj.useOrg = '' // 使用组织
+        useOrg: '', // 使用组织
-      this.useOrgSid = '' // 使用组织sid
+        useOrgSid: '', // 使用组织sid
-      this.gressionCode = '' // 编码
+        gressionCode: '', // 编码
-      this.formobj.warehouseName = '' // 名称
+        warehouseName: '', // 名称
-      this.formobj.warehouseAttribute = '' // 存放地点属性
+        warehouseAttribute: '', // 存放地点属性
-      this.formobj.warehouseContract = '' // 存放地点负责人
+        warehouseContract: '', // 存放地点负责人
-      this.formobj.warehouseContractSid = '' // 存放地点负责人sid
+        warehouseContractSid: '', // 存放地点负责人sid
-      this.formobj.warehouseGroup = '' // 分组
+        warehouseGroupValue: '',
-      this.formobj.libTubeSid = ''
+        warehouseGroupKey: '',
-      this.formobj.libTubeName = ''
+        libTubeName: '',
-      this.formobj.orgPath = ''
+        libTubeSid: ''
-      // this.useOrg_list = []
+      }
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     },
@@ -339,7 +336,6 @@ export default {
       })
       this.dialogStatus = 'add'
       this.viewTitle = '【新增】存放地点'
-      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.getUseOrg()
       this.getType()
     },
@@ -349,24 +345,13 @@ export default {
       })
       this.dialogStatus = 'edit'
       this.viewTitle = '【修改】存放地点'
-      req.fetchBySid(row.sid).then(resp => {
+      req.fetchBySid(row.sid).then((resp) => {
-        const vdata = resp.data
+       if (resp.success) {
-        this.formobj.id = vdata.id
+         this.formobj = resp.data
-        this.formobj.sid = vdata.sid // SID
+       }
-        this.formobj.useOrg = vdata.useOrg // 使用组织
-        this.formobj.gressionCode = vdata.gressionCode // 编码
-        this.formobj.warehouseName = vdata.warehouseName // 名称
-        this.formobj.warehouseAttribute = vdata.warehouseAttribute // 存放地点属性
-        this.formobj.warehouseContract = vdata.warehouseContract // 存放地点负责人
-        this.formobj.warehouseContractSid = vdata.warehouseContractSid // 存放地点负责人sid
-        this.formobj.warehouseGroupKey = vdata.warehouseGroupKey // 分组
-        this.formobj.warehouseGroupValue = vdata.warehouseGroupValue // 分组
-        this.formobj.libTubeName = vdata.libTubeName
-        this.formobj.libTubeSid = vdata.libTubeSid
       }).catch(e => {
         this.formobj = row
       })
-      this.getUseOrg()
       this.getType()
     },
     saveAdd() {

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@@ -674,6 +674,10 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请选择车型' })
         return
       }
+      if (this.temp.settlementStatusValue !== '' && this.temp.settlementStatusValue === '买断' && this.temp.solidDate === '') {
+        this.$message({ showClose: true, type: 'error', message: '因买断状态为买断，则买断日期不能为空' })
+        return
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.FormLoading = true

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue

@@ -104,6 +104,10 @@ export default {
     // 保存
     handleCreate() {
       this.getUrl()
+      if (this.temp.solidDate === '') {
+        this.$message({ showClose: true, message: '买断日期不能为空！', type: 'error' })
+        return
+      }
       if (this.temp.commonAppendix.length < 1) {
         this.$message({
           showClose: true,

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@@ -55,7 +55,11 @@
               </template>
             </el-table-column>
             <el-table-column prop="applicationDate" label="申请日期" align="center" width="100"/>
-            <el-table-column prop="pcApplicationCode" label="排产申请编号" align="center" width="170"/>
+            <el-table-column label="采购申请编号" align="center" width="170">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="hangleLook(scope.row)">{{ scope.row.pcApplicationCode }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="purchaseOrderNo" label="采购订单编号" align="center" width="170"/>
             <el-table-column prop="modelName" label="车型" align="center"/>
             <el-table-column prop="vehicleNum" fit label="台数" align="center" width="60"/>
@@ -74,6 +78,8 @@
     <div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
     <!--详情部分组件-->
     <div-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
+    <!-- 查看采购申请详情 -->
+    <cheliangpaichanInfo v-show="viewState == 5" ref="divCaiGouInfo" @doback="resetState"/>
     <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
       <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
     </el-dialog>
@@ -88,6 +94,7 @@ import pageye from '@/components/pagination/pageye'
 import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
 import divAdd from './ruzhangAdd'
 import divInfo from './ruzhangInfo'
+import cheliangpaichanInfo from '../../../views/supplychain/cheliangpaichan/cheliangpaichanInfo'
 import { getStorage } from '@/utils/auth'
 
 export default {
@@ -97,7 +104,8 @@ export default {
     Pagination,
     pageye,
     divAdd,
-    divInfo
+    divInfo,
+    cheliangpaichanInfo
   },
   data() {
     return {
@@ -218,6 +226,10 @@ export default {
       const sid = row.sid
       this.$refs['divinfo'].showInfo(sid, row)
     },
+    hangleLook(row) {
+      this.viewState = 5
+      this.$refs['divCaiGouInfo'].showInfo(row.vehicleOrderSid, row)
+    },
     // 查询
     dosearch() {
       this.queryParams.current = 1