车辆外采流程办理

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue

@@ -181,40 +181,48 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
         return
       }
+      this.multipleSelection.forEach(row => {
+        if(row.nodeState == '' || (row.nodeState!=''&&row.nodeState=='外采申请')){
           this.viewState = 3
           const row = this.multipleSelection[0]
           this.$refs['divadd'].showEdit(row)
+        }else{
+          alert('已经发起的审批业务数据不能进行编辑。');
+          return false;
+        }
+      })
+
     },
     edit(row) {
       this.viewState = 3
       this.$refs['divadd'].showEdit(row)
     },
     doSubmit() {
+     /* if (this.multipleSelection.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
+        return
+      }
+      if (this.multipleSelection.length > 1) {
+        this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
+        return
+      }
       const row = this.multipleSelection[0]
+      const sids = []
+      this.multipleSelection.forEach(row => {
+        if(row.nodeState==''||(row.nodeState!=''&&row.nodeState=='外采申请')){
+          sids.push(row.sid)
+        }else{
+          alert('已经发起的审批业务数据不能进行删除。');
+          sids = [];
+        }
+      })
       req
         .doSubmitBySid(row.sid,this.queryParams.params.userSid)
         .then( resp => {
           if(resp.success){
             alert(123);
           }
-        });
-      // 提交的代码
-     /* this.submitdisabled = true
-      this.formobj.userSid = window.sessionStorage.getItem('userSid');
-      this.formobj.orgSid = this.$store.getters.orgSid;
-      req
-        .doSubmit(this.formobj)
-        .then(resp => {
-          this.submitdisabled = false
-          if (resp.success) {
-            // 加提交后的逻辑
-          } else {
-            // 根据resp.code进行异常情况处理
-          }
-        })
-        .catch(() => {
-          this.submitdisabled = false
-        })*/
+        });*/
     },
 		doDel(row) {
 

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue

@@ -165,6 +165,8 @@
 
     <!-- 选择待办人 -->
     <modellibrary v-show="viewState == 1.2" ref="chexingxuanze" @handleChexing="selectChexing"></modellibrary>
+
+
     <el-dialog title="选择待办人"  :visible.sync="nodeDialogVisible" width="80%">
       <el-form label-position="right" class="formadd" >
         <el-row>
@@ -174,41 +176,12 @@
             <el-form-item prop="purchasingUnitName"><span>{{firstNode.name}}->{{ nextNode.name }}</span></el-form-item>
           </el-col>
         </el-row>
-      <!--
-      第一个环节不用填写意见
-       <el-row>
-          <el-col :span="4" class="tleftb">意见</el-col>
-          <el-col :span="20" class="trightb">
-            <el-input size="small" v-model="formobj.comment" placeholder="审批意见"  class="addinputw" clearable ></el-input>
-          </el-col>
-        </el-row>-->
-       <!-- <el-row>
-          <el-col :span="4" class="tleftb">下一步处理人</el-col>
-          <el-col :span="20" class="trightb">
-            {{this.userName}}
-            <el-button type="primary" size="mini" @click="selectUser">选择</el-button>
-          </el-col>
-        </el-row>-->
         <div style="text-align:center;margin-top: 20px;">
           <el-button type="primary" size="mini"  @click="agree">确 定</el-button>
           <el-button type="info " size="mini"  @click="closeNodeDialog">取 消</el-button>
         </div>
       </el-form>
     </el-dialog>
-    <!--选择用户的弹框-->
-   <!-- <el-dialog title="选择用户"  :visible.sync="nodeUserDialogVisible" width="80%">
-      <el-form label-position="right" class="formadd" >
-        <el-row>
-          <el-col :span="4" class="tleftb">用户</el-col>
-          <el-col :span="20" class="trightb" >
-            <el-radio-group >
-              <el-radio v-for="item in users" :key="item.sid" :label="item.sid"
-                        @change="checkedUser(item.sid)">{{ item.name }}</el-radio>
-            </el-radio-group>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-dialog>'-->
     <!-- 选择用户 的弹出框-->
     <el-dialog title="选择用户"  :visible.sync="nodeUserDialogVisible" width="80%">
       <el-form label-position="right" class="formadd" >
@@ -329,7 +302,7 @@ export default {
     },
     selectModel() {
       this.viewState = '1.2'
-      // this.$refs['chexingxuanze'].showChexing()
+      this.$refs['chexingxuanze'].showChexing()
     },
     selectChexing(info) {
       this.viewState = '1'

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/relation/modellibrary.vue

@@ -93,7 +93,7 @@
             </el-table-column>
             <el-table-column label="版本" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.vehicleVersionValue }}</span>
+                <span>{{ scope.row.versionValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="燃料" align="center">
@@ -118,7 +118,7 @@
             </el-table-column>
             <el-table-column label="排产" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.productionCarNum }}</span>
+                <span>{{ scope.row.produceCarNum }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center">
@@ -228,11 +228,16 @@ export default {
   },
   created() {
     // 初始化变量
-    this.init()
-    this.Dictionary()
+   /* this.init()
+    this.Dictionary()*/
     // 加载列表
   },
   methods: {
+    showChexing(){
+      this.init()
+      this.Dictionary()
+      this.viewState=1
+    },
     getConfigDataList(){
       return {
         configs: this.$refs['divConfiguration'].multipleSelection,

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/relation/vehiclelibraryconfiguration.vue

@@ -147,12 +147,12 @@
             </el-table-column>
             <el-table-column label="排产（台）" align="center" width="150">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handproduction(scope.row)">{{ scope.row.productionCarNum }}</span>
+                <span class="bluezi" @click="handproduction(scope.row)">{{ scope.row.produceCarNum }}</span>
               </template>
             </el-table-column>
             <el-table-column label="销售指导价（万元）" align="center" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.guidedPrice }}</span>
+                <span>{{ scope.row.price }}</span>
               </template>
             </el-table-column>
             <el-table-column label="价格有效期" align="center" width="110">
@@ -440,7 +440,7 @@ export default {
         modelName: this.modelName, // 车型名称
         configName: this.multipleSelection[0].configName, // 常用配置名称
         configSid: this.multipleSelection[0].sid, // 常用配置sid
-        guidedPrice:this.multipleSelection[0].guidedPrice,
+        guidedPrice: this.multipleSelection[0].price,
       }
       this.$emit('getChexing',info)
     },