Browse Source

二级单位提交增项

lining 5 years ago
parent
commit
27a9c1fc84

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -385,7 +385,7 @@
                 <el-row>
                   <el-col :span="6">
                     <el-form-item label="供应商公司名称" prop="checkSelectedSupplier">
-                      <el-select ref="suppselect" :disabled="formData.Status>0||IsCompanyUser == 1"
+                      <el-select ref="suppselect" :disabled="true"
                                  v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应商公司" style="width: 100%">
                         <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                                    :value="item.SupplierId">

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -451,7 +451,7 @@
                 <el-row>
                   <el-col :span="6">
                     <el-form-item label="供应商公司名称" prop="checkSelectedSupplier">
-                      <el-select ref="suppselect" :disabled="formData.Status>0||IsCompanyUser == 1" v-model="supplierOptions" filterable
+                      <el-select ref="suppselect" :disabled="true" v-model="supplierOptions" filterable
                                  @change="getInfo" placeholder="请选择供应商公司" style="width: 100%">
                         <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                                    :value="item.SupplierId">

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -392,7 +392,7 @@
                   </el-col> -->
                   <el-col :span="6">
                     <el-form-item label="供应商公司名称" prop="checkSelectedSupplier">
-                      <el-select ref="suppselect" :disabled="formData.Status>0||IsCompanyUser == 1" v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应商公司"
+                      <el-select ref="suppselect" :disabled="true" v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应商公司"
                                  style="width: 100%">
                         <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                                    :value="item.SupplierId">

+ 54 - 5
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -11,10 +11,12 @@
             <i class="icon icon-table2"></i> 基建类列表
           </span>
           <span style="float: right;">
-            <router-link :to="'/oilsupplier/supplierappend/2/basisdataopera'">
-              <el-button v-if="IsCompanyUser == 0" type="primary" size="mini"
-                style="margin-left:10px; margin-top: -4px;">添加</el-button>
-            </router-link>
+            <!--<router-link :to="'/oilsupplier/supplierappend/2/basisdataopera'">-->
+              <!--<el-button v-if="IsCompanyUser == 0" type="primary" size="mini"-->
+                <!--style="margin-left:10px; margin-top: -4px;">添加</el-button>-->
+            <!--</router-link>-->
+            <el-button v-if="IsCompanyUser == 0" type="primary" size="mini"
+                       style="margin-left:10px; margin-top: -4px;" @click="addappend">添加</el-button>
             <el-button v-if="IsCompanyUser == 1" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
               @click="addappendcom">添加
             </el-button>
@@ -167,6 +169,38 @@
       <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
         <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
       </el-dialog>
+
+      <el-dialog title="增项申请添加" :visible.sync="addshow" width="360px">
+        <el-form label-width="90px" :model="appendformData"ref="EntityFormref">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="企业名称" prop="SupplierId" required>
+                <el-select ref="suppselect" :disabled="IsCompanyUser == 1" filterable v-model="appendformData.SupplierId"
+                           :rules="[{ required: true, message: '请选择供应商公司', trigger: 'blur' },]"
+                           @change="getInfo" placeholder="请选择供应商公司" style="width: 100%">
+                  <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
+                             :value="item.SupplierId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <el-input v-model="appendformData.Remark" type="textarea" placeholder="请输入备注内容">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span style="float: right;margin-top:-10px;">
+          <el-button size="small" @click="addshow = false">取 消</el-button>
+          <el-button type="primary" size="small" @click="addappendcom">确 定</el-button>
+        </span>
+        <br>
+      </el-dialog>
+
     </div>
     <page401 v-if="IsCompanyUser == 1 && suplen == 0"></page401>
   </div>
