modified: src/assets/api/controller.js modified: src/components/view/...

Fixiaobai

2023-09-20 600422b0312cab54f6a84f63e1e5ac1e1fc36d1b

	modified:   src/assets/api/controller.js
	modified:   src/components/view/rawInsDetail.vue
	modified:   src/components/view/sale.vue
	modified:   src/components/view/technical.vue
	modified:   src/main.js

 src/assets/api/controller.js

@@ -185,6 +185,7 @@
    selectSaleDatilById: "sale/selectSaleDatilById", //根据销售单id查看详情,
    addSale: "sale/addSale", //新增销售单
    saleCheck: "sale/check", //审核销售单
    synchronization: "sale/synchronization",//同步
    updateSaleById: "sale/updateSaleById", //根据销售单id修改详情信息
    delSale: "sale/delSale", //根据销售单id删除
    delAllSale: "sale/delAllSale", //批量删除销售单

 src/components/view/rawInsDetail.vue

@@ -429,21 +429,21 @@
  },
  methods: {
    assertTest(row){
      let fuArr=['>', '<', '=']
      if(!fuArr.includes(row.required[0])){
        this.$message({
                    message: "标准值["+row.required+"]格式首位应包含>,<或者=",
                    type: 'warning'
                });
                return
      }
      if(!fuArr.includes(row.internal[0])){
        this.$message({
                    message: "内控值["+row.internal+"]格式首位应包含>,<或者=",
                    type: 'warning'
                });
                return
      }
      // let fuArr=['>', '<', '=']
      // if(!fuArr.includes(row.required[0])){
      //   this.$message({
      //               message: "标准值["+row.required+"]格式首位应包含>,<或者=",
      //               type: 'warning'
      //           });
      //           return
      // }
      // if(!fuArr.includes(row.internal[0])){
      //   this.$message({
      //               message: "内控值["+row.internal+"]格式首位应包含>,<或者=",
      //               type: 'warning'
      //           });
      //           return
      // }
    },
    // 设备树过滤搜索
    filterNode(value, data) {

 src/components/view/sale.vue

@@ -115,6 +115,8 @@
            <el-row>
                <el-col :span="12" style="line-height: 32px;">销售管理</el-col>
                <el-col :span="12" style="text-align: right;">
                    <el-button type="success" @click="syncOrder"
                        :icon="isSync ? 'el-icon-loading' : 'el-icon-refresh'">同步</el-button>
                    <el-button type="primary" icon="el-icon-plus" @click="openAddDia">新增</el-button>
                    <!-- <el-button icon="el-icon-edit-outline">修改</el-button> -->
                    <el-button icon="el-icon-delete" @click="delSales">删除</el-button>
@@ -162,6 +164,8 @@
                </el-table-column>
                <el-table-column prop="交货日期" label="交货日期" width="150">
                </el-table-column>
                <el-table-column prop="note" label="备注" width="150">
                </el-table-column>
                <el-table-column prop="type" label="状态" width="100">
                    <template slot-scope="scope">
                        <span style="color: #34BD66;" v-if="scope.row.type==1">通过</span>
@@ -174,16 +178,17 @@
                        <span class="table_do" @click="changeShowDetail(scope.row)">&nbsp;查看详情&nbsp;</span>
                        <span class="table_do" v-if="scope.row.type==null" @click="saleCheck(scope)">&nbsp;审核&nbsp;</span>
                        <span class="table_do" v-else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="table_do" v-if="scope.row.type==null" @click="openUpDia(scope.row.id)">&nbsp;编辑&nbsp;</span>
                        <span class="table_do" v-if="scope.row.type == null"
                            @click="openUpDia(scope.row.id)">&nbsp;编辑&nbsp;</span>
                        <span class="table_do" v-else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="table_do" @click="delSale(scope.$index)">&nbsp;删除&nbsp;</span>
                    </template>
                </el-table-column>
            </el-table>
            <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                    :page-sizes="[10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
                    :total="countSize">
                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
                    :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="pageSize"
                    layout="total, sizes, prev, pager, next, jumper" :total="countSize">
                </el-pagination>
            </el-col>
        </div>
@@ -214,6 +219,12 @@
                                <div class="value" v-else>&nbsp;</div>
                            </el-col>
                        </el-row>
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">备注</el-col>
                            <el-col :span="21">
                                <div style="width: 95%;word-wrap: break-word;" class="value">{{ oneData.note }}</div>
                            </el-col>
                        </el-row>
                    </div>
                    <div class="head">客户信息</div>
                    <div class="content">
@@ -222,45 +233,29 @@
                            <el-col :span="8">
                                <div class="value">{{oneData.proname}}</div>
                            </el-col>
                            <el-col :span="3" :offset="2">收货地址</el-col>
                            <el-col :span="8">
                                <div class="value">{{oneData.adress}}</div>
                            </el-col>
                        </el-row>
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">联系人</el-col>
                            <el-col :span="8">
                                <div class="value">{{oneData.username}}</div>
                            </el-col>
                            <el-col :span="3" :offset="2">联系电话</el-col>
                            <el-col :span="8">
                                <div class="value">{{oneData.phone}}</div>
                            </el-col>
                        </el-row>
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">业务员</el-col>
                            <el-col :span="3" :offset="2">业务员</el-col>
                            <el-col :span="8">
                                <div class="value">{{oneData.saleman}}</div>
                            </el-col>
                            <el-col :span="3" :offset="2">下单人</el-col>
                        </el-row>
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">下单人</el-col>
                            <el-col :span="8">
                                <div class="value">{{oneData.orderName}}</div>
                            </el-col>
                        </el-row>
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">交货日期</el-col>
                            <el-col :span="3" :offset="2">交货日期</el-col>
                            <el-col :span="8">
                                <div class="value">{{oneData.delTime}}</div>
                            </el-col>
                            <el-col :span="3" :offset="2">审核人</el-col>
                            <el-col :span="8">
                                <div class="value">{{oneData.checkname==null?'&nbsp;': oneData.checkname}}</div>
                            </el-col>
                        </el-row>
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">审核日期</el-col>
                            <el-col :span="8">
                                <div class="value">{{oneData.checkTime==null?'&nbsp;': oneData.checkTime}}</div>
                            </el-col>
                            <el-col :span="3" :offset="2">审核人</el-col>
                            <el-col :span="8">
                                <div class="value">{{ oneData.checkname == null ? '&nbsp;' : oneData.checkname }}</div>
                            </el-col>
                        </el-row>
                    </div>
@@ -277,6 +272,12 @@
                            </el-table-column>
                            <el-table-column prop="price" label="单价">
                            </el-table-column>
                            <el-table-column prop="username" label="联系人">
                            </el-table-column>
                            <el-table-column prop="phone" label="联系电话">
                            </el-table-column>
                            <el-table-column prop="address" label="地址">
                            </el-table-column>
                        </el-table>
                    </div>
                </div>
@@ -291,7 +292,8 @@
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">订单编号</el-col>
                            <el-col :span="8">
                                <el-input v-model="addData.orderNumber" size="small" placeholder="请输入订单编号" clearable></el-input>
                                <el-input v-model="addData.orderNumber" size="small" placeholder="请输入订单编号"
                                    clearable></el-input>
                            </el-col>
                            <el-col :span="3" :offset="2">合同编号</el-col>
                            <el-col :span="8">
@@ -312,37 +314,25 @@
                            <el-col :span="8">
                                <el-input v-model="addData.proname" size="small" placeholder="请输入客户名称" clearable></el-input>
                            </el-col>
                            <el-col :span="3" :offset="2">收货地址</el-col>
                            <el-col :span="8">
                                <el-input v-model="addData.adress" size="small" placeholder="请输入收货地址" clearable></el-input>
                            </el-col>
                        </el-row>
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">联系人</el-col>
                            <el-col :span="8">
                                <el-input v-model="addData.username" size="small" placeholder="请输入联系人" clearable></el-input>
                            </el-col>
                            <el-col :span="3" :offset="2">联系电话</el-col>
                            <el-col :span="8">
                                <el-input v-model="addData.phone" size="small" placeholder="请输入联系电话" clearable></el-input>
                            </el-col>
                        </el-row>
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">下单人</el-col>
                            <el-col :span="8">
                                <el-input v-model="addData.orderName" size="small" placeholder="请输入下单人" clearable></el-input>
                            </el-col>
                            <el-col :span="3" :offset="2">交货日期</el-col>
                            <el-col :span="8">
                                <el-date-picker v-model="addData.delTime" size="small" placeholder="请输入交货日期" clearable
                                    value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
                            </el-col>
                        </el-row>
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">下单人</el-col>
                            <el-col :span="8">
                                <el-input v-model="addData.orderName" size="small" placeholder="请输入下单人"
                                    clearable></el-input>
                            </el-col>
                        </el-row>
                    </div>
                    <div class="head" style="line-height: 50px;">
                        <el-col :span="12">产品信息</el-col>
                        <el-col :span="12" style="text-align: right;">
                            <el-button size="mini" @click="addSaleMaterial"><span style="font-size: 12px;">添加行</span></el-button>
                            <el-button size="mini" @click="addSaleMaterial"><span
                                    style="font-size: 12px;">添加行</span></el-button>
                        </el-col>
                    </div>
                    <div class="content">
@@ -355,7 +345,8 @@
                            </el-table-column>
                            <el-table-column prop="specifications" label="规格型号" width="180">
                                <template slot-scope="scope">
                                    <el-input v-model="scope.row.specifications" size="small" clearable placeholder="请输入规格型号"></el-input>
                                    <el-input v-model="scope.row.specifications" size="small" clearable
                                        placeholder="请输入规格型号"></el-input>
                                </template>
                            </el-table-column>
                            <el-table-column prop="unit" label="单位">
@@ -375,9 +366,27 @@
                                    <el-input v-model="scope.row.price" size="small" clearable placeholder="请输入"></el-input>
                                </template>
                            </el-table-column>
                            <el-table-column prop="username" label="联系人">
                                <template slot-scope="scope">
                                    <el-input v-model="scope.row.username" size="small" clearable
                                        placeholder="请输入"></el-input>
                                </template>
                            </el-table-column>
                            <el-table-column prop="phone" label="电话">
                                <template slot-scope="scope">
                                    <el-input v-model="scope.row.phone" size="small" clearable placeholder="请输入"></el-input>
                                </template>
                            </el-table-column>
                            <el-table-column prop="address" label="地址">
                                <template slot-scope="scope">
                                    <el-input v-model="scope.row.address" size="small" clearable
                                        placeholder="请输入"></el-input>
                                </template>
                            </el-table-column>
                            <el-table-column prop="price" label="操作" width="65px">
                                <template slot-scope="scope">
                                    <el-button type="text" @click.native.prevent="deleteRow(scope.$index, addData.saleMaterialList)">删除</el-button>
                                    <el-button type="text"
                                        @click.native.prevent="deleteRow(scope.$index, addData.saleMaterialList)">删除</el-button>
                                </template>
                            </el-table-column>
                        </el-table>
@@ -424,6 +433,7 @@
                    saleMaterialList: []
                },
                repeList: [],
            isSync: false,
                upDia: false
            }
        },
@@ -458,6 +468,27 @@
                this.pageSize = val
                this.selectRawInspectsList()
            },
        syncOrder() {
            this.isSync = true
            setTimeout(() => {
                this.$message({
                    message: '同步假成功(◕ᴗ◕)！',
                    type: 'success'
                });
                this.isSync=false
            }, 2000);
            return
            //调用同步接口
            this.axios.post(this.$api.url.synchronization).then(res => {
                if (res.code === '200') {
                    this.isSync = false
                    this.$message({
                        message: '同步成功！',
                        type: 'success'
                    });
                }
            })
        },
            handleCurrentChange(val) {
                this.currentPage = val
                this.selectRawInspectsList()

 src/components/view/technical.vue

@@ -85,6 +85,10 @@
            label="交货日期">
          </el-table-column>
          <el-table-column
            prop="note"
            label="备注">
          </el-table-column>
          <el-table-column
            label="状态"
            width="85"
            >

 src/main.js

@@ -23,7 +23,7 @@
Vue.use(qs);
Vue.use(api);

const javaApi = 'http://10.20.102.112:8001'
const javaApi = 'http://127.0.0.1:8001'
// localhost 127.0.0.1

// const javaApi = 'http://127.0.0.1:8001/'