yyw提交

resources/frontend/src/views/goods/goods.vue

@@ -1156,7 +1156,7 @@
       this.getList()
       this.getStockInfo()
       this.getgoodsType()
-      this.getbrandType()
+      // this.getbrandType()
       this.editPriceId = ''
       this.editReserveId = ''
       this.editLossId = ''

resources/frontend/src/views/supplyChain/procureLog.vue

@@ -173,13 +173,13 @@
           <el-input v-model="curInfo.external_sku_id" disabled></el-input>
         </el-form-item> -->
         <el-form-item label="数量">
-          <el-input v-model="curInfo.num" disabled></el-input>
+          <el-input v-model="curInfo.num" :disabled="curInfo.status == 1"></el-input>
         </el-form-item>
         <el-form-item label="成本">
-          <el-input v-model="curInfo.cost" disabled></el-input>
+          <el-input v-model="curInfo.cost" :disabled="curInfo.status == 1"></el-input>
         </el-form-item>
         <el-form-item label="商品总价">
-          <el-input v-model="curInfo.total_price" disabled>
+          <el-input v-model="curInfo.total_price" :disabled="curInfo.status == 1">
             <template slot="append">元</template>
           </el-input>
         </el-form-item>
@@ -300,7 +300,7 @@ export default {
     // 新增供应商
     handleAdd() {
       this.curInfo = {
-        buyer_user_id: localStorage.getItem("userId"),
+        buyer_user_id: localStorage.getItem("userId") * 1,
         supplier_id: ''
       }
       this.purchaseOrders = [{

resources/frontend/src/views/users/users.vue

@@ -9,7 +9,7 @@
                 <el-table-column prop="id" label="ID"></el-table-column>
                 <el-table-column prop="name" label="姓名"></el-table-column>
                 <el-table-column label="角色">
-                    <template slot-scope="scope">{{ scope.row.roles[0].name }}</template>
+                    <template slot-scope="scope">{{ scope.row.roles && scope.row.roles[0].name }}</template>
                 </el-table-column>
                 <el-table-column label="操作">
                     <template slot-scope="scope">

resources/frontend/vue.config.js

@@ -9,7 +9,8 @@ module.exports = {
             "/api": {
                 // target: "http://erp.local",
                 // target: "http://erp.chutang66.com",
-                target: "http://192.168.0.52:81",
+                target: "http://world.dev.chutang66.com/",
+                // target: "http://192.168.0.52:81",
                 changeOrigin: true, // 开启代理
                 pathRewrite: {
                     // 重命名