待入库退回

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplier.go

@@ -206,6 +206,7 @@ type OilSupplierView struct {
 	BusinessKey       string    `xorm:"VARCHAR(255)"`
 	AuditIndex        int       `xorm:"INT(10)"`
 	ProcessKey        string    `xorm:"VARCHAR(255)"`
+	BackRemark        string    `xorm:"VARCHAR(255)"`
 }
 
 type OilSupplierSelect struct {

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -39,7 +39,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName
 	sql += ` b.DesignerTotal, `
 	sql += ` b.SkillerTotal, `
 	sql += ` b.Status, `
-	sql += ` b.WorkflowId, b.CreateOn ,b.ProcessKey,b.BusinessKey`
+	sql += ` b.WorkflowId, b.CreateOn ,b.ProcessKey,b.BusinessKey,b.BackRemark`
 	sql += ` from ` + supplierTableName + ` a `
 	sql += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
 	sql += ` where ` + where

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercert.go

@@ -49,6 +49,7 @@ type OilSupplierCert struct {
 	NationalCertTotal int       `xorm:"default 0 comment('具有国家注册执业资格证书总数') INT(10)"`
 	DesignerTotal     int       `xorm:"default 0 comment('设计人员总数') INT(10)"`
 	SkillerTotal      int       `xorm:"default 0 comment('技术工人总数') INT(10)"`
+	IsPay             int       `xorm:"default 0 comment('是否交费 0 未交费 1 已交费 2 不需要交费') INT(11)"`
 	WorkflowId        string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
 	ProcessKey        string    `xorm:"default '0' comment('工作流的名称') VARCHAR(255)"`
 	FirstAudit        int       `xorm:"default 0 comment('初审') INT(10)"`
@@ -56,6 +57,7 @@ type OilSupplierCert struct {
 	ThirdAudit        int       `xorm:"default 0 comment('专业科室审批') INT(10)"`
 	FourthAudit       int       `xorm:"default 0 comment('集中审批') INT(10)"`
 	AuditIndex        int       `xorm:"default 0 comment('审批次数') INT(11)"`
+	BackRemark        string    `xorm:"default '' comment('退回原因') VARCHAR(255)"`
 	CommitComId       string    `xorm:"default '0' comment('提交二级单位Id') VARCHAR(50)"`
 	BusinessKey       string    `xorm:"VARCHAR(255)"`
 	StorageOn         time.Time `xorm:"DATETIME"`
@@ -113,6 +115,7 @@ type Del_OilSupplierCert struct {
 	NationalCertTotal int       `xorm:"default 0 comment('具有国家注册执业资格证书总数') INT(10)"`
 	DesignerTotal     int       `xorm:"default 0 comment('设计人员总数') INT(10)"`
 	SkillerTotal      int       `xorm:"default 0 comment('技术工人总数') INT(10)"`
+	IsPay             int       `xorm:"default 0 comment('是否交费 0 未交费 1 已交费 2 不需要交费') INT(11)"`
 	WorkflowId        string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
 	ProcessKey        string    `xorm:"default '0' comment('工作流的名称') VARCHAR(255)"`
 	FirstAudit        int       `xorm:"default 0 comment('初审') INT(10)"`
@@ -120,6 +123,7 @@ type Del_OilSupplierCert struct {
 	ThirdAudit        int       `xorm:"default 0 comment('专业科室审批') INT(10)"`
 	FourthAudit       int       `xorm:"default 0 comment('集中审批') INT(10)"`
 	AuditIndex        int       `xorm:"default 0 comment('审批次数') INT(11)"`
+	BackRemark        string    `xorm:"default '' comment('退回原因') VARCHAR(255)"`
 	CommitComId       string    `xorm:"default '0' comment('提交二级单位Id') VARCHAR(50)"`
 	BusinessKey       string    `xorm:"VARCHAR(255)"`
 	StorageOn         time.Time `xorm:"DATETIME"`

src/dashoo.cn/backend/api/controllers/oilsupplier/paymentinfo.go

@@ -442,9 +442,11 @@ func (this *PaymentInfoController) ReceiveMoneyBillList() {
 			var certentity suppliercert.OilSupplierCert
 			certentity.Status = suppliercert.STOREING_STATUS
 			certentity.Step = 5
+			certentity.IsPay = 1
 			cols := []string{
 				"Status",
 				"Step",
+				"IsPay",
 			}
 			svc.UpdateEntityByIdCols(strconv.Itoa(payItem.SupplierCertId), &certentity, cols)
 

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1602,6 +1602,13 @@ func (this *OilSupplierController) AddEntity() {
 	modelCert.SupplierTypeCode = modelCertVM.SupplierTypeCode
 	modelCert.SupplierTypeName = modelCertVM.SupplierTypeName
 	modelCert.InStyle = modelCertVM.InStyle
+
+	if 	modelCert.InStyle == suppliercert.PINGSHEN {
+		modelCert.IsPay = 0
+	} else {
+		modelCert.IsPay = 2
+	}
+
 	modelCert.Step = 1 //企业信息保存完成
 	modelCert.CreateOn = time.Now()
 	modelCert.CreateBy = this.User.Realname
@@ -1669,8 +1676,16 @@ func (this *OilSupplierController) UpdateEntity() {
 	//判断基本信息是否可修改
 	updateCols := svc.GetUpdateCols(OilSupplierCertName, typeCode, model.Id)
 	err := svc.UpdateEntityBytbl(OilSupplierName, id, &model, updateCols)
+
+	isPay := "0"
+	if instyle == suppliercert.PINGSHEN {
+		isPay = "0"
+	} else {
+		isPay = "2"
+	}
+
 	if err == nil {
-		svc.DBE.Exec("update OilSupplierCert set Instyle=" + instyle + " where SupplierId=" + id + " and SupplierTypeCode=" + typeCode + "")
+		svc.DBE.Exec("update OilSupplierCert set InStyle='" + instyle + "', IsPay= " + isPay + " where SupplierId=" + id + " and SupplierTypeCode='" + typeCode + "'")
 		errinfo.Message = "修改成功！"
 		errinfo.Code = 0
 		this.Data["json"] = &errinfo

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -1127,7 +1127,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 
 		if receiveVal == "true" {
 			if supplierCertEntity.Status == suppliercert.CENT_AUDIT_STATUS {
-				if supplierCertEntity.InStyle == "1" {
+				if supplierCertEntity.InStyle == "1" &&  supplierCertEntity.IsPay == 0{
 					paysvc := paymentinfo.GetPaymentService(utils.DBE)
 					var Amount float64
 					asvc := oilcostmanage.GetOilCostManageService(utils.DBE)
@@ -1598,6 +1598,52 @@ func (this *OilSupplierCertController) UpdataInFlag() {
 	fmt.Println(elapsed, "更新准入标识")
 }
 
+// @Title 退回
+// @Description
+// @Success 200 {object} controllers.Request
+// @router /backstatus/:Id [post]
+func (this *OilSupplierCertController) BackStatus() {
+	id := this.Ctx.Input.Param(":Id")
+	status := this.GetString("Status")
+	backRemark := this.GetString("BackRemark")
+
+	var entity suppliercert.OilSupplierCert
+	svc := suppliercert.GetOilSupplierCertService(utils.DBE)
+
+	cols := []string{"Status", "BackRemark"}
+	entity.Status = status
+	entity.BackRemark = backRemark
+	_, err := svc.UpdateEntityByIdCols(id, &entity, cols)
+
+	var errinfo ErrorDataInfo
+	if err == nil {
+
+		var activity oilactivity.OilActivity
+		where := "EntityId=" + id + " and ActType='" + oilactivity.STORAGE + "'"
+		svc.GetEntity(&activity, where)
+
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var ActiComplete workflow.ActiCompleteVM
+		ActiComplete.ProcessKey = activity.ProcessKey
+		ActiComplete.BusinessKey = activity.BusinessKey
+		ActiComplete.UserId = this.User.Id
+		ActiComplete.Remarks = ""
+		ActiComplete.Result = "1"
+
+		svcActiviti.TaskComplete(ActiComplete)
+
+		errinfo.Message = "操作成功！"
+		errinfo.Code = 00
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "操作失败！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
 // @Title 保存准入编码
 // @Description 保存准入编码
 // @Success 200 {object} controllers.Request

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -161,22 +161,22 @@ module.exports = {
   },
   ignore: [
     'pages/oilsupplier/addtionaudit/*.*',
-    // 'pages/oilsupplier/annualaudit/*.*',
+    'pages/oilsupplier/annualaudit/*.*',
     'pages/oilsupplier/badrecord/*.*',
     // 'pages/oilsupplier/basisbuild/*.*',
     'pages/oilsupplier/compayaudit/*.*',
     // 'pages/oilsupplier/goodsaptitude/*.*',
     'pages/oilsupplier/infochange/*.*',
-    // 'pages/oilsupplier/infochangech/*.*',
+    'pages/oilsupplier/infochangech/*.*',
     // 'pages/oilsupplier/supplier/*.*',
-    // 'pages/oilsupplier/supplierappend/*.*',
+    'pages/oilsupplier/supplierappend/*.*',
     'pages/oilsupplier/supplieraudit/*.*',
     'pages/oilsupplier/suppliercert/*.*',
     'pages/oilsupplier/supplierfile/*.*',
 
     'pages/oilsupplier/suppliernopass/*.*',
-    'pages/oilsupplier/supplierps/*.*',
-    'pages/oilsupplier/supplierstorage/*.*',
+    // 'pages/oilsupplier/supplierps/*.*',
+    // 'pages/oilsupplier/supplierstorage/*.*',
     // 'pages/oilsupplier/supplierstore/*.*',
     'pages/oilsupplier/tablefieldsetting/*.*',
     'pages/oilsupplier/technologyservice/*.*',

src/dashoo.cn/frontend_web/src/api/oilsupplier/suppliercert.js

@@ -125,5 +125,12 @@ export default {
       method: 'GET',
       params: params
     })
+  },
+  backStatus (id, params, myAxios) {
+    return myAxios({
+      url: '/suppliercert/backstatus/' + id,
+      method: 'post',
+      params: params
+    })
   }
 }

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -696,6 +696,8 @@
             return '待交费'
           case '7':
             return '待入库'
+          case '-7':
+            return '待入库未通过'
           case '8':
             return '已入库'
           case '9':

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/basislist.vue

@@ -125,6 +125,10 @@
                   style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
+            <el-tooltip effect="dark" placement="top-start">
+              <div slot="content">退回原因：<br/>{{scope.row.BackRemark}}</div>
+              <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>
+            </el-tooltip>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"
                   style="color:#67C23A">已入库</span>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag=='2'"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/goodslist.vue

@@ -124,6 +124,10 @@
                   style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
+            <el-tooltip effect="dark" placement="top-start">
+              <div slot="content">退回原因：<br/>{{scope.row.BackRemark}}</div>
+              <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>
+            </el-tooltip>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"
                   style="color:#67C23A">已入库</span>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag=='2'"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/index.vue

@@ -78,6 +78,10 @@
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
             <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
+            <el-tooltip effect="dark" placement="top-start">
+              <div slot="content">退回原因：<br/>{{scope.row.BackRemark}}</div>
+              <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>
+            </el-tooltip>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"
                   style="color:#67C23A">已入库</span>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag=='2'"
@@ -979,6 +983,7 @@
         Object.assign(params, this.searchForm)
         // 访问接口
         api.getCertList(myCreateOn.join(','), params, this.$axios).then(res => {
+          console.log(res.data.items, 'this.entityListthis.entityList')
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/techlist.vue

@@ -125,6 +125,10 @@
                   style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
+            <el-tooltip effect="dark" placement="top-start">
+              <div slot="content">退回原因：<br/>{{scope.row.BackRemark}}</div>
+              <e-button v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</e-button>
+            </el-tooltip>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"
                   style="color:#67C23A">已入库</span>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag=='2'"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/basisedit.vue

@@ -27,6 +27,7 @@
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createWZAccessCardNo">生成准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '7'" @click="confirm">确认入库</el-button>
+          <el-button type="warning" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="backStatus">退回</el-button>
           <router-link :to="'/oilsupplier/supplierstorage/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>
@@ -248,7 +249,22 @@
         <!--<el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>-->
       <!--</span>-->
     <!--</el-dialog>-->
-
+    <el-dialog title="退回原因" :visible.sync="dialogVisibleBack" width="520px">
+      <el-form ref="backForm" label-width="70px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="退回原因">
+              <el-input v-model="backRemark" type="textarea">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisibleBack = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="backEntity">确定</el-button>
+      </span>
+    </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
   </div>
@@ -302,6 +318,8 @@
 
     data () {
       return {
+        backRemark: '',
+        dialogVisibleBack: false,
         activeName: '0',
         chooseAuditorVisible: false,
         showReturn: 1,
@@ -478,6 +496,32 @@
       }
     },
     methods: {
+      backEntity () {
+        let params = {
+          Status: '-7',
+          BackRemark: this.backRemark
+        }
+        apiCert.backStatus(this.formData.CertId, params, this.$axios).then(res => {
+          this.dialogVisibleBack = false
+          if (res.data.code === 0) {
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          this.dialogVisibleBack = false
+          console.log(err)
+        })
+      },
+      backStatus () {
+        this.dialogVisibleBack = true
+      },
       saveAccessCardNo () {
         apiCert.saveAccessCardNo(this.formData.Id, this.formData.CertId, this.formData.AccessCardNo, '02', this.$axios).then(res => {
           if (res.data.code === 0) {
@@ -733,7 +777,6 @@
       },
       auditOrgChang (val) {
         let deptid = val[val.length - 1]
-        console.log(deptid)
         this.auditerOption = []
         this.auditer = ''
         let auditstepcode = 'FIRST_TRIAL'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/goodsedit.vue

@@ -27,6 +27,7 @@
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createWZAccessCardNo">生成准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="confirm">确认入库</el-button>
+          <el-button type="warning" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="backStatus">退回</el-button>
           <!-- <router-link :to="'/oilsupplier/supplierstorage/goodslist'"> -->
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn" @click="$router.back(-1)">返回
             </el-button>
@@ -249,7 +250,22 @@
         <el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>
       </span>
     </el-dialog>
-
+    <el-dialog title="退回原因" :visible.sync="dialogVisibleBack" width="520px">
+      <el-form ref="backForm" label-width="70px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="退回原因">
+              <el-input v-model="backRemark" type="textarea">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisibleBack = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="backEntity">确定</el-button>
+      </span>
+    </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
   </div>
@@ -304,6 +320,8 @@
 
     data () {
       return {
+        backRemark: '',
+        dialogVisibleBack: false,
         activeName: '0',
         chooseAuditorVisible: false,
         showReturn: 1,
@@ -481,6 +499,32 @@
       }
     },
     methods: {
+      backEntity () {
+        let params = {
+          Status: '-7',
+          BackRemark: this.backRemark
+        }
+        apiCert.backStatus(this.formData.CertId, params, this.$axios).then(res => {
+          this.dialogVisibleBack = false
+          if (res.data.code === 0) {
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          this.dialogVisibleBack = false
+          console.log(err)
+        })
+      },
+      backStatus () {
+        this.dialogVisibleBack = true
+      },
       saveAccessCardNo () {
         apiCert.saveAccessCardNo(this.formData.Id, this.formData.CertId, this.formData.AccessCardNo, '01', this.$axios).then(res => {
           if (res.data.code === 0) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/techedit.vue

@@ -27,6 +27,7 @@
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createJFAccessCardNo">生成准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="confirm">确认入库</el-button>
+          <el-button type="warning" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="backStatus">退回</el-button>
           <router-link :to="'/oilsupplier/supplierstorage/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>
@@ -255,7 +256,22 @@
         <el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>
       </span>
     </el-dialog>
-
+    <el-dialog title="退回原因" :visible.sync="dialogVisibleBack" width="520px">
+      <el-form ref="backForm" label-width="70px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="退回原因">
+              <el-input v-model="backRemark" type="textarea">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisibleBack = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="backEntity">确定</el-button>
+      </span>
+    </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
 
@@ -310,6 +326,8 @@
 
     data () {
       return {
+        backRemark: '',
+        dialogVisibleBack: false,
         activeName: '1',
         chooseAuditorVisible: false,
         showReturn: 1,
@@ -486,9 +504,34 @@
       }
     },
     methods: {
+      backEntity () {
+        let params = {
+          Status: '-7',
+          BackRemark: this.backRemark
+        }
+        apiCert.backStatus(this.formData.CertId, params, this.$axios).then(res => {
+          this.dialogVisibleBack = false
+          if (res.data.code === 0) {
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          this.dialogVisibleBack = false
+          console.log(err)
+        })
+      },
+      backStatus () {
+        this.dialogVisibleBack = true
+      },
       saveAccessCardNo () {
         apiCert.saveAccessCardNo(this.formData.Id, this.formData.CertId, this.formData.AccessCardNo, '03', this.$axios).then(res => {
-          console.log(res.data, 'res.data')
           if (res.data.code === 0) {
             this.$message({
               type: 'success',
@@ -665,7 +708,6 @@
               this.add_flat = false
             }
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            console.log(this.formData)
             this.$refs['TechInfo'].CityAry = []
             this.$refs['TechInfo'].CityAry.push(this.formData.Province)
             this.$refs['TechInfo'].CityAry.push(this.formData.City)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/basislist.vue

@@ -757,7 +757,6 @@
        getDictOptions() {
         api.getDictList(this.$axios).then(res => {
            this.dictData = res.data.items
-           console.log(this.dictData)
            this.OperTypeOptions = this.dictData['OperType']
            this.UnitRelationOptions = this.dictData['UnitRelation']
            this.InOptions = this.dictData['InOptions']

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/goodslist.vue

@@ -549,7 +549,6 @@
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
            this.dictData = res.data.items
-           console.log(this.dictData)
            this.OperTypeOptions = this.dictData['OperType']
            this.UnitRelationOptions = this.dictData['UnitRelation']
            this.InOptions = this.dictData['InOptions']

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/techlist.vue

@@ -764,7 +764,6 @@
         getDictOptions() {
         api.getDictList(this.$axios).then(res => {
            this.dictData = res.data.items
-           console.log(this.dictData)
            this.OperTypeOptions = this.dictData['OperType']
            this.UnitRelationOptions = this.dictData['UnitRelation']
            this.InOptions = this.dictData['InOptions']