@@ -193,6 +227,7 @@
 
     data() {
       return {
+        addshow: false,
         historyVisible: false,
         dialogVisible: false, //高级查询
         //列表数据
@@ -251,7 +286,7 @@
           Step: 1,
           Status: '',
           SupplierName: '',
-          SupplierId: 0,
+          SupplierId: '',
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
@@ -270,6 +305,18 @@
       this.getSupplierList()
     },
     methods: {
+      addappend () {
+        this.addshow = true
+      },
+      getInfo (vId) { // 这个vId也就是value值
+        let obj = {}
+        obj = this.supplierList.find((item) => {
+          return item.SupplierId === vId // 筛选出匹配数据
+        })
+        // this.appendformData.SupplierId = parseInt(obj.SupplierId)
+        this.appendformData.SupplierCertId = parseInt(obj.SupplierCertId)
+        this.appendformData.SupplierName = obj.SupplierName
+      },
       initData() {
         //分页及列表条件
         let params = {
@@ -306,7 +353,9 @@
             type: "warning"
           })
           .then(() => {
+            _this.addshow = false
             _this.appendformData.AppendType = '02'
+            _this.appendformData.SupplierId = parseInt(_this.appendformData.SupplierId)
             _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
               .then(res => {
                 if (res.data.code === 0) {

+ 56 - 8
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -11,10 +11,11 @@
             <i class="icon icon-table2"></i> 物资类列表
           </span>
           <span style="float: right;">
-            <router-link :to="'/oilsupplier/supplierappend/1/goodsdataopera'">
-              <el-button v-if="IsCompanyUser == 0" type="primary" size="mini"
-                style="margin-left:10px; margin-top: -4px;">添加</el-button>
-            </router-link>
+            <!--<router-link :to="'/oilsupplier/supplierappend/1/goodsdataopera'">-->
+              <!---->
+            <!--</router-link>-->
+            <el-button v-if="IsCompanyUser == 0" type="primary" size="mini"
+                       style="margin-left:10px; margin-top: -4px;" @click="addappend">添加</el-button>
             <el-button v-if="IsCompanyUser == 1" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
               @click="addappendcom">添加
             </el-button>
@@ -169,6 +170,37 @@
         <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
       </el-dialog>
 
+      <el-dialog title="增项申请添加" :visible.sync="addshow" width="360px">
+        <el-form label-width="90px" :model="appendformData"ref="EntityFormref">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="企业名称" prop="SupplierId" required>
+                <el-select ref="suppselect" :disabled="IsCompanyUser == 1" filterable v-model="appendformData.SupplierId"
+                           :rules="[{ required: true, message: '请选择供应商公司', trigger: 'blur' },]"
+                           @change="getInfo" placeholder="请选择供应商公司" style="width: 100%">
+                  <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
+                             :value="item.SupplierId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <el-input v-model="appendformData.Remark" type="textarea" placeholder="请输入备注内容">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span style="float: right;margin-top:-10px;">
+          <el-button size="small" @click="addshow = false">取 消</el-button>
+          <el-button type="primary" size="small" @click="addappendcom">确 定</el-button>
+        </span>
+        <br>
+      </el-dialog>
+
     </div>
     <page401 v-if="IsCompanyUser == 1 && suplen == 0"></page401>
   </div>
@@ -196,9 +228,10 @@
 
     data() {
       return {
+        addshow: false,
         historyVisible: false,
-        dialogVisible: false, //高级查询
-        //列表数据
+        dialogVisible: false, // 高级查询
+        // 列表数据
         entityList: [],
         //分页参数
         size: 10,
@@ -254,7 +287,7 @@
           Step: 1,
           Status: '',
           SupplierName: '',
-          SupplierId: 0,
+          SupplierId: '',
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
@@ -300,8 +333,21 @@
           console.error(err)
         })
       },
+      // ==============================================
+      addappend () {
+        this.addshow = true
+      },
+      getInfo (vId) { // 这个vId也就是value值
+        let obj = {}
+        obj = this.supplierList.find((item) => {
+          return item.SupplierId === vId // 筛选出匹配数据
+        })
+        // this.appendformData.SupplierId = parseInt(obj.SupplierId)
+        this.appendformData.SupplierCertId = parseInt(obj.SupplierCertId)
+        this.appendformData.SupplierName = obj.SupplierName
+      },
 
-      addappendcom() {
+      addappendcom () {
         let _this = this
         _this.$confirm("确定添加增项申请, 是否继续?", "提示", {
             confirmButtonText: "确定",
@@ -309,7 +355,9 @@
             type: "warning"
           })
           .then(() => {
+            _this.addshow = false
             _this.appendformData.AppendType = '01'
+            _this.appendformData.SupplierId = parseInt(_this.appendformData.SupplierId)
             _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
               .then(res => {
                 if (res.data.code === 0) {

+ 54 - 5
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -11,10 +11,12 @@
             <i class="icon icon-table2"></i> 技术服务类列表
           </span>
           <span style="float: right;">
-            <router-link :to="'/oilsupplier/supplierappend/3/techdataopera'">
-              <el-button v-if="IsCompanyUser == 0" type="primary" size="mini"
-                style="margin-left:10px; margin-top: -4px;">添加</el-button>
-            </router-link>
+            <!--<router-link :to="'/oilsupplier/supplierappend/3/techdataopera'">-->
+              <!--<el-button v-if="IsCompanyUser == 0" type="primary" size="mini"-->
+                <!--style="margin-left:10px; margin-top: -4px;">添加</el-button>-->
+            <!--</router-link>-->
+            <el-button v-if="IsCompanyUser == 0" type="primary" size="mini"
+                       style="margin-left:10px; margin-top: -4px;" @click="addappend">添加</el-button>
             <el-button v-if="IsCompanyUser == 1" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
               @click="addappendcom">添加
             </el-button>
@@ -169,6 +171,38 @@
       <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
         <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
       </el-dialog>
+
+      <el-dialog title="增项申请添加" :visible.sync="addshow" width="360px">
+        <el-form label-width="90px" :model="appendformData"ref="EntityFormref">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="企业名称" prop="SupplierId" required>
+                <el-select ref="suppselect" :disabled="IsCompanyUser == 1" filterable v-model="appendformData.SupplierId"
+                           :rules="[{ required: true, message: '请选择供应商公司', trigger: 'blur' },]"
+                           @change="getInfo" placeholder="请选择供应商公司" style="width: 100%">
+                  <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
+                             :value="item.SupplierId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <el-input v-model="appendformData.Remark" type="textarea" placeholder="请输入备注内容">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span style="float: right;margin-top:-10px;">
+          <el-button size="small" @click="addshow = false">取 消</el-button>
+          <el-button type="primary" size="small" @click="addappendcom">确 定</el-button>
+        </span>
+        <br>
+      </el-dialog>
+
     </div>
     <page401 v-if="IsCompanyUser == 1 && suplen == 0"></page401>
 
@@ -196,6 +230,7 @@
 
     data() {
       return {
+        addshow: false,
         historyVisible: false,
         dialogVisible: false, //高级查询
         //列表数据
@@ -254,7 +289,7 @@
           Step: 1,
           Status: '',
           SupplierName: '',
-          SupplierId: 0,
+          SupplierId: '',
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
@@ -273,6 +308,18 @@
       this.getSupplierList()
     },
     methods: {
+      addappend () {
+        this.addshow = true
+      },
+      getInfo (vId) { // 这个vId也就是value值
+        let obj = {}
+        obj = this.supplierList.find((item) => {
+          return item.SupplierId === vId // 筛选出匹配数据
+        })
+        // this.appendformData.SupplierId = parseInt(obj.SupplierId)
+        this.appendformData.SupplierCertId = parseInt(obj.SupplierCertId)
+        this.appendformData.SupplierName = obj.SupplierName
+      },
       initData() {
         //分页及列表条件
         let params = {
@@ -309,7 +356,9 @@
             type: "warning"
           })
           .then(() => {
+            _this.addshow = false
             _this.appendformData.AppendType = '03'
+            _this.appendformData.SupplierId = parseInt(_this.appendformData.SupplierId)
             _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
               .then(res => {
                 if (res.data.code === 0) {